@cloudcli-ai/cloudcli 1.34.0 → 1.35.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/README.de.md +9 -1
- package/README.ja.md +8 -0
- package/README.ko.md +9 -1
- package/README.md +23 -5
- package/README.ru.md +9 -1
- package/README.tr.md +8 -1
- package/README.zh-CN.md +9 -1
- package/README.zh-TW.md +9 -1
- package/dist/api-docs.html +36 -18
- package/dist/assets/index-BvX30NW5.css +32 -0
- package/dist/assets/index-D1IdCTT6.js +1418 -0
- package/dist/index.html +12 -4
- package/dist-server/server/browser-use-mcp.js +350 -0
- package/dist-server/server/browser-use-mcp.js.map +1 -0
- package/dist-server/server/claude-sdk.js +25 -5
- package/dist-server/server/claude-sdk.js.map +1 -1
- package/dist-server/server/cli.js +14 -6
- package/dist-server/server/cli.js.map +1 -1
- package/dist-server/server/cursor-cli.js +27 -11
- package/dist-server/server/cursor-cli.js.map +1 -1
- package/dist-server/server/gemini-cli.js +17 -2
- package/dist-server/server/gemini-cli.js.map +1 -1
- package/dist-server/server/index.js +136 -40
- package/dist-server/server/index.js.map +1 -1
- package/dist-server/server/load-env.js +1 -1
- package/dist-server/server/load-env.js.map +1 -1
- package/dist-server/server/modules/browser-use/browser-use-mcp.routes.js +107 -0
- package/dist-server/server/modules/browser-use/browser-use-mcp.routes.js.map +1 -0
- package/dist-server/server/modules/browser-use/browser-use.routes.js +93 -0
- package/dist-server/server/modules/browser-use/browser-use.routes.js.map +1 -0
- package/dist-server/server/modules/browser-use/browser-use.service.js +688 -0
- package/dist-server/server/modules/browser-use/browser-use.service.js.map +1 -0
- package/dist-server/server/modules/browser-use/tests/browser-use.service.test.js +8 -0
- package/dist-server/server/modules/browser-use/tests/browser-use.service.test.js.map +1 -0
- package/dist-server/server/modules/database/index.js +1 -0
- package/dist-server/server/modules/database/index.js.map +1 -1
- package/dist-server/server/modules/database/migrations.js +23 -1
- package/dist-server/server/modules/database/migrations.js.map +1 -1
- package/dist-server/server/modules/database/repositories/notification-channel-endpoints.js +100 -0
- package/dist-server/server/modules/database/repositories/notification-channel-endpoints.js.map +1 -0
- package/dist-server/server/modules/database/repositories/notification-preferences.js +8 -0
- package/dist-server/server/modules/database/repositories/notification-preferences.js.map +1 -1
- package/dist-server/server/modules/database/repositories/sessions.db.js +173 -17
- package/dist-server/server/modules/database/repositories/sessions.db.js.map +1 -1
- package/dist-server/server/modules/database/schema.js +26 -0
- package/dist-server/server/modules/database/schema.js.map +1 -1
- package/dist-server/server/modules/database/tests/projects.db.integration.test.js.map +1 -0
- package/dist-server/server/modules/database/tests/sessions-provider-mapping.test.js +78 -0
- package/dist-server/server/modules/database/tests/sessions-provider-mapping.test.js.map +1 -0
- package/dist-server/server/modules/database/{repositories → tests}/sessions.db.integration.test.js +10 -0
- package/dist-server/server/modules/database/tests/sessions.db.integration.test.js.map +1 -0
- package/dist-server/server/modules/notifications/index.js +4 -0
- package/dist-server/server/modules/notifications/index.js.map +1 -0
- package/dist-server/server/modules/notifications/notifications.routes.js +115 -0
- package/dist-server/server/modules/notifications/notifications.routes.js.map +1 -0
- package/dist-server/server/modules/notifications/services/desktop-notification-clients.service.js +97 -0
- package/dist-server/server/modules/notifications/services/desktop-notification-clients.service.js.map +1 -0
- package/dist-server/server/modules/notifications/services/notification-orchestrator.service.js +229 -0
- package/dist-server/server/modules/notifications/services/notification-orchestrator.service.js.map +1 -0
- package/dist-server/server/modules/notifications/websocket/desktop-notifications-websocket.service.js +79 -0
- package/dist-server/server/modules/notifications/websocket/desktop-notifications-websocket.service.js.map +1 -0
- package/dist-server/server/modules/projects/services/project-management.service.js +0 -4
- package/dist-server/server/modules/projects/services/project-management.service.js.map +1 -1
- package/dist-server/server/modules/projects/services/projects-with-sessions-fetch.service.js +10 -38
- package/dist-server/server/modules/projects/services/projects-with-sessions-fetch.service.js.map +1 -1
- package/dist-server/server/modules/providers/index.js +1 -0
- package/dist-server/server/modules/providers/index.js.map +1 -1
- package/dist-server/server/modules/providers/list/claude/claude-session-synchronizer.provider.js +24 -1
- package/dist-server/server/modules/providers/list/claude/claude-session-synchronizer.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/claude/claude-sessions.provider.js +9 -12
- package/dist-server/server/modules/providers/list/claude/claude-sessions.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/claude/claude-skills.provider.js +7 -0
- package/dist-server/server/modules/providers/list/claude/claude-skills.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/codex/codex-session-synchronizer.provider.js +7 -3
- package/dist-server/server/modules/providers/list/codex/codex-session-synchronizer.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/codex/codex-sessions.provider.js +3 -9
- package/dist-server/server/modules/providers/list/codex/codex-sessions.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/codex/codex-skills.provider.js +7 -0
- package/dist-server/server/modules/providers/list/codex/codex-skills.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/cursor/cursor-sessions.provider.js +13 -22
- package/dist-server/server/modules/providers/list/cursor/cursor-sessions.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/cursor/cursor-skills.provider.js +7 -0
- package/dist-server/server/modules/providers/list/cursor/cursor-skills.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/gemini/gemini-models.provider.js +5 -8
- package/dist-server/server/modules/providers/list/gemini/gemini-models.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/gemini/gemini-sessions.provider.js +6 -6
- package/dist-server/server/modules/providers/list/gemini/gemini-sessions.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/gemini/gemini-skills.provider.js +7 -0
- package/dist-server/server/modules/providers/list/gemini/gemini-skills.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/opencode/opencode-session-synchronizer.provider.js +17 -3
- package/dist-server/server/modules/providers/list/opencode/opencode-session-synchronizer.provider.js.map +1 -1
- package/dist-server/server/modules/providers/list/opencode/opencode-sessions.provider.js +9 -10
- package/dist-server/server/modules/providers/list/opencode/opencode-sessions.provider.js.map +1 -1
- package/dist-server/server/modules/providers/provider.routes.js +123 -1
- package/dist-server/server/modules/providers/provider.routes.js.map +1 -1
- package/dist-server/server/modules/providers/services/mcp.service.js +23 -0
- package/dist-server/server/modules/providers/services/mcp.service.js.map +1 -1
- package/dist-server/server/modules/providers/services/provider-capabilities.service.js +65 -0
- package/dist-server/server/modules/providers/services/provider-capabilities.service.js.map +1 -0
- package/dist-server/server/modules/providers/services/provider-models.service.js +1 -1
- package/dist-server/server/modules/providers/services/provider-models.service.js.map +1 -1
- package/dist-server/server/modules/providers/services/sessions-watcher.service.js +62 -23
- package/dist-server/server/modules/providers/services/sessions-watcher.service.js.map +1 -1
- package/dist-server/server/modules/providers/services/sessions.service.js +62 -4
- package/dist-server/server/modules/providers/services/sessions.service.js.map +1 -1
- package/dist-server/server/modules/providers/services/skills.service.js +11 -0
- package/dist-server/server/modules/providers/services/skills.service.js.map +1 -1
- package/dist-server/server/modules/providers/shared/skills/skills.provider.js +163 -1
- package/dist-server/server/modules/providers/shared/skills/skills.provider.js.map +1 -1
- package/dist-server/server/modules/providers/tests/opencode-sessions.test.js +45 -0
- package/dist-server/server/modules/providers/tests/opencode-sessions.test.js.map +1 -1
- package/dist-server/server/modules/providers/tests/skills.test.js +160 -0
- package/dist-server/server/modules/providers/tests/skills.test.js.map +1 -1
- package/dist-server/server/modules/websocket/index.js +1 -0
- package/dist-server/server/modules/websocket/index.js.map +1 -1
- package/dist-server/server/modules/websocket/services/chat-run-registry.service.js +252 -0
- package/dist-server/server/modules/websocket/services/chat-run-registry.service.js.map +1 -0
- package/dist-server/server/modules/websocket/services/chat-session-writer.service.js +105 -0
- package/dist-server/server/modules/websocket/services/chat-session-writer.service.js.map +1 -0
- package/dist-server/server/modules/websocket/services/chat-websocket.service.js +218 -156
- package/dist-server/server/modules/websocket/services/chat-websocket.service.js.map +1 -1
- package/dist-server/server/modules/websocket/services/shell-websocket.service.js +83 -31
- package/dist-server/server/modules/websocket/services/shell-websocket.service.js.map +1 -1
- package/dist-server/server/modules/websocket/services/websocket-server.service.js +5 -0
- package/dist-server/server/modules/websocket/services/websocket-server.service.js.map +1 -1
- package/dist-server/server/modules/websocket/tests/chat-run-registry.test.js +216 -0
- package/dist-server/server/modules/websocket/tests/chat-run-registry.test.js.map +1 -0
- package/dist-server/server/openai-codex.js +24 -14
- package/dist-server/server/openai-codex.js.map +1 -1
- package/dist-server/server/opencode-cli.js +21 -8
- package/dist-server/server/opencode-cli.js.map +1 -1
- package/dist-server/server/opencode-cli.test.js +19 -1
- package/dist-server/server/opencode-cli.test.js.map +1 -1
- package/dist-server/server/routes/settings.js +1 -1
- package/dist-server/server/routes/settings.js.map +1 -1
- package/dist-server/server/services/notification-orchestrator.js +1 -176
- package/dist-server/server/services/notification-orchestrator.js.map +1 -1
- package/dist-server/server/services/tests/notification-orchestrator.test.js +64 -0
- package/dist-server/server/services/tests/notification-orchestrator.test.js.map +1 -0
- package/dist-server/server/shared/{claude-cli-path.test.js → tests/claude-cli-path.test.js} +1 -1
- package/dist-server/server/shared/tests/claude-cli-path.test.js.map +1 -0
- package/dist-server/server/shared/tests/slice-tail-page.test.js +35 -0
- package/dist-server/server/shared/tests/slice-tail-page.test.js.map +1 -0
- package/dist-server/server/shared/utils.js +73 -1
- package/dist-server/server/shared/utils.js.map +1 -1
- package/dist-server/server/voice-proxy.js +226 -0
- package/dist-server/server/voice-proxy.js.map +1 -0
- package/electron/assets/logo-macos.icns +0 -0
- package/electron/assets/logo-macos.png +0 -0
- package/electron/assets/logo-windows.ico +0 -0
- package/electron/cloud.js +260 -0
- package/electron/desktopNotifications.js +378 -0
- package/electron/desktopWindow.js +766 -0
- package/electron/launcher/index.html +14 -0
- package/electron/launcher/launcher.css +801 -0
- package/electron/launcher/launcher.js +687 -0
- package/electron/localServer.js +550 -0
- package/electron/main.js +944 -0
- package/electron/preload.cjs +60 -0
- package/electron/scripts/generate-macos-icon.js +62 -0
- package/electron/serverInstaller.js +277 -0
- package/electron/tabs.js +87 -0
- package/electron/viewHost.js +331 -0
- package/package.json +79 -3
- package/public/api-docs.html +36 -18
- package/scripts/release/build-server-bundle.js +176 -0
- package/scripts/release/prepare-desktop-app.js +152 -0
- package/server/browser-use-mcp.ts +384 -0
- package/server/claude-sdk.js +27 -5
- package/server/cli.js +15 -6
- package/server/cursor-cli.js +27 -11
- package/server/gemini-cli.js +17 -2
- package/server/index.js +137 -47
- package/server/load-env.js +1 -1
- package/server/modules/browser-use/browser-use-mcp.routes.ts +120 -0
- package/server/modules/browser-use/browser-use.routes.ts +96 -0
- package/server/modules/browser-use/browser-use.service.ts +836 -0
- package/server/modules/browser-use/tests/browser-use.service.test.ts +10 -0
- package/server/modules/database/index.ts +1 -0
- package/server/modules/database/migrations.ts +25 -0
- package/server/modules/database/repositories/notification-channel-endpoints.ts +153 -0
- package/server/modules/database/repositories/notification-preferences.ts +12 -1
- package/server/modules/database/repositories/sessions.db.ts +227 -23
- package/server/modules/database/schema.ts +27 -0
- package/server/modules/database/tests/sessions-provider-mapping.test.ts +108 -0
- package/server/modules/database/{repositories → tests}/sessions.db.integration.test.ts +12 -0
- package/server/modules/notifications/index.ts +13 -0
- package/server/modules/notifications/notifications.routes.ts +127 -0
- package/server/modules/notifications/services/desktop-notification-clients.service.ts +124 -0
- package/server/modules/notifications/services/notification-orchestrator.service.js +288 -0
- package/server/modules/notifications/websocket/desktop-notifications-websocket.service.ts +109 -0
- package/server/modules/projects/services/project-management.service.ts +0 -8
- package/server/modules/projects/services/projects-with-sessions-fetch.service.ts +12 -53
- package/server/modules/providers/README.md +1 -1
- package/server/modules/providers/index.ts +1 -0
- package/server/modules/providers/list/claude/claude-session-synchronizer.provider.ts +26 -1
- package/server/modules/providers/list/claude/claude-sessions.provider.ts +9 -14
- package/server/modules/providers/list/claude/claude-skills.provider.ts +8 -0
- package/server/modules/providers/list/codex/codex-session-synchronizer.provider.ts +7 -3
- package/server/modules/providers/list/codex/codex-sessions.provider.ts +3 -12
- package/server/modules/providers/list/codex/codex-skills.provider.ts +8 -0
- package/server/modules/providers/list/cursor/cursor-sessions.provider.ts +13 -22
- package/server/modules/providers/list/cursor/cursor-skills.provider.ts +8 -0
- package/server/modules/providers/list/gemini/gemini-models.provider.ts +5 -8
- package/server/modules/providers/list/gemini/gemini-sessions.provider.ts +6 -6
- package/server/modules/providers/list/gemini/gemini-skills.provider.ts +8 -0
- package/server/modules/providers/list/opencode/opencode-session-synchronizer.provider.ts +18 -4
- package/server/modules/providers/list/opencode/opencode-sessions.provider.ts +9 -12
- package/server/modules/providers/provider.routes.ts +167 -1
- package/server/modules/providers/services/mcp.service.ts +26 -0
- package/server/modules/providers/services/provider-capabilities.service.ts +91 -0
- package/server/modules/providers/services/provider-models.service.ts +1 -1
- package/server/modules/providers/services/sessions-watcher.service.ts +71 -25
- package/server/modules/providers/services/sessions.service.ts +79 -4
- package/server/modules/providers/services/skills.service.ts +25 -1
- package/server/modules/providers/shared/skills/skills.provider.ts +223 -0
- package/server/modules/providers/tests/opencode-sessions.test.ts +49 -0
- package/server/modules/providers/tests/skills.test.ts +212 -0
- package/server/modules/websocket/README.md +33 -27
- package/server/modules/websocket/index.ts +1 -0
- package/server/modules/websocket/services/chat-run-registry.service.ts +327 -0
- package/server/modules/websocket/services/chat-session-writer.service.ts +145 -0
- package/server/modules/websocket/services/chat-websocket.service.ts +292 -207
- package/server/modules/websocket/services/shell-websocket.service.ts +108 -32
- package/server/modules/websocket/services/websocket-server.service.ts +6 -0
- package/server/modules/websocket/tests/chat-run-registry.test.ts +244 -0
- package/server/openai-codex.js +24 -14
- package/server/opencode-cli.js +21 -8
- package/server/opencode-cli.test.js +20 -1
- package/server/routes/settings.js +6 -1
- package/server/services/notification-orchestrator.js +3 -224
- package/server/services/tests/notification-orchestrator.test.js +80 -0
- package/server/shared/interfaces.ts +15 -0
- package/server/shared/tests/slice-tail-page.test.ts +42 -0
- package/server/shared/types.ts +84 -1
- package/server/shared/utils.ts +95 -1
- package/server/voice-proxy.js +224 -0
- package/dist/assets/index-73Xw3i9v.css +0 -32
- package/dist/assets/index-BIHaviaA.js +0 -1361
- package/dist/modelConstants.js +0 -854
- package/dist-server/server/modules/database/repositories/projects.db.integration.test.js.map +0 -1
- package/dist-server/server/modules/database/repositories/sessions.db.integration.test.js.map +0 -1
- package/dist-server/server/shared/claude-cli-path.test.js.map +0 -1
- package/public/modelConstants.js +0 -854
- /package/dist-server/server/modules/database/{repositories → tests}/projects.db.integration.test.js +0 -0
- /package/server/modules/database/{repositories → tests}/projects.db.integration.test.ts +0 -0
- /package/server/shared/{claude-cli-path.test.ts → tests/claude-cli-path.test.ts} +0 -0
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The capability matrix mirrors what each runtime actually implements today:
|
|
3
|
+
* - permission modes match the option sets accepted by each CLI/SDK.
|
|
4
|
+
* - only the Claude SDK integration surfaces interactive permission requests.
|
|
5
|
+
* - Cursor has no token usage endpoint support (its store.db has no usage rows).
|
|
6
|
+
*/
|
|
7
|
+
const PROVIDER_CAPABILITIES = {
|
|
8
|
+
claude: {
|
|
9
|
+
provider: 'claude',
|
|
10
|
+
permissionModes: ['default', 'auto', 'acceptEdits', 'bypassPermissions', 'plan'],
|
|
11
|
+
defaultPermissionMode: 'default',
|
|
12
|
+
supportsImages: true,
|
|
13
|
+
supportsAbort: true,
|
|
14
|
+
supportsPermissionRequests: true,
|
|
15
|
+
supportsTokenUsage: true,
|
|
16
|
+
},
|
|
17
|
+
cursor: {
|
|
18
|
+
provider: 'cursor',
|
|
19
|
+
permissionModes: ['default', 'acceptEdits', 'bypassPermissions', 'plan'],
|
|
20
|
+
defaultPermissionMode: 'default',
|
|
21
|
+
supportsImages: false,
|
|
22
|
+
supportsAbort: true,
|
|
23
|
+
supportsPermissionRequests: false,
|
|
24
|
+
supportsTokenUsage: false,
|
|
25
|
+
},
|
|
26
|
+
codex: {
|
|
27
|
+
provider: 'codex',
|
|
28
|
+
permissionModes: ['default', 'acceptEdits', 'bypassPermissions'],
|
|
29
|
+
defaultPermissionMode: 'default',
|
|
30
|
+
supportsImages: false,
|
|
31
|
+
supportsAbort: true,
|
|
32
|
+
supportsPermissionRequests: false,
|
|
33
|
+
supportsTokenUsage: true,
|
|
34
|
+
},
|
|
35
|
+
gemini: {
|
|
36
|
+
provider: 'gemini',
|
|
37
|
+
permissionModes: ['default', 'acceptEdits', 'bypassPermissions', 'plan'],
|
|
38
|
+
defaultPermissionMode: 'default',
|
|
39
|
+
supportsImages: false,
|
|
40
|
+
supportsAbort: true,
|
|
41
|
+
supportsPermissionRequests: false,
|
|
42
|
+
supportsTokenUsage: true,
|
|
43
|
+
},
|
|
44
|
+
opencode: {
|
|
45
|
+
provider: 'opencode',
|
|
46
|
+
permissionModes: ['default'],
|
|
47
|
+
defaultPermissionMode: 'default',
|
|
48
|
+
supportsImages: false,
|
|
49
|
+
supportsAbort: true,
|
|
50
|
+
supportsPermissionRequests: false,
|
|
51
|
+
supportsTokenUsage: true,
|
|
52
|
+
},
|
|
53
|
+
};
|
|
54
|
+
/**
|
|
55
|
+
* Application service exposing the provider capability matrix.
|
|
56
|
+
*/
|
|
57
|
+
export const providerCapabilitiesService = {
|
|
58
|
+
getProviderCapabilities(provider) {
|
|
59
|
+
return PROVIDER_CAPABILITIES[provider];
|
|
60
|
+
},
|
|
61
|
+
listAllProviderCapabilities() {
|
|
62
|
+
return Object.values(PROVIDER_CAPABILITIES);
|
|
63
|
+
},
|
|
64
|
+
};
|
|
65
|
+
//# sourceMappingURL=provider-capabilities.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider-capabilities.service.js","sourceRoot":"","sources":["../../../../../server/modules/providers/services/provider-capabilities.service.ts"],"names":[],"mappings":"AAyBA;;;;;GAKG;AACH,MAAM,qBAAqB,GAA8C;IACvE,MAAM,EAAE;QACN,QAAQ,EAAE,QAAQ;QAClB,eAAe,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,CAAC;QAChF,qBAAqB,EAAE,SAAS;QAChC,cAAc,EAAE,IAAI;QACpB,aAAa,EAAE,IAAI;QACnB,0BAA0B,EAAE,IAAI;QAChC,kBAAkB,EAAE,IAAI;KACzB;IACD,MAAM,EAAE;QACN,QAAQ,EAAE,QAAQ;QAClB,eAAe,EAAE,CAAC,SAAS,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,CAAC;QACxE,qBAAqB,EAAE,SAAS;QAChC,cAAc,EAAE,KAAK;QACrB,aAAa,EAAE,IAAI;QACnB,0BAA0B,EAAE,KAAK;QACjC,kBAAkB,EAAE,KAAK;KAC1B;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,OAAO;QACjB,eAAe,EAAE,CAAC,SAAS,EAAE,aAAa,EAAE,mBAAmB,CAAC;QAChE,qBAAqB,EAAE,SAAS;QAChC,cAAc,EAAE,KAAK;QACrB,aAAa,EAAE,IAAI;QACnB,0BAA0B,EAAE,KAAK;QACjC,kBAAkB,EAAE,IAAI;KACzB;IACD,MAAM,EAAE;QACN,QAAQ,EAAE,QAAQ;QAClB,eAAe,EAAE,CAAC,SAAS,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,CAAC;QACxE,qBAAqB,EAAE,SAAS;QAChC,cAAc,EAAE,KAAK;QACrB,aAAa,EAAE,IAAI;QACnB,0BAA0B,EAAE,KAAK;QACjC,kBAAkB,EAAE,IAAI;KACzB;IACD,QAAQ,EAAE;QACR,QAAQ,EAAE,UAAU;QACpB,eAAe,EAAE,CAAC,SAAS,CAAC;QAC5B,qBAAqB,EAAE,SAAS;QAChC,cAAc,EAAE,KAAK;QACrB,aAAa,EAAE,IAAI;QACnB,0BAA0B,EAAE,KAAK;QACjC,kBAAkB,EAAE,IAAI;KACzB;CACF,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACzC,uBAAuB,CAAC,QAAqB;QAC3C,OAAO,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;IAED,2BAA2B;QACzB,OAAO,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;IAC9C,CAAC;CACF,CAAC"}
|
|
@@ -5,7 +5,7 @@ import { providerRegistry } from '../../../modules/providers/provider.registry.j
|
|
|
5
5
|
import { readProviderSessionActiveModelChange } from '../../../shared/utils.js';
|
|
6
6
|
export const PROVIDER_MODELS_CACHE_TTL_MS = 3 * 24 * 60 * 60 * 1000;
|
|
7
7
|
const PROVIDER_MODELS_CACHE_VERSION = 1;
|
|
8
|
-
const UNCACHED_PROVIDERS = new Set(['claude']);
|
|
8
|
+
const UNCACHED_PROVIDERS = new Set(['claude', 'gemini']);
|
|
9
9
|
const getProviderModelsCachePath = () => path.join(os.homedir(), '.cloudcli', 'provider-models-cache.json');
|
|
10
10
|
const toProviderModelsCacheInfo = (entry, source) => ({
|
|
11
11
|
updatedAt: new Date(entry.updatedAt).toISOString(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-models.service.js","sourceRoot":"","sources":["../../../../../server/modules/providers/services/provider-models.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAW5E,OAAO,EAAE,oCAAoC,EAAE,MAAM,mBAAmB,CAAC;AAEzE,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AACpE,MAAM,6BAA6B,GAAG,CAAC,CAAC;AACxC,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"provider-models.service.js","sourceRoot":"","sources":["../../../../../server/modules/providers/services/provider-models.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,10 @@ import os from 'node:os';
|
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import { promises as fsPromises } from 'node:fs';
|
|
4
4
|
import chokidar from 'chokidar';
|
|
5
|
+
import { projectsDb, sessionsDb } from '../../../modules/database/index.js';
|
|
5
6
|
import { sessionSynchronizerService } from '../../../modules/providers/services/session-synchronizer.service.js';
|
|
6
7
|
import { WS_OPEN_STATE, connectedClients } from '../../../modules/websocket/index.js';
|
|
7
|
-
import {
|
|
8
|
+
import { generateDisplayName } from '../../../modules/projects/index.js';
|
|
8
9
|
const PROVIDER_WATCH_PATHS = [
|
|
9
10
|
{
|
|
10
11
|
provider: 'claude',
|
|
@@ -99,6 +100,47 @@ function queuePendingWatcherUpdate(eventType, provider, updatedSessionId) {
|
|
|
99
100
|
}
|
|
100
101
|
schedulePendingWatcherFlush();
|
|
101
102
|
}
|
|
103
|
+
/**
|
|
104
|
+
* Builds one `session_upserted` delta event for a provider-native session id.
|
|
105
|
+
*
|
|
106
|
+
* The event carries everything a sidebar needs to upsert the session in place
|
|
107
|
+
* (session summary plus owning-project metadata), so clients never need a full
|
|
108
|
+
* project-list refetch when a transcript file changes on disk. Returns `null`
|
|
109
|
+
* when the id cannot be resolved to an indexed session row.
|
|
110
|
+
*/
|
|
111
|
+
async function buildSessionUpsertedEvent(updatedProviderSessionId) {
|
|
112
|
+
const row = sessionsDb.getSessionByProviderSessionId(updatedProviderSessionId)
|
|
113
|
+
?? sessionsDb.getSessionById(updatedProviderSessionId);
|
|
114
|
+
if (!row || row.isArchived) {
|
|
115
|
+
return null;
|
|
116
|
+
}
|
|
117
|
+
const projectPath = row.project_path;
|
|
118
|
+
const project = projectPath ? projectsDb.getProjectPath(projectPath) : null;
|
|
119
|
+
const displayName = project?.custom_project_name?.trim()
|
|
120
|
+
? project.custom_project_name
|
|
121
|
+
: await generateDisplayName(path.basename(projectPath ?? '') || (projectPath ?? ''), projectPath);
|
|
122
|
+
return JSON.stringify({
|
|
123
|
+
kind: 'session_upserted',
|
|
124
|
+
sessionId: row.session_id,
|
|
125
|
+
provider: row.provider,
|
|
126
|
+
session: {
|
|
127
|
+
id: row.session_id,
|
|
128
|
+
summary: row.custom_name || '',
|
|
129
|
+
messageCount: 0,
|
|
130
|
+
lastActivity: row.updated_at ?? row.created_at ?? new Date().toISOString(),
|
|
131
|
+
},
|
|
132
|
+
project: project
|
|
133
|
+
? {
|
|
134
|
+
projectId: project.project_id,
|
|
135
|
+
path: project.project_path,
|
|
136
|
+
fullPath: project.project_path,
|
|
137
|
+
displayName,
|
|
138
|
+
isStarred: Boolean(project.isStarred),
|
|
139
|
+
}
|
|
140
|
+
: null,
|
|
141
|
+
timestamp: new Date().toISOString(),
|
|
142
|
+
});
|
|
143
|
+
}
|
|
102
144
|
async function flushPendingWatcherUpdate() {
|
|
103
145
|
clearPendingWatcherFlushTimer();
|
|
104
146
|
if (!pendingWatcherUpdate) {
|
|
@@ -113,32 +155,29 @@ async function flushPendingWatcherUpdate() {
|
|
|
113
155
|
pendingWatcherUpdateStartedAt = null;
|
|
114
156
|
watcherRefreshInFlight = true;
|
|
115
157
|
try {
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
const
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
timestamp: new Date().toISOString(),
|
|
125
|
-
changeType: changeTypes[0] ?? 'change',
|
|
126
|
-
updatedSessionId: updatedSessionIds[0] ?? undefined,
|
|
127
|
-
watchProvider: watchProviders[0] ?? undefined,
|
|
128
|
-
changeTypes,
|
|
129
|
-
updatedSessionIds,
|
|
130
|
-
watchProviders,
|
|
131
|
-
batched: true,
|
|
132
|
-
});
|
|
133
|
-
connectedClients.forEach(client => {
|
|
134
|
-
if (client.readyState === WS_OPEN_STATE) {
|
|
135
|
-
client.send(updateMessage);
|
|
158
|
+
// Per-session deltas instead of full project snapshots: an upsert of one
|
|
159
|
+
// session can never clobber unrelated client state, so the frontend needs
|
|
160
|
+
// no "suppress updates while a run is active" protection logic.
|
|
161
|
+
const events = [];
|
|
162
|
+
for (const updatedSessionId of queuedUpdate.updatedSessionIds) {
|
|
163
|
+
const event = await buildSessionUpsertedEvent(updatedSessionId);
|
|
164
|
+
if (event) {
|
|
165
|
+
events.push(event);
|
|
136
166
|
}
|
|
137
|
-
}
|
|
167
|
+
}
|
|
168
|
+
if (events.length > 0) {
|
|
169
|
+
connectedClients.forEach(client => {
|
|
170
|
+
if (client.readyState === WS_OPEN_STATE) {
|
|
171
|
+
for (const event of events) {
|
|
172
|
+
client.send(event);
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
});
|
|
176
|
+
}
|
|
138
177
|
}
|
|
139
178
|
catch (error) {
|
|
140
179
|
const message = error instanceof Error ? error.message : String(error);
|
|
141
|
-
console.error('Session watcher refresh failed while broadcasting
|
|
180
|
+
console.error('Session watcher refresh failed while broadcasting session_upserted', { error: message });
|
|
142
181
|
}
|
|
143
182
|
finally {
|
|
144
183
|
watcherRefreshInFlight = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessions-watcher.service.js","sourceRoot":"","sources":["../../../../../server/modules/providers/services/sessions-watcher.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,IAAI,UAAU,EAAE,MAAM,SAAS,CAAC;AAEjD,OAAO,QAA4B,MAAM,UAAU,CAAC;AAEpD,OAAO,EAAE,0BAA0B,EAAE,MAAM,8DAA8D,CAAC;AAC1G,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAE/E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"sessions-watcher.service.js","sourceRoot":"","sources":["../../../../../server/modules/providers/services/sessions-watcher.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
1
2
|
import fsp from 'node:fs/promises';
|
|
2
3
|
import path from 'node:path';
|
|
3
4
|
import { projectsDb, sessionsDb } from '../../../modules/database/index.js';
|
|
5
|
+
import { chatRunRegistry } from '../../../modules/websocket/index.js';
|
|
4
6
|
import { providerRegistry } from '../../../modules/providers/provider.registry.js';
|
|
5
7
|
import { AppError } from '../../../shared/utils.js';
|
|
6
8
|
/**
|
|
@@ -49,6 +51,15 @@ export const sessionsService = {
|
|
|
49
51
|
listProviderIds() {
|
|
50
52
|
return providerRegistry.listProviders().map((provider) => provider.id);
|
|
51
53
|
},
|
|
54
|
+
/**
|
|
55
|
+
* Returns app-facing ids for provider runs that are currently processing.
|
|
56
|
+
*
|
|
57
|
+
* This is intentionally status-only: callers that only need sidebar activity
|
|
58
|
+
* indicators should not attach to chat streams or request replayed messages.
|
|
59
|
+
*/
|
|
60
|
+
listRunningSessions() {
|
|
61
|
+
return chatRunRegistry.listRunningRuns();
|
|
62
|
+
},
|
|
52
63
|
/**
|
|
53
64
|
* Normalizes one provider-native event into frontend session message events.
|
|
54
65
|
*/
|
|
@@ -56,12 +67,40 @@ export const sessionsService = {
|
|
|
56
67
|
return providerRegistry.resolveProvider(providerName).sessions.normalizeMessage(raw, sessionId);
|
|
57
68
|
},
|
|
58
69
|
/**
|
|
59
|
-
*
|
|
70
|
+
* Allocates a stable app-facing session id before any provider run happens.
|
|
71
|
+
*
|
|
72
|
+
* This is the entry point of the session gateway: the frontend calls this
|
|
73
|
+
* (via `POST /api/providers/sessions`) when the user starts a brand-new
|
|
74
|
+
* chat, navigates to the returned id immediately, and the id never changes
|
|
75
|
+
* for the lifetime of the conversation. The provider-native id is mapped to
|
|
76
|
+
* this row later, when the provider runtime announces it mid-run.
|
|
77
|
+
*/
|
|
78
|
+
createAppSession(provider, projectPath) {
|
|
79
|
+
const normalizedProjectPath = projectPath.trim();
|
|
80
|
+
if (!normalizedProjectPath) {
|
|
81
|
+
throw new AppError('projectPath is required.', {
|
|
82
|
+
code: 'PROJECT_PATH_REQUIRED',
|
|
83
|
+
statusCode: 400,
|
|
84
|
+
});
|
|
85
|
+
}
|
|
86
|
+
const sessionId = randomUUID();
|
|
87
|
+
sessionsDb.createAppSession(sessionId, provider, normalizedProjectPath);
|
|
88
|
+
return {
|
|
89
|
+
sessionId,
|
|
90
|
+
provider,
|
|
91
|
+
projectPath: normalizedProjectPath,
|
|
92
|
+
};
|
|
93
|
+
},
|
|
94
|
+
/**
|
|
95
|
+
* Fetches persisted history by app session id.
|
|
60
96
|
*
|
|
61
97
|
* Provider and provider-specific lookup hints are resolved from the indexed
|
|
62
|
-
* session metadata in the database.
|
|
98
|
+
* session metadata in the database. The provider adapter receives the
|
|
99
|
+
* provider-native session id (the one written into transcripts on disk),
|
|
100
|
+
* and every returned message is remapped back to the app session id so
|
|
101
|
+
* provider ids never reach the frontend.
|
|
63
102
|
*/
|
|
64
|
-
fetchHistory(sessionId, options = {}) {
|
|
103
|
+
async fetchHistory(sessionId, options = {}) {
|
|
65
104
|
const session = sessionsDb.getSessionById(sessionId);
|
|
66
105
|
if (!session) {
|
|
67
106
|
throw new AppError(`Session "${sessionId}" was not found.`, {
|
|
@@ -69,12 +108,31 @@ export const sessionsService = {
|
|
|
69
108
|
statusCode: 404,
|
|
70
109
|
});
|
|
71
110
|
}
|
|
111
|
+
// App-created sessions that never produced a provider transcript yet
|
|
112
|
+
// (e.g. first message still streaming) simply have no history.
|
|
113
|
+
if (!session.provider_session_id) {
|
|
114
|
+
return {
|
|
115
|
+
messages: [],
|
|
116
|
+
total: 0,
|
|
117
|
+
hasMore: false,
|
|
118
|
+
offset: options.offset ?? 0,
|
|
119
|
+
limit: options.limit ?? null,
|
|
120
|
+
};
|
|
121
|
+
}
|
|
72
122
|
const provider = session.provider;
|
|
73
|
-
|
|
123
|
+
const result = await providerRegistry.resolveProvider(provider).sessions.fetchHistory(sessionId, {
|
|
74
124
|
limit: options.limit ?? null,
|
|
75
125
|
offset: options.offset ?? 0,
|
|
76
126
|
projectPath: session.project_path ?? '',
|
|
127
|
+
providerSessionId: session.provider_session_id,
|
|
77
128
|
});
|
|
129
|
+
return {
|
|
130
|
+
...result,
|
|
131
|
+
messages: result.messages.map((message) => ({
|
|
132
|
+
...message,
|
|
133
|
+
sessionId,
|
|
134
|
+
})),
|
|
135
|
+
};
|
|
78
136
|
},
|
|
79
137
|
/**
|
|
80
138
|
* Returns archived sessions with enough project metadata for the sidebar to
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessions.service.js","sourceRoot":"","sources":["../../../../../server/modules/providers/services/sessions.service.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,kBAAkB,CAAC;AACnC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAO5E,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"sessions.service.js","sourceRoot":"","sources":["../../../../../server/modules/providers/services/sessions.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,5 +7,16 @@ export const providerSkillsService = {
|
|
|
7
7
|
const provider = providerRegistry.resolveProvider(providerName);
|
|
8
8
|
return provider.skills.listSkills(options);
|
|
9
9
|
},
|
|
10
|
+
/**
|
|
11
|
+
* Writes one or more global skills for one provider.
|
|
12
|
+
*/
|
|
13
|
+
async addProviderSkills(providerName, input) {
|
|
14
|
+
const provider = providerRegistry.resolveProvider(providerName);
|
|
15
|
+
return provider.skills.addSkills(input);
|
|
16
|
+
},
|
|
17
|
+
async removeProviderSkill(providerName, input) {
|
|
18
|
+
const provider = providerRegistry.resolveProvider(providerName);
|
|
19
|
+
return provider.skills.removeSkill(input);
|
|
20
|
+
},
|
|
10
21
|
};
|
|
11
22
|
//# sourceMappingURL=skills.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skills.service.js","sourceRoot":"","sources":["../../../../../server/modules/providers/services/skills.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"skills.service.js","sourceRoot":"","sources":["../../../../../server/modules/providers/services/skills.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAQ5E,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC;;OAEG;IACH,KAAK,CAAC,kBAAkB,CACtB,YAAoB,EACpB,OAAkC;QAElC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;QAChE,OAAO,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,iBAAiB,CACrB,YAAoB,EACpB,KAA+B;QAE/B,MAAM,QAAQ,GAAG,gBAAgB,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;QAChE,OAAO,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,YAAoB,EACpB,KAA+B;QAE/B,MAAM,QAAQ,GAAG,gBAAgB,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;QAChE,OAAO,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC5C,CAAC;CACF,CAAC"}
|
|
@@ -1,6 +1,38 @@
|
|
|
1
1
|
import path from 'node:path';
|
|
2
|
-
import {
|
|
2
|
+
import { mkdir, rm, stat, writeFile } from 'node:fs/promises';
|
|
3
|
+
import { findProviderSkillMarkdownFiles, readOptionalString, readProviderSkillMarkdownDefinitionFromContent, readProviderSkillMarkdownDefinition, AppError, } from '../../../../shared/utils.js';
|
|
3
4
|
const resolveWorkspacePath = (workspacePath) => path.resolve(workspacePath ?? process.cwd());
|
|
5
|
+
const stripMarkdownExtension = (value) => value.replace(/\.md$/i, '');
|
|
6
|
+
const normalizeSkillDirectoryName = (value) => (value
|
|
7
|
+
.trim()
|
|
8
|
+
.replace(/[\\/]+/g, '-')
|
|
9
|
+
.replace(/[<>:"|?*\x00-\x1F]/g, '-')
|
|
10
|
+
.replace(/\s+/g, '-')
|
|
11
|
+
.replace(/-+/g, '-')
|
|
12
|
+
.replace(/^\.+|\.+$/g, '')
|
|
13
|
+
.replace(/^-+|-+$/g, ''));
|
|
14
|
+
const resolveSkillSupportingFilePath = (skillDirectoryPath, relativePath, entryIndex) => {
|
|
15
|
+
const normalizedRelativePath = relativePath.trim().replace(/\\/g, '/');
|
|
16
|
+
const pathSegments = normalizedRelativePath.split('/');
|
|
17
|
+
if (!normalizedRelativePath
|
|
18
|
+
|| path.isAbsolute(normalizedRelativePath)
|
|
19
|
+
|| pathSegments.some((segment) => !segment || segment === '.' || segment === '..')
|
|
20
|
+
|| normalizedRelativePath.toLowerCase() === 'skill.md') {
|
|
21
|
+
throw new AppError(`Skill entry ${entryIndex + 1} includes an invalid supporting file path "${relativePath}".`, {
|
|
22
|
+
code: 'PROVIDER_SKILL_FILE_PATH_INVALID',
|
|
23
|
+
statusCode: 400,
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
const resolvedSkillDirectoryPath = path.resolve(skillDirectoryPath);
|
|
27
|
+
const resolvedFilePath = path.resolve(resolvedSkillDirectoryPath, ...pathSegments);
|
|
28
|
+
if (!resolvedFilePath.startsWith(`${resolvedSkillDirectoryPath}${path.sep}`)) {
|
|
29
|
+
throw new AppError(`Skill entry ${entryIndex + 1} supporting files must stay inside the skill directory.`, {
|
|
30
|
+
code: 'PROVIDER_SKILL_FILE_PATH_INVALID',
|
|
31
|
+
statusCode: 400,
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
return resolvedFilePath;
|
|
35
|
+
};
|
|
4
36
|
/**
|
|
5
37
|
* Shared skills provider for provider-specific skill source discovery.
|
|
6
38
|
*/
|
|
@@ -41,5 +73,135 @@ export class SkillsProvider {
|
|
|
41
73
|
}
|
|
42
74
|
return skills;
|
|
43
75
|
}
|
|
76
|
+
async addSkills(input) {
|
|
77
|
+
const globalSkillSource = await this.getGlobalSkillSource();
|
|
78
|
+
if (!globalSkillSource) {
|
|
79
|
+
throw new AppError(`${this.provider} does not support managed global skills.`, {
|
|
80
|
+
code: 'PROVIDER_SKILLS_WRITE_UNSUPPORTED',
|
|
81
|
+
statusCode: 400,
|
|
82
|
+
});
|
|
83
|
+
}
|
|
84
|
+
if (!Array.isArray(input.entries) || input.entries.length === 0) {
|
|
85
|
+
throw new AppError('At least one skill entry is required.', {
|
|
86
|
+
code: 'PROVIDER_SKILLS_REQUIRED',
|
|
87
|
+
statusCode: 400,
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
const seenSkillPaths = new Set();
|
|
91
|
+
const pendingInstalls = [];
|
|
92
|
+
for (const [index, entry] of input.entries.entries()) {
|
|
93
|
+
const content = typeof entry.content === 'string' ? entry.content.trim() : '';
|
|
94
|
+
if (!content) {
|
|
95
|
+
throw new AppError(`Skill entry ${index + 1} must include markdown content.`, {
|
|
96
|
+
code: 'PROVIDER_SKILL_CONTENT_REQUIRED',
|
|
97
|
+
statusCode: 400,
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
const fileNameFallback = readOptionalString(entry.fileName);
|
|
101
|
+
const requestedDirectoryName = readOptionalString(entry.directoryName);
|
|
102
|
+
const fallbackSkillName = normalizeSkillDirectoryName(requestedDirectoryName
|
|
103
|
+
?? (fileNameFallback ? stripMarkdownExtension(fileNameFallback) : `skill-${index + 1}`));
|
|
104
|
+
const definition = readProviderSkillMarkdownDefinitionFromContent(content, fallbackSkillName);
|
|
105
|
+
const resolvedDirectoryName = normalizeSkillDirectoryName(requestedDirectoryName ?? definition.name);
|
|
106
|
+
if (!resolvedDirectoryName) {
|
|
107
|
+
throw new AppError(`Skill entry ${index + 1} must include a valid skill name.`, {
|
|
108
|
+
code: 'PROVIDER_SKILL_NAME_REQUIRED',
|
|
109
|
+
statusCode: 400,
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
const skillDirectoryPath = path.join(globalSkillSource.rootDir, resolvedDirectoryName);
|
|
113
|
+
const skillPath = path.join(skillDirectoryPath, 'SKILL.md');
|
|
114
|
+
const normalizedSkillPath = path.resolve(skillPath);
|
|
115
|
+
if (seenSkillPaths.has(normalizedSkillPath)) {
|
|
116
|
+
throw new AppError(`Duplicate skill target "${resolvedDirectoryName}" in one request.`, {
|
|
117
|
+
code: 'PROVIDER_SKILL_DUPLICATE_TARGET',
|
|
118
|
+
statusCode: 400,
|
|
119
|
+
});
|
|
120
|
+
}
|
|
121
|
+
seenSkillPaths.add(normalizedSkillPath);
|
|
122
|
+
const supportingFiles = (entry.files ?? []).map((file) => ({
|
|
123
|
+
targetPath: resolveSkillSupportingFilePath(skillDirectoryPath, file.relativePath, index),
|
|
124
|
+
content: file.encoding === 'base64'
|
|
125
|
+
? Buffer.from(file.content, 'base64')
|
|
126
|
+
: file.content,
|
|
127
|
+
}));
|
|
128
|
+
const seenSupportingPaths = new Set();
|
|
129
|
+
for (const file of supportingFiles) {
|
|
130
|
+
if (seenSupportingPaths.has(file.targetPath)) {
|
|
131
|
+
throw new AppError(`Skill entry ${index + 1} includes a duplicate supporting file path.`, {
|
|
132
|
+
code: 'PROVIDER_SKILL_DUPLICATE_FILE',
|
|
133
|
+
statusCode: 400,
|
|
134
|
+
});
|
|
135
|
+
}
|
|
136
|
+
seenSupportingPaths.add(file.targetPath);
|
|
137
|
+
}
|
|
138
|
+
const command = globalSkillSource.commandForSkill
|
|
139
|
+
? globalSkillSource.commandForSkill(definition.name)
|
|
140
|
+
: `${globalSkillSource.commandPrefix ?? '/'}${definition.name}`;
|
|
141
|
+
pendingInstalls.push({
|
|
142
|
+
skillDirectoryPath,
|
|
143
|
+
skillPath,
|
|
144
|
+
content,
|
|
145
|
+
supportingFiles,
|
|
146
|
+
skill: {
|
|
147
|
+
provider: this.provider,
|
|
148
|
+
name: definition.name,
|
|
149
|
+
description: definition.description,
|
|
150
|
+
command,
|
|
151
|
+
scope: globalSkillSource.scope,
|
|
152
|
+
sourcePath: skillPath,
|
|
153
|
+
pluginName: globalSkillSource.pluginName,
|
|
154
|
+
pluginId: globalSkillSource.pluginId,
|
|
155
|
+
},
|
|
156
|
+
});
|
|
157
|
+
}
|
|
158
|
+
for (const install of pendingInstalls) {
|
|
159
|
+
// Replace the complete skill directory so removed scripts or assets do not remain stale.
|
|
160
|
+
await rm(install.skillDirectoryPath, { recursive: true, force: true });
|
|
161
|
+
await mkdir(install.skillDirectoryPath, { recursive: true });
|
|
162
|
+
await writeFile(install.skillPath, `${install.content}\n`, 'utf8');
|
|
163
|
+
for (const file of install.supportingFiles) {
|
|
164
|
+
await mkdir(path.dirname(file.targetPath), { recursive: true });
|
|
165
|
+
await writeFile(file.targetPath, file.content);
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
return pendingInstalls.map((install) => install.skill);
|
|
169
|
+
}
|
|
170
|
+
async removeSkill(input) {
|
|
171
|
+
const globalSkillSource = await this.getGlobalSkillSource();
|
|
172
|
+
if (!globalSkillSource) {
|
|
173
|
+
throw new AppError(`${this.provider} does not support managed global skills.`, {
|
|
174
|
+
code: 'PROVIDER_SKILLS_WRITE_UNSUPPORTED',
|
|
175
|
+
statusCode: 400,
|
|
176
|
+
});
|
|
177
|
+
}
|
|
178
|
+
const directoryName = normalizeSkillDirectoryName(input.directoryName);
|
|
179
|
+
if (!directoryName) {
|
|
180
|
+
throw new AppError('Skill directoryName is required.', {
|
|
181
|
+
code: 'PROVIDER_SKILL_DIRECTORY_REQUIRED',
|
|
182
|
+
statusCode: 400,
|
|
183
|
+
});
|
|
184
|
+
}
|
|
185
|
+
const skillDirectoryPath = path.join(globalSkillSource.rootDir, directoryName);
|
|
186
|
+
const resolvedRoot = path.resolve(globalSkillSource.rootDir);
|
|
187
|
+
const resolvedSkillDirectoryPath = path.resolve(skillDirectoryPath);
|
|
188
|
+
if (resolvedSkillDirectoryPath !== resolvedRoot
|
|
189
|
+
&& !resolvedSkillDirectoryPath.startsWith(`${resolvedRoot}${path.sep}`)) {
|
|
190
|
+
throw new AppError('Skill directory must stay inside the managed skill root.', {
|
|
191
|
+
code: 'PROVIDER_SKILL_DIRECTORY_INVALID',
|
|
192
|
+
statusCode: 400,
|
|
193
|
+
});
|
|
194
|
+
}
|
|
195
|
+
const removed = await stat(resolvedSkillDirectoryPath)
|
|
196
|
+
.then((stats) => stats.isDirectory())
|
|
197
|
+
.catch(() => false);
|
|
198
|
+
if (removed) {
|
|
199
|
+
await rm(resolvedSkillDirectoryPath, { recursive: true, force: true });
|
|
200
|
+
}
|
|
201
|
+
return { removed, provider: this.provider, directoryName };
|
|
202
|
+
}
|
|
203
|
+
async getGlobalSkillSource() {
|
|
204
|
+
return null;
|
|
205
|
+
}
|
|
44
206
|
}
|
|
45
207
|
//# sourceMappingURL=skills.provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skills.provider.js","sourceRoot":"","sources":["../../../../../../server/modules/providers/shared/skills/skills.provider.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"skills.provider.js","sourceRoot":"","sources":["../../../../../../server/modules/providers/shared/skills/skills.provider.ts"],"names":[],"mappings":"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"}
|