@clagentic/console 1.5.0-beta.3 → 1.5.0
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.md +18 -14
- package/lib/cli-sessions.js +71 -18
- package/lib/daemon.js +72 -24
- package/lib/pages.js +1 -42
- package/lib/project-connection.js +4 -8
- package/lib/project-loop.js +1 -1
- package/lib/project-notifications.js +3 -18
- package/lib/project-sessions.js +19 -26
- package/lib/project-user-message.js +5 -10
- package/lib/project.js +39 -52
- package/lib/public/app.js +5 -15
- package/lib/public/modules/admin.js +1 -52
- package/lib/public/modules/agent-picker.js +11 -3
- package/lib/public/modules/app-cursors.js +43 -47
- package/lib/public/modules/app-messages.js +5 -12
- package/lib/public/modules/app-rendering.js +1 -2
- package/lib/public/modules/sidebar-projects.js +1 -1
- package/lib/public/modules/sidebar-sessions.js +2 -2
- package/lib/public/modules/sidebar-users.js +2 -12
- package/lib/public/modules/user-settings.js +0 -3
- package/lib/sdk-bridge.js +47 -7
- package/lib/sdk-message-processor.js +3 -4
- package/lib/server-admin.js +1 -86
- package/lib/server-auth.js +13 -124
- package/lib/server-dm.js +2 -7
- package/lib/server-palette.js +9 -20
- package/lib/server-settings.js +41 -243
- package/lib/server-skills.js +11 -13
- package/lib/server.js +25 -60
- package/lib/sessions.js +16 -50
- package/lib/terminal-manager.js +13 -15
- package/lib/users-auth.js +0 -38
- package/lib/users.js +14 -11
- package/lib/yoke/adapters/claude.js +5 -0
- package/package.json +1 -1
package/lib/sessions.js
CHANGED
|
@@ -25,7 +25,6 @@ function createSessionManager(opts) {
|
|
|
25
25
|
var slashCommands = null; // shared across sessions (deprecated, use slashCommandsByVendor)
|
|
26
26
|
var slashCommandsByVendor = {}; // vendor -> array of slash commands
|
|
27
27
|
var skillNames = null; // Claude-only skills to filter from slash menu
|
|
28
|
-
var singleUserUnread = {}; // sessionLocalId -> unread count (single-user mode)
|
|
29
28
|
var permissionRequestIndex = {}; // requestId -> sessionLocalId (O(1) lookup)
|
|
30
29
|
var capabilitiesByVendor = null; // set by sdk-bridge after adapter init
|
|
31
30
|
var defaultVendor = null; // set by sdk-bridge
|
|
@@ -340,7 +339,7 @@ function createSessionManager(opts) {
|
|
|
340
339
|
}
|
|
341
340
|
}
|
|
342
341
|
var isActive = (typeof clientActiveId === "number") ? s.localId === clientActiveId : s.localId === activeSessionId;
|
|
343
|
-
var unreadMap = wsUnread ||
|
|
342
|
+
var unreadMap = wsUnread || {};
|
|
344
343
|
return {
|
|
345
344
|
id: s.localId,
|
|
346
345
|
cliSessionId: s.cliSessionId || null,
|
|
@@ -360,12 +359,8 @@ function createSessionManager(opts) {
|
|
|
360
359
|
}
|
|
361
360
|
|
|
362
361
|
function getVisibleSessions() {
|
|
363
|
-
var multiUser = users.isMultiUser();
|
|
364
362
|
return [...sessions.values()].filter(function (s) {
|
|
365
363
|
if (s.hidden) return false;
|
|
366
|
-
if (!multiUser) {
|
|
367
|
-
return !s.ownerId;
|
|
368
|
-
}
|
|
369
364
|
return true;
|
|
370
365
|
});
|
|
371
366
|
}
|
|
@@ -551,32 +546,21 @@ function createSessionManager(opts) {
|
|
|
551
546
|
}
|
|
552
547
|
var session = sessions.get(localId);
|
|
553
548
|
|
|
554
|
-
// Access check for client-initiated switches.
|
|
555
|
-
//
|
|
556
|
-
//
|
|
557
|
-
//
|
|
558
|
-
// bypass this gate — they operate on already-validated session references.
|
|
549
|
+
// Access check for client-initiated switches. Defer to users.canAccessSession
|
|
550
|
+
// (same rules as getVisibleSessions / server-palette). Internal callers
|
|
551
|
+
// (targetWs=null) bypass this gate — they operate on already-validated session
|
|
552
|
+
// references.
|
|
559
553
|
if (targetWs) {
|
|
560
|
-
var
|
|
561
|
-
if (
|
|
562
|
-
|
|
563
|
-
|
|
564
|
-
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
if (sendTo) sendTo(targetWs, { type: "error", error: "Access denied" });
|
|
571
|
-
return;
|
|
572
|
-
}
|
|
573
|
-
} else {
|
|
574
|
-
// Single-user mode: sessions with an ownerId were created in a multi-user
|
|
575
|
-
// context; block access to prevent cross-context leakage.
|
|
576
|
-
if (session.ownerId) {
|
|
577
|
-
if (sendTo) sendTo(targetWs, { type: "error", error: "Access denied" });
|
|
578
|
-
return;
|
|
579
|
-
}
|
|
554
|
+
var requestingUser = targetWs._clayUser || null;
|
|
555
|
+
if (!requestingUser) {
|
|
556
|
+
if (sendTo) sendTo(targetWs, { type: "error", error: "Access denied" });
|
|
557
|
+
return;
|
|
558
|
+
}
|
|
559
|
+
// Use { visibility: "public" } so canAccessProject passes and the
|
|
560
|
+
// session-level ownership/visibility rules do the real work.
|
|
561
|
+
if (!users.canAccessSession(requestingUser.id, session, { visibility: "public" })) {
|
|
562
|
+
if (sendTo) sendTo(targetWs, { type: "error", error: "Access denied" });
|
|
563
|
+
return;
|
|
580
564
|
}
|
|
581
565
|
}
|
|
582
566
|
|
|
@@ -591,9 +575,6 @@ function createSessionManager(opts) {
|
|
|
591
575
|
ws._clayActiveSession = localId;
|
|
592
576
|
});
|
|
593
577
|
}
|
|
594
|
-
// Clear unread for single-user mode
|
|
595
|
-
singleUserUnread[localId] = 0;
|
|
596
|
-
|
|
597
578
|
// Update LRU when a session is switched to (history will be loaded in replayHistory).
|
|
598
579
|
_lruTouch(localId);
|
|
599
580
|
|
|
@@ -653,9 +634,6 @@ function createSessionManager(opts) {
|
|
|
653
634
|
delete _writeBuffers[localId];
|
|
654
635
|
_lruRemove(localId);
|
|
655
636
|
|
|
656
|
-
// Clean up unread tracking
|
|
657
|
-
delete singleUserUnread[localId];
|
|
658
|
-
|
|
659
637
|
cleanupMentionSessions(session);
|
|
660
638
|
|
|
661
639
|
if (session.abortController) {
|
|
@@ -701,7 +679,6 @@ function createSessionManager(opts) {
|
|
|
701
679
|
delete _writeBuffers[localId];
|
|
702
680
|
_lruRemove(localId);
|
|
703
681
|
|
|
704
|
-
delete singleUserUnread[localId];
|
|
705
682
|
cleanupMentionSessions(session);
|
|
706
683
|
if (session.abortController) {
|
|
707
684
|
try { session.abortController.abort(); } catch(e) {}
|
|
@@ -810,17 +787,6 @@ function createSessionManager(opts) {
|
|
|
810
787
|
}
|
|
811
788
|
} else if (session.localId === activeSessionId) {
|
|
812
789
|
send(obj);
|
|
813
|
-
} else {
|
|
814
|
-
// Track unread for single-user mode on "done"
|
|
815
|
-
if (obj.type === "done") {
|
|
816
|
-
singleUserUnread[session.localId] = (singleUserUnread[session.localId] || 0) + 1;
|
|
817
|
-
send({ type: "session_unread", id: session.localId, count: singleUserUnread[session.localId] });
|
|
818
|
-
}
|
|
819
|
-
if (session.isProcessing && !session._ioThrottle) {
|
|
820
|
-
session._ioThrottle = true;
|
|
821
|
-
send({ type: "session_io", id: session.localId });
|
|
822
|
-
setTimeout(function () { session._ioThrottle = false; }, 80);
|
|
823
|
-
}
|
|
824
790
|
}
|
|
825
791
|
// Notify server for cross-project unread tracking
|
|
826
792
|
if (obj.type === "done") onSessionDone();
|
|
@@ -1101,7 +1067,7 @@ function createSessionManager(opts) {
|
|
|
1101
1067
|
mapSessionForClient: mapSessionForClient,
|
|
1102
1068
|
broadcastSessionList: broadcastSessionList,
|
|
1103
1069
|
getTotalUnread: function (ws) {
|
|
1104
|
-
var unreadMap = ws && ws._clayUnread ? ws._clayUnread :
|
|
1070
|
+
var unreadMap = (ws && ws._clayUnread) ? ws._clayUnread : {};
|
|
1105
1071
|
var total = 0;
|
|
1106
1072
|
var keys = Object.keys(unreadMap);
|
|
1107
1073
|
for (var i = 0; i < keys.length; i++) {
|
package/lib/terminal-manager.js
CHANGED
|
@@ -6,20 +6,19 @@ var SCROLLBACK_MAX = 50 * 1024; // 50 KB per terminal
|
|
|
6
6
|
/**
|
|
7
7
|
* Create a terminal manager for a project.
|
|
8
8
|
* Manages persistent PTY sessions with scrollback buffering.
|
|
9
|
-
* opts: { cwd, send, sendTo,
|
|
9
|
+
* opts: { cwd, send, sendTo, broadcastTermList }
|
|
10
10
|
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
*
|
|
14
|
-
*
|
|
15
|
-
*
|
|
16
|
-
*
|
|
11
|
+
* Ownership enforcement is always active. Each terminal records ownerUserId
|
|
12
|
+
* from ws._clayUser.id at creation time. Operations that mutate or read
|
|
13
|
+
* private output (attach, write, close, rename) are restricted to the owning
|
|
14
|
+
* user or admins (ws._clayUser.role === "admin"). term_list results are
|
|
15
|
+
* filtered to the requesting user's own terminals; admins see all with an
|
|
16
|
+
* ownerUserId field attached.
|
|
17
17
|
*/
|
|
18
18
|
function createTerminalManager(opts) {
|
|
19
19
|
var cwd = opts.cwd;
|
|
20
20
|
var send = opts.send;
|
|
21
21
|
var sendTo = opts.sendTo;
|
|
22
|
-
var isMultiUser = opts.isMultiUser || false;
|
|
23
22
|
// broadcastTermList(callerWs): optional callback for filtered list broadcasts.
|
|
24
23
|
// When provided, replaces the bare send({ type: "term_list" }) on exit so that
|
|
25
24
|
// each connected client only sees their own terminals in multi-user mode.
|
|
@@ -30,14 +29,13 @@ function createTerminalManager(opts) {
|
|
|
30
29
|
var terminals = new Map(); // id -> terminal session
|
|
31
30
|
|
|
32
31
|
// Returns true if callerWs is authorized for the given terminal session.
|
|
33
|
-
//
|
|
34
|
-
//
|
|
32
|
+
// Authorized if: no owner set, same user, or caller is admin.
|
|
33
|
+
// system context (callerWs === null): allowed. Unauthenticated ws (_clayUser null): denied.
|
|
35
34
|
function isAuthorized(session, callerWs) {
|
|
36
|
-
if (!
|
|
37
|
-
if (!
|
|
38
|
-
if (!session.ownerUserId) return true; // legacy terminal with no owner
|
|
35
|
+
if (!callerWs) return true; // internal/system call — no WS context
|
|
36
|
+
if (!session.ownerUserId) return true; // unowned terminal — anyone may access
|
|
39
37
|
var caller = callerWs._clayUser;
|
|
40
|
-
if (!caller) return
|
|
38
|
+
if (!caller) return false; // unauthenticated ws — deny access to owned terminals
|
|
41
39
|
if (caller.role === "admin") return true;
|
|
42
40
|
return caller.id === session.ownerUserId;
|
|
43
41
|
}
|
|
@@ -215,7 +213,7 @@ function createTerminalManager(opts) {
|
|
|
215
213
|
exited: session.exited,
|
|
216
214
|
};
|
|
217
215
|
// Admins see the owner label so they can distinguish whose terminal it is.
|
|
218
|
-
if (
|
|
216
|
+
if (callerWs && callerWs._clayUser && callerWs._clayUser.role === "admin" && session.ownerUserId) {
|
|
219
217
|
entry.ownerUserId = session.ownerUserId;
|
|
220
218
|
}
|
|
221
219
|
result.push(entry);
|
package/lib/users-auth.js
CHANGED
|
@@ -5,41 +5,6 @@ function attachAuth(deps) {
|
|
|
5
5
|
var saveUsers = deps.saveUsers;
|
|
6
6
|
var findAdmin = deps.findAdmin;
|
|
7
7
|
|
|
8
|
-
// --- Multi-user mode ---
|
|
9
|
-
|
|
10
|
-
function isMultiUser() {
|
|
11
|
-
var data = loadUsers();
|
|
12
|
-
return !!data.multiUser;
|
|
13
|
-
}
|
|
14
|
-
|
|
15
|
-
function enableMultiUser() {
|
|
16
|
-
var data = loadUsers();
|
|
17
|
-
if (data.multiUser) {
|
|
18
|
-
// Already enabled -- check if admin exists
|
|
19
|
-
var admin = findAdmin(data);
|
|
20
|
-
if (admin) {
|
|
21
|
-
return { alreadyEnabled: true, hasAdmin: true, setupCode: null };
|
|
22
|
-
}
|
|
23
|
-
// Multi-user enabled but no admin -- regenerate setup code
|
|
24
|
-
var code = generateSetupCode();
|
|
25
|
-
data.setupCode = code;
|
|
26
|
-
saveUsers(data);
|
|
27
|
-
return { alreadyEnabled: true, hasAdmin: false, setupCode: code };
|
|
28
|
-
}
|
|
29
|
-
var code = generateSetupCode();
|
|
30
|
-
data.multiUser = true;
|
|
31
|
-
data.setupCode = code;
|
|
32
|
-
saveUsers(data);
|
|
33
|
-
return { alreadyEnabled: false, hasAdmin: false, setupCode: code };
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
function disableMultiUser() {
|
|
37
|
-
var data = loadUsers();
|
|
38
|
-
data.multiUser = false;
|
|
39
|
-
data.setupCode = null;
|
|
40
|
-
saveUsers(data);
|
|
41
|
-
}
|
|
42
|
-
|
|
43
8
|
// --- Setup code ---
|
|
44
9
|
|
|
45
10
|
function generateSetupCode() {
|
|
@@ -152,9 +117,6 @@ function attachAuth(deps) {
|
|
|
152
117
|
}
|
|
153
118
|
|
|
154
119
|
return {
|
|
155
|
-
isMultiUser: isMultiUser,
|
|
156
|
-
enableMultiUser: enableMultiUser,
|
|
157
|
-
disableMultiUser: disableMultiUser,
|
|
158
120
|
generateSetupCode: generateSetupCode,
|
|
159
121
|
getSetupCode: getSetupCode,
|
|
160
122
|
clearSetupCode: clearSetupCode,
|
package/lib/users.js
CHANGED
|
@@ -14,7 +14,7 @@ var USERS_FILE = path.join(CONFIG_DIR, "users.json");
|
|
|
14
14
|
|
|
15
15
|
function defaultData() {
|
|
16
16
|
return {
|
|
17
|
-
multiUser:
|
|
17
|
+
multiUser: true,
|
|
18
18
|
setupCode: null,
|
|
19
19
|
users: [],
|
|
20
20
|
invites: [],
|
|
@@ -35,7 +35,7 @@ function loadUsers() {
|
|
|
35
35
|
// Ensure all required fields exist
|
|
36
36
|
if (!data.users) data.users = [];
|
|
37
37
|
if (!data.invites) data.invites = [];
|
|
38
|
-
if (data.multiUser === undefined) data.multiUser =
|
|
38
|
+
if (data.multiUser === undefined) data.multiUser = true;
|
|
39
39
|
if (data.setupCode === undefined) data.setupCode = null;
|
|
40
40
|
if (data.smtp === undefined) data.smtp = null;
|
|
41
41
|
return data;
|
|
@@ -45,9 +45,18 @@ function loadUsers() {
|
|
|
45
45
|
}
|
|
46
46
|
|
|
47
47
|
function saveUsers(data) {
|
|
48
|
-
//
|
|
49
|
-
//
|
|
50
|
-
// is
|
|
48
|
+
// Synchronous atomic write first so callers can immediately read back the
|
|
49
|
+
// saved state (e.g. findUserById after createUser during /auth/setup).
|
|
50
|
+
// The async store.writeJson queue is also fired so the file ends up in the
|
|
51
|
+
// store's write queue for any concurrent writers that might also update it.
|
|
52
|
+
var tmpPath = USERS_FILE + ".tmp." + process.pid;
|
|
53
|
+
try {
|
|
54
|
+
fs.writeFileSync(tmpPath, JSON.stringify(data, null, 2), { mode: 0o600 });
|
|
55
|
+
fs.renameSync(tmpPath, USERS_FILE);
|
|
56
|
+
} catch (e) {
|
|
57
|
+
process.stderr.write("[users] saveUsers sync write failed: " + (e && e.message ? e.message : e) + "\n");
|
|
58
|
+
}
|
|
59
|
+
// Also queue through store.js for consistency with other store writers.
|
|
51
60
|
store.writeJson("users.json", data).catch(function (err) {
|
|
52
61
|
process.stderr.write("[users] saveUsers failed: " + (err && err.message ? err.message : err) + "\n");
|
|
53
62
|
});
|
|
@@ -372,9 +381,6 @@ var permissions = attachPermissions({ loadUsers: loadUsers, saveUsers: saveUsers
|
|
|
372
381
|
var preferences = attachPreferences({ loadUsers: loadUsers, saveUsers: saveUsers });
|
|
373
382
|
|
|
374
383
|
// Alias auth functions
|
|
375
|
-
var isMultiUser = auth.isMultiUser;
|
|
376
|
-
var enableMultiUser = auth.enableMultiUser;
|
|
377
|
-
var disableMultiUser = auth.disableMultiUser;
|
|
378
384
|
var getSetupCode = auth.getSetupCode;
|
|
379
385
|
var clearSetupCode = auth.clearSetupCode;
|
|
380
386
|
var validateSetupCode = auth.validateSetupCode;
|
|
@@ -414,9 +420,6 @@ module.exports = {
|
|
|
414
420
|
USERS_FILE: USERS_FILE,
|
|
415
421
|
loadUsers: loadUsers,
|
|
416
422
|
saveUsers: saveUsers,
|
|
417
|
-
isMultiUser: isMultiUser,
|
|
418
|
-
enableMultiUser: enableMultiUser,
|
|
419
|
-
disableMultiUser: disableMultiUser,
|
|
420
423
|
getSetupCode: getSetupCode,
|
|
421
424
|
clearSetupCode: clearSetupCode,
|
|
422
425
|
validateSetupCode: validateSetupCode,
|
|
@@ -1250,6 +1250,9 @@ function createClaudeAdapter(opts) {
|
|
|
1250
1250
|
if (co.agentProgressSummaries != null) sdkOptions.agentProgressSummaries = co.agentProgressSummaries;
|
|
1251
1251
|
if (co.agent) sdkOptions.agent = co.agent;
|
|
1252
1252
|
if (co.agents) sdkOptions.agents = co.agents;
|
|
1253
|
+
// lr-5bd7: systemPrompt from co (adapterOptions.CLAUDE) takes precedence over
|
|
1254
|
+
// queryOpts.systemPrompt so named-agent body injection wins over caller defaults.
|
|
1255
|
+
if (co.systemPrompt) sdkOptions.systemPrompt = co.systemPrompt;
|
|
1253
1256
|
if (co.thinking) sdkOptions.thinking = co.thinking;
|
|
1254
1257
|
if (co.betas && co.betas.length > 0) sdkOptions.betas = co.betas;
|
|
1255
1258
|
if (co.permissionMode) sdkOptions.permissionMode = co.permissionMode;
|
|
@@ -1414,6 +1417,8 @@ function createClaudeAdapter(opts) {
|
|
|
1414
1417
|
if (claudeOpts.agentProgressSummaries != null) queryOptions.agentProgressSummaries = claudeOpts.agentProgressSummaries;
|
|
1415
1418
|
if (claudeOpts.agent) queryOptions.agent = claudeOpts.agent;
|
|
1416
1419
|
if (claudeOpts.agents) queryOptions.agents = claudeOpts.agents;
|
|
1420
|
+
// lr-5bd7: forward systemPrompt to the worker so named-agent body injection reaches the SDK.
|
|
1421
|
+
if (claudeOpts.systemPrompt) queryOptions.systemPrompt = claudeOpts.systemPrompt;
|
|
1417
1422
|
if (claudeOpts.thinking) queryOptions.thinking = claudeOpts.thinking;
|
|
1418
1423
|
if (claudeOpts.betas && claudeOpts.betas.length > 0) queryOptions.betas = claudeOpts.betas;
|
|
1419
1424
|
if (claudeOpts.permissionMode) queryOptions.permissionMode = claudeOpts.permissionMode;
|
package/package.json
CHANGED