@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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessions.db.js","sourceRoot":"","sources":["../../../../../server/modules/database/repositories/sessions.db.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,gDAAgD,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"sessions.db.js","sourceRoot":"","sources":["../../../../../server/modules/database/repositories/sessions.db.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,6 +63,22 @@ CREATE TABLE IF NOT EXISTS push_subscriptions (
|
|
|
63
63
|
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
|
|
64
64
|
);
|
|
65
65
|
`;
|
|
66
|
+
export const NOTIFICATION_CHANNEL_ENDPOINTS_TABLE_SCHEMA_SQL = `
|
|
67
|
+
CREATE TABLE IF NOT EXISTS notification_channel_endpoints (
|
|
68
|
+
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
69
|
+
user_id INTEGER NOT NULL,
|
|
70
|
+
channel TEXT NOT NULL,
|
|
71
|
+
endpoint_id TEXT NOT NULL,
|
|
72
|
+
label TEXT,
|
|
73
|
+
metadata_json TEXT,
|
|
74
|
+
enabled BOOLEAN DEFAULT 1,
|
|
75
|
+
last_seen_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
|
76
|
+
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
|
77
|
+
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
|
|
78
|
+
UNIQUE(user_id, channel, endpoint_id),
|
|
79
|
+
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
|
|
80
|
+
);
|
|
81
|
+
`;
|
|
66
82
|
export const PROJECTS_TABLE_SCHEMA_SQL = `
|
|
67
83
|
CREATE TABLE IF NOT EXISTS projects (
|
|
68
84
|
project_id TEXT PRIMARY KEY NOT NULL,
|
|
@@ -76,6 +92,12 @@ export const SESSIONS_TABLE_SCHEMA_SQL = `
|
|
|
76
92
|
CREATE TABLE IF NOT EXISTS sessions (
|
|
77
93
|
session_id TEXT NOT NULL,
|
|
78
94
|
provider TEXT NOT NULL DEFAULT 'claude',
|
|
95
|
+
-- The session id used by the provider CLI/SDK on disk (JSONL file name,
|
|
96
|
+
-- store.db folder, sqlite row id, ...). \`session_id\` is the stable
|
|
97
|
+
-- app-facing id that the frontend uses for the whole session lifetime;
|
|
98
|
+
-- \`provider_session_id\` is filled in once the provider announces its own
|
|
99
|
+
-- id mid-run, or equals \`session_id\` for sessions discovered on disk.
|
|
100
|
+
provider_session_id TEXT,
|
|
79
101
|
custom_name TEXT,
|
|
80
102
|
project_path TEXT,
|
|
81
103
|
jsonl_path TEXT,
|
|
@@ -128,6 +150,10 @@ ${VAPID_KEYS_TABLE_SCHEMA_SQL}
|
|
|
128
150
|
${PUSH_SUBSCRIPTIONS_TABLE_SCHEMA_SQL}
|
|
129
151
|
CREATE INDEX IF NOT EXISTS idx_push_subscriptions_user_id ON push_subscriptions(user_id);
|
|
130
152
|
|
|
153
|
+
${NOTIFICATION_CHANNEL_ENDPOINTS_TABLE_SCHEMA_SQL}
|
|
154
|
+
CREATE INDEX IF NOT EXISTS idx_notification_channel_endpoints_user_channel ON notification_channel_endpoints(user_id, channel);
|
|
155
|
+
CREATE INDEX IF NOT EXISTS idx_notification_channel_endpoints_enabled ON notification_channel_endpoints(enabled);
|
|
156
|
+
|
|
131
157
|
${PROJECTS_TABLE_SCHEMA_SQL}
|
|
132
158
|
-- NOTE: These indexes are created in migrations after legacy table-shape repairs.
|
|
133
159
|
-- Creating them here can fail on upgraded installs where projects lacks those columns.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../server/modules/database/schema.ts"],"names":[],"mappings":"AAAA,MAAM,qBAAqB,GAAG;;;;;;;;;;;;CAY7B,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG;;;;;;;;;;;CAWxC,CAAC;AAEF,MAAM,CAAC,MAAM,iCAAiC,GAAG;;;;;;;;;;;;CAYhD,CAAC;AAEF,MAAM,CAAC,MAAM,8CAA8C,GAAG;;;;;;;CAO7D,CAAC;AAEF,MAAM,CAAC,MAAM,2BAA2B,GAAG;;;;;;;CAO1C,CAAC;AAEF,MAAM,CAAC,MAAM,mCAAmC,GAAG;;;;;;;;;;CAUlD,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG;;;;;;;;CAQxC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../server/modules/database/schema.ts"],"names":[],"mappings":"AAAA,MAAM,qBAAqB,GAAG;;;;;;;;;;;;CAY7B,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG;;;;;;;;;;;CAWxC,CAAC;AAEF,MAAM,CAAC,MAAM,iCAAiC,GAAG;;;;;;;;;;;;CAYhD,CAAC;AAEF,MAAM,CAAC,MAAM,8CAA8C,GAAG;;;;;;;CAO7D,CAAC;AAEF,MAAM,CAAC,MAAM,2BAA2B,GAAG;;;;;;;CAO1C,CAAC;AAEF,MAAM,CAAC,MAAM,mCAAmC,GAAG;;;;;;;;;;CAUlD,CAAC;AAEF,MAAM,CAAC,MAAM,+CAA+C,GAAG;;;;;;;;;;;;;;;CAe9D,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG;;;;;;;;CAQxC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG;;;;;;;;;;;;;;;;;;;;;CAqBxC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG;;;;;CAKlC,CAAC;AAEF,MAAM,CAAC,MAAM,2BAA2B,GAAG;;;;;;CAM1C,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG;;;;EAI7B,qBAAqB;;;;;EAKrB,yBAAyB;;;;;EAKzB,iCAAiC;;;;;EAKjC,8CAA8C;;;EAG9C,2BAA2B;;EAE3B,mCAAmC;;;EAGnC,+CAA+C;;;;EAI/C,yBAAyB;;;;EAIzB,yBAAyB;;;;;EAKzB,mBAAmB;;EAEnB,2BAA2B;CAC5B,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"projects.db.integration.test.js","sourceRoot":"","sources":["../../../../../server/modules/database/tests/projects.db.integration.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
import assert from 'node:assert/strict';
|
|
2
|
+
import { mkdtemp, rm } from 'node:fs/promises';
|
|
3
|
+
import { tmpdir } from 'node:os';
|
|
4
|
+
import path from 'node:path';
|
|
5
|
+
import test from 'node:test';
|
|
6
|
+
import { closeConnection } from '../../../modules/database/connection.js';
|
|
7
|
+
import { initializeDatabase } from '../../../modules/database/init-db.js';
|
|
8
|
+
import { sessionsDb } from '../../../modules/database/repositories/sessions.db.js';
|
|
9
|
+
async function withIsolatedDatabase(runTest) {
|
|
10
|
+
const previousDatabasePath = process.env.DATABASE_PATH;
|
|
11
|
+
const tempDirectory = await mkdtemp(path.join(tmpdir(), 'sessions-mapping-'));
|
|
12
|
+
const databasePath = path.join(tempDirectory, 'auth.db');
|
|
13
|
+
closeConnection();
|
|
14
|
+
process.env.DATABASE_PATH = databasePath;
|
|
15
|
+
await initializeDatabase();
|
|
16
|
+
try {
|
|
17
|
+
await runTest();
|
|
18
|
+
}
|
|
19
|
+
finally {
|
|
20
|
+
closeConnection();
|
|
21
|
+
if (previousDatabasePath === undefined) {
|
|
22
|
+
delete process.env.DATABASE_PATH;
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
process.env.DATABASE_PATH = previousDatabasePath;
|
|
26
|
+
}
|
|
27
|
+
await rm(tempDirectory, { recursive: true, force: true });
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
test('disk-discovered sessions are keyed by the provider id for both columns', async () => {
|
|
31
|
+
await withIsolatedDatabase(() => {
|
|
32
|
+
sessionsDb.createSession('provider-abc', 'claude', '/workspace/demo', 'From Disk');
|
|
33
|
+
const row = sessionsDb.getSessionById('provider-abc');
|
|
34
|
+
assert.equal(row?.session_id, 'provider-abc');
|
|
35
|
+
assert.equal(row?.provider_session_id, 'provider-abc');
|
|
36
|
+
const byProviderId = sessionsDb.getSessionByProviderSessionId('provider-abc');
|
|
37
|
+
assert.equal(byProviderId?.session_id, 'provider-abc');
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
test('app sessions get the provider id assigned without creating a duplicate row', async () => {
|
|
41
|
+
await withIsolatedDatabase(() => {
|
|
42
|
+
sessionsDb.createAppSession('app-id-1', 'claude', '/workspace/demo');
|
|
43
|
+
sessionsDb.assignProviderSessionId('app-id-1', 'provider-xyz');
|
|
44
|
+
// A later synchronizer pass that discovers the transcript on disk must
|
|
45
|
+
// update the app row in place instead of inserting a provider-keyed row.
|
|
46
|
+
const returnedId = sessionsDb.createSession('provider-xyz', 'claude', '/workspace/demo', 'Synced Name', undefined, undefined, '/fake/path/provider-xyz.jsonl');
|
|
47
|
+
assert.equal(returnedId, 'app-id-1');
|
|
48
|
+
assert.equal(sessionsDb.getAllSessions().length, 1);
|
|
49
|
+
const row = sessionsDb.getSessionById('app-id-1');
|
|
50
|
+
assert.equal(row?.provider_session_id, 'provider-xyz');
|
|
51
|
+
assert.equal(row?.jsonl_path, '/fake/path/provider-xyz.jsonl');
|
|
52
|
+
});
|
|
53
|
+
});
|
|
54
|
+
test('assignProviderSessionId merges a watcher-created duplicate into the app row', async () => {
|
|
55
|
+
await withIsolatedDatabase(() => {
|
|
56
|
+
sessionsDb.createAppSession('app-id-2', 'codex', '/workspace/demo');
|
|
57
|
+
// Simulate the race: the filesystem watcher indexed the provider
|
|
58
|
+
// transcript before the runtime announced its session id to the gateway.
|
|
59
|
+
sessionsDb.createSession('provider-race', 'codex', '/workspace/demo', 'Watcher Name', undefined, undefined, '/fake/provider-race.jsonl');
|
|
60
|
+
assert.equal(sessionsDb.getAllSessions().length, 2);
|
|
61
|
+
sessionsDb.assignProviderSessionId('app-id-2', 'provider-race');
|
|
62
|
+
const rows = sessionsDb.getAllSessions();
|
|
63
|
+
assert.equal(rows.length, 1);
|
|
64
|
+
assert.equal(rows[0]?.session_id, 'app-id-2');
|
|
65
|
+
assert.equal(rows[0]?.provider_session_id, 'provider-race');
|
|
66
|
+
// Transcript path and name from the duplicate are adopted.
|
|
67
|
+
assert.equal(rows[0]?.jsonl_path, '/fake/provider-race.jsonl');
|
|
68
|
+
assert.equal(rows[0]?.custom_name, 'Watcher Name');
|
|
69
|
+
});
|
|
70
|
+
});
|
|
71
|
+
test('legacy provider-keyed rows stay resolvable through both lookups', async () => {
|
|
72
|
+
await withIsolatedDatabase(() => {
|
|
73
|
+
sessionsDb.createSession('legacy-1', 'gemini', '/workspace/demo');
|
|
74
|
+
assert.equal(sessionsDb.getSessionById('legacy-1')?.provider, 'gemini');
|
|
75
|
+
assert.equal(sessionsDb.getSessionByProviderSessionId('legacy-1')?.session_id, 'legacy-1');
|
|
76
|
+
});
|
|
77
|
+
});
|
|
78
|
+
//# sourceMappingURL=sessions-provider-mapping.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sessions-provider-mapping.test.js","sourceRoot":"","sources":["../../../../../server/modules/database/tests/sessions-provider-mapping.test.ts"],"names":[],"mappings":"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"}
|
package/dist-server/server/modules/database/{repositories → tests}/sessions.db.integration.test.js
RENAMED
|
@@ -58,4 +58,14 @@ test('createSession reactivates archived rows when the session becomes active ag
|
|
|
58
58
|
assert.equal(restoredSession?.isArchived, 0);
|
|
59
59
|
});
|
|
60
60
|
});
|
|
61
|
+
test('repository reads normalize SQLite UTC timestamps to ISO strings', async () => {
|
|
62
|
+
await withIsolatedDatabase(() => {
|
|
63
|
+
sessionsDb.createAppSession('session-timezone', 'claude', '/workspace/demo-project');
|
|
64
|
+
const row = sessionsDb.getSessionById('session-timezone');
|
|
65
|
+
assert.ok(row?.created_at.endsWith('Z'));
|
|
66
|
+
assert.ok(row?.updated_at.endsWith('Z'));
|
|
67
|
+
assert.match(row?.created_at ?? '', /^\d{4}-\d{2}-\d{2}T/);
|
|
68
|
+
assert.match(row?.updated_at ?? '', /^\d{4}-\d{2}-\d{2}T/);
|
|
69
|
+
});
|
|
70
|
+
});
|
|
61
71
|
//# sourceMappingURL=sessions.db.integration.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sessions.db.integration.test.js","sourceRoot":"","sources":["../../../../../server/modules/database/tests/sessions.db.integration.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
export { buildNotificationPayload, createNotificationEvent, notifyUserIfEnabled, notifyRunFailed, notifyRunStopped, } from '../../modules/notifications/services/notification-orchestrator.service.js';
|
|
2
|
+
export { registerDesktopNotificationClient, sendDesktopNotification, unregisterDesktopNotificationClient, } from '../../modules/notifications/services/desktop-notification-clients.service.js';
|
|
3
|
+
export { handleDesktopNotificationsConnection } from '../../modules/notifications/websocket/desktop-notifications-websocket.service.js';
|
|
4
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/modules/notifications/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,uBAAuB,EACvB,mBAAmB,EACnB,eAAe,EACf,gBAAgB,GACjB,MAAM,uEAAuE,CAAC;AAC/E,OAAO,EACL,iCAAiC,EACjC,uBAAuB,EACvB,mCAAmC,GACpC,MAAM,0EAA0E,CAAC;AAClF,OAAO,EAAE,oCAAoC,EAAE,MAAM,8EAA8E,CAAC"}
|
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
import express from 'express';
|
|
2
|
+
import { notificationChannelEndpointsDb, notificationPreferencesDb } from '../../modules/database/index.js';
|
|
3
|
+
const router = express.Router();
|
|
4
|
+
function readText(value) {
|
|
5
|
+
return typeof value === 'string' ? value.trim() : '';
|
|
6
|
+
}
|
|
7
|
+
function sanitizeEndpoint(endpoint) {
|
|
8
|
+
return {
|
|
9
|
+
id: endpoint.id,
|
|
10
|
+
channel: endpoint.channel,
|
|
11
|
+
endpointId: endpoint.endpoint_id,
|
|
12
|
+
label: endpoint.label,
|
|
13
|
+
metadata: notificationChannelEndpointsDb.parseMetadata(endpoint.metadata_json),
|
|
14
|
+
enabled: Boolean(endpoint.enabled),
|
|
15
|
+
lastSeenAt: endpoint.last_seen_at,
|
|
16
|
+
createdAt: endpoint.created_at,
|
|
17
|
+
updatedAt: endpoint.updated_at,
|
|
18
|
+
};
|
|
19
|
+
}
|
|
20
|
+
function readUserId(req) {
|
|
21
|
+
const userId = Number(req.user?.id);
|
|
22
|
+
if (!Number.isInteger(userId) || userId <= 0) {
|
|
23
|
+
throw new Error('Authenticated user is missing');
|
|
24
|
+
}
|
|
25
|
+
return userId;
|
|
26
|
+
}
|
|
27
|
+
function updateChannelPreference(userId, channel) {
|
|
28
|
+
const currentPrefs = notificationPreferencesDb.getPreferences(userId);
|
|
29
|
+
const hasEnabledEndpoint = notificationChannelEndpointsDb.getEnabledEndpoints(userId, channel).length > 0;
|
|
30
|
+
return notificationPreferencesDb.updatePreferences(userId, {
|
|
31
|
+
...currentPrefs,
|
|
32
|
+
channels: { ...currentPrefs.channels, [channel]: hasEnabledEndpoint },
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
router.get('/endpoints', (req, res) => {
|
|
36
|
+
try {
|
|
37
|
+
const channel = readText(req.query.channel);
|
|
38
|
+
if (!channel) {
|
|
39
|
+
return res.status(400).json({ error: 'channel is required' });
|
|
40
|
+
}
|
|
41
|
+
const userId = readUserId(req);
|
|
42
|
+
const endpoints = notificationChannelEndpointsDb
|
|
43
|
+
.getEndpoints(userId, channel)
|
|
44
|
+
.map(sanitizeEndpoint);
|
|
45
|
+
return res.json({ success: true, endpoints });
|
|
46
|
+
}
|
|
47
|
+
catch (error) {
|
|
48
|
+
console.error('Error fetching notification endpoints:', error);
|
|
49
|
+
return res.status(500).json({ error: 'Failed to fetch notification endpoints' });
|
|
50
|
+
}
|
|
51
|
+
});
|
|
52
|
+
router.post('/endpoints/current', (req, res) => {
|
|
53
|
+
try {
|
|
54
|
+
const { channel, endpointId, label, metadata = {}, enabled = true } = req.body || {};
|
|
55
|
+
const normalizedChannel = readText(channel);
|
|
56
|
+
const normalizedEndpointId = readText(endpointId);
|
|
57
|
+
if (!normalizedChannel || !normalizedEndpointId) {
|
|
58
|
+
return res.status(400).json({ error: 'channel and endpointId are required' });
|
|
59
|
+
}
|
|
60
|
+
const userId = readUserId(req);
|
|
61
|
+
const endpoint = notificationChannelEndpointsDb.upsertEndpoint({
|
|
62
|
+
userId,
|
|
63
|
+
channel: normalizedChannel,
|
|
64
|
+
endpointId: normalizedEndpointId,
|
|
65
|
+
label,
|
|
66
|
+
metadata: metadata && typeof metadata === 'object' ? metadata : {},
|
|
67
|
+
enabled: enabled !== false,
|
|
68
|
+
});
|
|
69
|
+
const preferences = updateChannelPreference(userId, normalizedChannel);
|
|
70
|
+
return res.json({ success: true, endpoint: sanitizeEndpoint(endpoint), preferences });
|
|
71
|
+
}
|
|
72
|
+
catch (error) {
|
|
73
|
+
console.error('Error registering notification endpoint:', error);
|
|
74
|
+
return res.status(500).json({ error: 'Failed to register notification endpoint' });
|
|
75
|
+
}
|
|
76
|
+
});
|
|
77
|
+
router.patch('/endpoints/:channel/:endpointId', (req, res) => {
|
|
78
|
+
try {
|
|
79
|
+
const { channel, endpointId } = req.params;
|
|
80
|
+
const { enabled } = req.body || {};
|
|
81
|
+
if (typeof enabled !== 'boolean') {
|
|
82
|
+
return res.status(400).json({ error: 'enabled must be a boolean' });
|
|
83
|
+
}
|
|
84
|
+
const userId = readUserId(req);
|
|
85
|
+
const updated = notificationChannelEndpointsDb.setEndpointEnabled(userId, channel, endpointId, enabled);
|
|
86
|
+
if (!updated) {
|
|
87
|
+
return res.status(404).json({ error: 'Notification endpoint not found' });
|
|
88
|
+
}
|
|
89
|
+
const endpoint = notificationChannelEndpointsDb.getEndpoint(userId, channel, endpointId);
|
|
90
|
+
const preferences = updateChannelPreference(userId, channel);
|
|
91
|
+
return res.json({ success: true, endpoint: endpoint ? sanitizeEndpoint(endpoint) : null, preferences });
|
|
92
|
+
}
|
|
93
|
+
catch (error) {
|
|
94
|
+
console.error('Error updating notification endpoint:', error);
|
|
95
|
+
return res.status(500).json({ error: 'Failed to update notification endpoint' });
|
|
96
|
+
}
|
|
97
|
+
});
|
|
98
|
+
router.delete('/endpoints/:channel/:endpointId', (req, res) => {
|
|
99
|
+
try {
|
|
100
|
+
const { channel, endpointId } = req.params;
|
|
101
|
+
const userId = readUserId(req);
|
|
102
|
+
const removed = notificationChannelEndpointsDb.removeEndpoint(userId, channel, endpointId);
|
|
103
|
+
if (!removed) {
|
|
104
|
+
return res.status(404).json({ error: 'Notification endpoint not found' });
|
|
105
|
+
}
|
|
106
|
+
const preferences = updateChannelPreference(userId, channel);
|
|
107
|
+
return res.json({ success: true, preferences });
|
|
108
|
+
}
|
|
109
|
+
catch (error) {
|
|
110
|
+
console.error('Error removing notification endpoint:', error);
|
|
111
|
+
return res.status(500).json({ error: 'Failed to remove notification endpoint' });
|
|
112
|
+
}
|
|
113
|
+
});
|
|
114
|
+
export default router;
|
|
115
|
+
//# sourceMappingURL=notifications.routes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"notifications.routes.js","sourceRoot":"","sources":["../../../../server/modules/notifications/notifications.routes.ts"],"names":[],"mappings":"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"}
|
package/dist-server/server/modules/notifications/services/desktop-notification-clients.service.js
ADDED
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
import { notificationChannelEndpointsDb } from '../../../modules/database/index.js';
|
|
2
|
+
const DESKTOP_CHANNEL = 'desktop';
|
|
3
|
+
const clientsByUserId = new Map();
|
|
4
|
+
const clientBySocket = new WeakMap();
|
|
5
|
+
function normalizeUserId(userId) {
|
|
6
|
+
const numeric = Number(userId);
|
|
7
|
+
return Number.isInteger(numeric) && numeric > 0 ? numeric : null;
|
|
8
|
+
}
|
|
9
|
+
function normalizeEndpointId(endpointId) {
|
|
10
|
+
if (typeof endpointId !== 'string')
|
|
11
|
+
return '';
|
|
12
|
+
return endpointId.trim();
|
|
13
|
+
}
|
|
14
|
+
function getUserClients(userId, create = false) {
|
|
15
|
+
const normalizedUserId = normalizeUserId(userId);
|
|
16
|
+
if (!normalizedUserId)
|
|
17
|
+
return null;
|
|
18
|
+
let clients = clientsByUserId.get(normalizedUserId);
|
|
19
|
+
if (!clients && create) {
|
|
20
|
+
clients = new Map();
|
|
21
|
+
clientsByUserId.set(normalizedUserId, clients);
|
|
22
|
+
}
|
|
23
|
+
return clients || null;
|
|
24
|
+
}
|
|
25
|
+
export function registerDesktopNotificationClient({ userId, deviceId, label = null, platform = null, appVersion = null, ws, }) {
|
|
26
|
+
const normalizedUserId = normalizeUserId(userId);
|
|
27
|
+
const endpointId = normalizeEndpointId(deviceId);
|
|
28
|
+
if (!normalizedUserId || !endpointId) {
|
|
29
|
+
return false;
|
|
30
|
+
}
|
|
31
|
+
const endpoint = notificationChannelEndpointsDb.upsertEndpoint({
|
|
32
|
+
userId: normalizedUserId,
|
|
33
|
+
channel: DESKTOP_CHANNEL,
|
|
34
|
+
endpointId,
|
|
35
|
+
label,
|
|
36
|
+
metadata: { platform, appVersion },
|
|
37
|
+
enabled: true,
|
|
38
|
+
});
|
|
39
|
+
const clients = getUserClients(normalizedUserId, true);
|
|
40
|
+
const previous = clients.get(endpointId);
|
|
41
|
+
if (previous && previous !== ws && previous.readyState === previous.OPEN) {
|
|
42
|
+
previous.close(4000, 'Device reconnected');
|
|
43
|
+
}
|
|
44
|
+
clients.set(endpointId, ws);
|
|
45
|
+
clientBySocket.set(ws, { userId: normalizedUserId, endpointId });
|
|
46
|
+
return endpoint;
|
|
47
|
+
}
|
|
48
|
+
export function unregisterDesktopNotificationClient(ws) {
|
|
49
|
+
const registration = clientBySocket.get(ws);
|
|
50
|
+
if (!registration)
|
|
51
|
+
return;
|
|
52
|
+
const clients = getUserClients(registration.userId);
|
|
53
|
+
if (clients?.get(registration.endpointId) === ws) {
|
|
54
|
+
clients.delete(registration.endpointId);
|
|
55
|
+
if (clients.size === 0) {
|
|
56
|
+
clientsByUserId.delete(registration.userId);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
clientBySocket.delete(ws);
|
|
60
|
+
}
|
|
61
|
+
export function sendDesktopNotification(userId, payload) {
|
|
62
|
+
const normalizedUserId = normalizeUserId(userId);
|
|
63
|
+
if (!normalizedUserId)
|
|
64
|
+
return { attempted: 0, sent: 0 };
|
|
65
|
+
const clients = getUserClients(normalizedUserId);
|
|
66
|
+
if (!clients?.size)
|
|
67
|
+
return { attempted: 0, sent: 0 };
|
|
68
|
+
const enabledEndpointIds = new Set(notificationChannelEndpointsDb
|
|
69
|
+
.getEnabledEndpoints(normalizedUserId, DESKTOP_CHANNEL)
|
|
70
|
+
.map((endpoint) => endpoint.endpoint_id));
|
|
71
|
+
const message = JSON.stringify({
|
|
72
|
+
type: 'notification',
|
|
73
|
+
id: typeof payload?.data?.tag === 'string' ? payload.data.tag : `${Date.now()}`,
|
|
74
|
+
payload,
|
|
75
|
+
});
|
|
76
|
+
let attempted = 0;
|
|
77
|
+
let sent = 0;
|
|
78
|
+
for (const [endpointId, ws] of clients.entries()) {
|
|
79
|
+
if (!enabledEndpointIds.has(endpointId))
|
|
80
|
+
continue;
|
|
81
|
+
attempted += 1;
|
|
82
|
+
if (ws.readyState !== ws.OPEN) {
|
|
83
|
+
unregisterDesktopNotificationClient(ws);
|
|
84
|
+
continue;
|
|
85
|
+
}
|
|
86
|
+
try {
|
|
87
|
+
ws.send(message);
|
|
88
|
+
notificationChannelEndpointsDb.touchEndpoint(normalizedUserId, DESKTOP_CHANNEL, endpointId);
|
|
89
|
+
sent += 1;
|
|
90
|
+
}
|
|
91
|
+
catch {
|
|
92
|
+
unregisterDesktopNotificationClient(ws);
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
return { attempted, sent };
|
|
96
|
+
}
|
|
97
|
+
//# sourceMappingURL=desktop-notification-clients.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"desktop-notification-clients.service.js","sourceRoot":"","sources":["../../../../../server/modules/notifications/services/desktop-notification-clients.service.ts"],"names":[],"mappings":"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"}
|