@clagentic/console 1.5.0-beta.2 → 1.5.0-beta.4
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/bin/cli.js +1 -0
- package/lib/cli-sessions.js +71 -18
- package/lib/config.js +80 -6
- package/lib/daemon-projects.js +1 -1
- package/lib/daemon.js +142 -26
- package/lib/pages.js +1 -42
- package/lib/project-connection.js +4 -8
- package/lib/project-external-trigger.js +62 -7
- package/lib/project-http.js +17 -1
- package/lib/project-loop.js +3 -2
- package/lib/project-notifications.js +3 -18
- package/lib/project-sessions.js +68 -27
- package/lib/project-team.js +417 -0
- package/lib/project-user-message.js +5 -10
- package/lib/project.js +53 -53
- package/lib/public/app.js +7 -15
- package/lib/public/css/home-hub.css +36 -0
- package/lib/public/css/icon-strip.css +28 -126
- package/lib/public/css/menus.css +2 -2
- package/lib/public/css/team-panel.css +149 -0
- package/lib/public/index.html +72 -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-home-hub.js +12 -0
- package/lib/public/modules/app-messages.js +18 -12
- package/lib/public/modules/app-rendering.js +1 -2
- package/lib/public/modules/server-settings.js +74 -5
- package/lib/public/modules/sidebar-mobile.js +9 -88
- package/lib/public/modules/sidebar-projects.js +1 -1
- package/lib/public/modules/sidebar-sessions.js +6 -2
- package/lib/public/modules/sidebar-users.js +37 -307
- package/lib/public/modules/team-panel.js +331 -0
- package/lib/public/modules/tools.js +3 -0
- package/lib/public/modules/user-settings.js +0 -3
- package/lib/public/style.css +1 -0
- package/lib/sdk-bridge.js +121 -8
- package/lib/sdk-message-processor.js +39 -4
- package/lib/sdk-worker.js +2 -2
- 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 +37 -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/ws-schema.js +12 -0
- package/lib/yoke/adapters/claude.js +5 -0
- package/package.json +1 -1
|
@@ -0,0 +1,417 @@
|
|
|
1
|
+
// lib/project-team.js
|
|
2
|
+
// Team activity watcher: watches ~/.claude/teams/, ~/.claude/tasks/, and
|
|
3
|
+
// per-teammate subagent JSONL files. Emits team_state, team_member_update,
|
|
4
|
+
// team_task_update, team_message, team_gone WS messages.
|
|
5
|
+
|
|
6
|
+
var fs = require("fs");
|
|
7
|
+
var path = require("path");
|
|
8
|
+
var utils = require("./utils");
|
|
9
|
+
|
|
10
|
+
function attachTeam(ctx) {
|
|
11
|
+
var send = ctx.send;
|
|
12
|
+
var config = ctx.config;
|
|
13
|
+
// sm is optional (may be null if not yet wired)
|
|
14
|
+
var sm = ctx.sm || null;
|
|
15
|
+
|
|
16
|
+
var teamState = null; // null or { teamId, teamName, description, members[], tasks[] }
|
|
17
|
+
var teamMessages = []; // last 50 team_message payloads
|
|
18
|
+
var agentTails = {}; // agentId -> { path, offset, watcher }
|
|
19
|
+
var memberLastActivity = {}; // agentId -> Unix ms timestamp
|
|
20
|
+
var memberStatus = {}; // agentId -> last known status string
|
|
21
|
+
var teamWatcher = null;
|
|
22
|
+
var taskWatcher = null;
|
|
23
|
+
var configWatcher = null;
|
|
24
|
+
var livenessTimer = null;
|
|
25
|
+
var deactivatePendingMs = 0; // epoch when deactivate-if-missing starts
|
|
26
|
+
var DEACTIVATE_AFTER_MS = 30000;
|
|
27
|
+
|
|
28
|
+
function getClaudeDir() {
|
|
29
|
+
return path.join(config.REAL_HOME, ".claude");
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
function getTeamDir(teamId) {
|
|
33
|
+
return path.join(getClaudeDir(), "teams", teamId);
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
function getTaskDir(teamId) {
|
|
37
|
+
return path.join(getClaudeDir(), "tasks", teamId);
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
function readJsonSafe(filePath) {
|
|
41
|
+
try {
|
|
42
|
+
return JSON.parse(fs.readFileSync(filePath, "utf8"));
|
|
43
|
+
} catch (e) {
|
|
44
|
+
return null;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
function emitTeamState() {
|
|
49
|
+
if (!teamState) return;
|
|
50
|
+
send({ type: "team_state", team: teamState, messages: teamMessages });
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
function emitTeamGone() {
|
|
54
|
+
send({ type: "team_gone" });
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
function deactivateTeam() {
|
|
58
|
+
// Stop all watchers and timers
|
|
59
|
+
if (livenessTimer) { clearInterval(livenessTimer); livenessTimer = null; }
|
|
60
|
+
if (configWatcher) { try { configWatcher.close(); } catch (e) {} configWatcher = null; }
|
|
61
|
+
if (taskWatcher) { try { taskWatcher.close(); } catch (e) {} taskWatcher = null; }
|
|
62
|
+
|
|
63
|
+
var agentIds = Object.keys(agentTails);
|
|
64
|
+
for (var i = 0; i < agentIds.length; i++) {
|
|
65
|
+
var tail = agentTails[agentIds[i]];
|
|
66
|
+
if (tail && tail.watcher) { try { tail.watcher.close(); } catch (e) {} }
|
|
67
|
+
}
|
|
68
|
+
agentTails = {};
|
|
69
|
+
memberLastActivity = {};
|
|
70
|
+
memberStatus = {};
|
|
71
|
+
deactivatePendingMs = 0;
|
|
72
|
+
teamMessages = [];
|
|
73
|
+
teamState = null;
|
|
74
|
+
emitTeamGone();
|
|
75
|
+
console.log("[project-team] Team deactivated");
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
function watchTaskDir(teamId) {
|
|
79
|
+
var dir = getTaskDir(teamId);
|
|
80
|
+
try {
|
|
81
|
+
if (!fs.existsSync(dir)) return;
|
|
82
|
+
} catch (e) {
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
function readTasks() {
|
|
87
|
+
try {
|
|
88
|
+
var files = fs.readdirSync(dir);
|
|
89
|
+
var tasks = [];
|
|
90
|
+
for (var i = 0; i < files.length; i++) {
|
|
91
|
+
if (!files[i].endsWith(".json")) continue;
|
|
92
|
+
var t = readJsonSafe(path.join(dir, files[i]));
|
|
93
|
+
if (t) tasks.push(t);
|
|
94
|
+
}
|
|
95
|
+
return tasks;
|
|
96
|
+
} catch (e) {
|
|
97
|
+
return [];
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
var lastTasksJson = "";
|
|
102
|
+
|
|
103
|
+
function checkTasks() {
|
|
104
|
+
if (!teamState) return;
|
|
105
|
+
var tasks = readTasks();
|
|
106
|
+
var tasksJson = JSON.stringify(tasks);
|
|
107
|
+
if (tasksJson === lastTasksJson) return;
|
|
108
|
+
lastTasksJson = tasksJson;
|
|
109
|
+
teamState.tasks = tasks;
|
|
110
|
+
send({ type: "team_task_update", tasks: tasks });
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
try {
|
|
114
|
+
taskWatcher = fs.watch(dir, function (event) {
|
|
115
|
+
checkTasks();
|
|
116
|
+
});
|
|
117
|
+
taskWatcher.on("error", function () {});
|
|
118
|
+
checkTasks();
|
|
119
|
+
} catch (e) {
|
|
120
|
+
// task dir may not exist — no-op
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
function tailAgentJSONL(agentId, filePath) {
|
|
125
|
+
if (agentTails[agentId] && agentTails[agentId].watcher) {
|
|
126
|
+
// Already tailing this agent
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
var entry = { path: filePath, offset: 0, watcher: null };
|
|
131
|
+
agentTails[agentId] = entry;
|
|
132
|
+
|
|
133
|
+
function readNewLines() {
|
|
134
|
+
try {
|
|
135
|
+
var stat = fs.statSync(filePath);
|
|
136
|
+
if (stat.size <= entry.offset) return;
|
|
137
|
+
var fd = fs.openSync(filePath, "r");
|
|
138
|
+
var bufSize = stat.size - entry.offset;
|
|
139
|
+
var buf = Buffer.alloc(bufSize);
|
|
140
|
+
var bytesRead = fs.readSync(fd, buf, 0, bufSize, entry.offset);
|
|
141
|
+
fs.closeSync(fd);
|
|
142
|
+
entry.offset += bytesRead;
|
|
143
|
+
|
|
144
|
+
var text = buf.slice(0, bytesRead).toString("utf8");
|
|
145
|
+
var lines = text.split("\n");
|
|
146
|
+
for (var i = 0; i < lines.length; i++) {
|
|
147
|
+
var line = lines[i].trim();
|
|
148
|
+
if (!line) continue;
|
|
149
|
+
try {
|
|
150
|
+
var parsed = JSON.parse(line);
|
|
151
|
+
processAgentLine(agentId, parsed);
|
|
152
|
+
} catch (e) {
|
|
153
|
+
// Non-JSON line — skip
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
} catch (e) {
|
|
157
|
+
// File may not exist or be unreadable — tolerate
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
function processAgentLine(aid, parsed) {
|
|
162
|
+
// Update liveness timestamp on any new line
|
|
163
|
+
memberLastActivity[aid] = Date.now();
|
|
164
|
+
|
|
165
|
+
// Look for SendMessage tool use (peer DM)
|
|
166
|
+
if (parsed.message && parsed.message.role === "assistant") {
|
|
167
|
+
var content = parsed.message.content;
|
|
168
|
+
if (Array.isArray(content)) {
|
|
169
|
+
for (var ci = 0; ci < content.length; ci++) {
|
|
170
|
+
var block = content[ci];
|
|
171
|
+
if (block.type === "tool_use") {
|
|
172
|
+
if (block.name === "SendMessage") {
|
|
173
|
+
var input = block.input || {};
|
|
174
|
+
var msg = {
|
|
175
|
+
fromAgentId: aid,
|
|
176
|
+
toAgentId: input.to || "",
|
|
177
|
+
summary: (input.message || "").slice(0, 120),
|
|
178
|
+
body: input.message || "",
|
|
179
|
+
ts: Date.now(),
|
|
180
|
+
};
|
|
181
|
+
teamMessages.push(msg);
|
|
182
|
+
if (teamMessages.length > 50) teamMessages.shift();
|
|
183
|
+
send({ type: "team_message", message: msg });
|
|
184
|
+
} else {
|
|
185
|
+
// Non-SendMessage tool_use: emit activity update
|
|
186
|
+
send({
|
|
187
|
+
type: "team_member_update",
|
|
188
|
+
agentId: aid,
|
|
189
|
+
currentActivity: block.name,
|
|
190
|
+
});
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
// Start watching the file
|
|
199
|
+
try {
|
|
200
|
+
// Read any existing content first
|
|
201
|
+
try {
|
|
202
|
+
var stat = fs.statSync(filePath);
|
|
203
|
+
entry.offset = stat.size; // Start from end (only new lines)
|
|
204
|
+
} catch (e) {}
|
|
205
|
+
|
|
206
|
+
entry.watcher = fs.watch(filePath, function (event) {
|
|
207
|
+
readNewLines();
|
|
208
|
+
});
|
|
209
|
+
entry.watcher.on("error", function () {});
|
|
210
|
+
} catch (e) {
|
|
211
|
+
// File doesn't exist yet — watcher will fail silently
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
|
|
215
|
+
function reconcileAgentTails(members) {
|
|
216
|
+
if (!Array.isArray(members)) return;
|
|
217
|
+
// members is an array of agentId strings or objects with id field
|
|
218
|
+
var memberIds = {};
|
|
219
|
+
for (var i = 0; i < members.length; i++) {
|
|
220
|
+
var m = members[i];
|
|
221
|
+
var id = typeof m === "string" ? m : (m.id || m.agentId || "");
|
|
222
|
+
if (!id) continue;
|
|
223
|
+
memberIds[id] = true;
|
|
224
|
+
}
|
|
225
|
+
|
|
226
|
+
// Stop tails for members no longer in team
|
|
227
|
+
var existing = Object.keys(agentTails);
|
|
228
|
+
for (var ei = 0; ei < existing.length; ei++) {
|
|
229
|
+
if (!memberIds[existing[ei]]) {
|
|
230
|
+
var tail = agentTails[existing[ei]];
|
|
231
|
+
if (tail && tail.watcher) { try { tail.watcher.close(); } catch (e) {} }
|
|
232
|
+
delete agentTails[existing[ei]];
|
|
233
|
+
}
|
|
234
|
+
}
|
|
235
|
+
|
|
236
|
+
// The JSONL path requires cliSessionId and cwd which come in via onTeamCreate.
|
|
237
|
+
// Store them on the entry when available.
|
|
238
|
+
for (var mi = 0; mi < members.length; mi++) {
|
|
239
|
+
var member = members[mi];
|
|
240
|
+
var agentId = typeof member === "string" ? member : (member.id || member.agentId || "");
|
|
241
|
+
if (!agentId) continue;
|
|
242
|
+
if (!agentTails[agentId]) {
|
|
243
|
+
// We don't have a JSONL path yet — mark as pending
|
|
244
|
+
agentTails[agentId] = { path: null, offset: 0, watcher: null };
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
}
|
|
248
|
+
|
|
249
|
+
function watchConfigJson(teamId) {
|
|
250
|
+
var configPath = path.join(getTeamDir(teamId), "config.json");
|
|
251
|
+
var lastMembersJson = "";
|
|
252
|
+
|
|
253
|
+
function reloadConfig() {
|
|
254
|
+
var data = readJsonSafe(configPath);
|
|
255
|
+
if (!data) {
|
|
256
|
+
// config.json disappeared
|
|
257
|
+
deactivatePendingMs = deactivatePendingMs || Date.now();
|
|
258
|
+
return;
|
|
259
|
+
}
|
|
260
|
+
deactivatePendingMs = 0;
|
|
261
|
+
if (!teamState) return;
|
|
262
|
+
|
|
263
|
+
var newMembers = data.members || [];
|
|
264
|
+
var newMembersJson = JSON.stringify(newMembers);
|
|
265
|
+
if (newMembersJson === lastMembersJson) return;
|
|
266
|
+
lastMembersJson = newMembersJson;
|
|
267
|
+
|
|
268
|
+
teamState.members = newMembers;
|
|
269
|
+
teamState.teamName = data.name || teamState.teamName;
|
|
270
|
+
teamState.description = data.description || teamState.description;
|
|
271
|
+
|
|
272
|
+
reconcileAgentTails(newMembers);
|
|
273
|
+
|
|
274
|
+
send({ type: "team_member_update", members: teamState.members });
|
|
275
|
+
}
|
|
276
|
+
|
|
277
|
+
try {
|
|
278
|
+
configWatcher = fs.watch(configPath, function (event) {
|
|
279
|
+
reloadConfig();
|
|
280
|
+
});
|
|
281
|
+
configWatcher.on("error", function () {});
|
|
282
|
+
} catch (e) {
|
|
283
|
+
// File doesn't exist — tolerate
|
|
284
|
+
}
|
|
285
|
+
}
|
|
286
|
+
|
|
287
|
+
function runLivenessCheck() {
|
|
288
|
+
if (!teamState) return;
|
|
289
|
+
|
|
290
|
+
var now = Date.now();
|
|
291
|
+
var members = teamState.members || [];
|
|
292
|
+
var changed = false;
|
|
293
|
+
|
|
294
|
+
for (var i = 0; i < members.length; i++) {
|
|
295
|
+
var m = members[i];
|
|
296
|
+
var aid = typeof m === "string" ? m : (m.id || m.agentId || "");
|
|
297
|
+
if (!aid) continue;
|
|
298
|
+
|
|
299
|
+
var last = memberLastActivity[aid] || 0;
|
|
300
|
+
var status;
|
|
301
|
+
if (last > now - 60000) {
|
|
302
|
+
status = "alive";
|
|
303
|
+
} else if (last > 0) {
|
|
304
|
+
status = "idle";
|
|
305
|
+
} else {
|
|
306
|
+
status = "unknown";
|
|
307
|
+
}
|
|
308
|
+
|
|
309
|
+
if (memberStatus[aid] !== status) {
|
|
310
|
+
memberStatus[aid] = status;
|
|
311
|
+
changed = true;
|
|
312
|
+
send({ type: "team_member_update", agentId: aid, status: status });
|
|
313
|
+
}
|
|
314
|
+
}
|
|
315
|
+
|
|
316
|
+
// Deactivate check: if config.json has been missing for 30s and all are gone
|
|
317
|
+
if (deactivatePendingMs > 0 && (now - deactivatePendingMs) > DEACTIVATE_AFTER_MS) {
|
|
318
|
+
deactivateTeam();
|
|
319
|
+
}
|
|
320
|
+
}
|
|
321
|
+
|
|
322
|
+
function activateTeam(teamId, cliSessionId, cwd) {
|
|
323
|
+
if (teamState) deactivateTeam();
|
|
324
|
+
|
|
325
|
+
var configPath = path.join(getTeamDir(teamId), "config.json");
|
|
326
|
+
var data = readJsonSafe(configPath);
|
|
327
|
+
var members = (data && data.members) || [];
|
|
328
|
+
var tasks = [];
|
|
329
|
+
|
|
330
|
+
// Read initial tasks
|
|
331
|
+
var taskDir = getTaskDir(teamId);
|
|
332
|
+
try {
|
|
333
|
+
if (fs.existsSync(taskDir)) {
|
|
334
|
+
var files = fs.readdirSync(taskDir);
|
|
335
|
+
for (var i = 0; i < files.length; i++) {
|
|
336
|
+
if (!files[i].endsWith(".json")) continue;
|
|
337
|
+
var t = readJsonSafe(path.join(taskDir, files[i]));
|
|
338
|
+
if (t) tasks.push(t);
|
|
339
|
+
}
|
|
340
|
+
}
|
|
341
|
+
} catch (e) {}
|
|
342
|
+
|
|
343
|
+
teamState = {
|
|
344
|
+
teamId: teamId,
|
|
345
|
+
teamName: (data && data.name) || teamId,
|
|
346
|
+
description: (data && data.description) || "",
|
|
347
|
+
members: members,
|
|
348
|
+
tasks: tasks,
|
|
349
|
+
};
|
|
350
|
+
|
|
351
|
+
// Wire up JSONL tails for each member
|
|
352
|
+
if (cliSessionId && cwd) {
|
|
353
|
+
var sessionsBase = path.join(config.REAL_HOME, ".clagentic", "sessions");
|
|
354
|
+
var encodedCwd = utils.resolveEncodedDir(sessionsBase, cwd);
|
|
355
|
+
var subagentDir = path.join(
|
|
356
|
+
config.REAL_HOME,
|
|
357
|
+
".claude",
|
|
358
|
+
"projects",
|
|
359
|
+
encodedCwd,
|
|
360
|
+
cliSessionId,
|
|
361
|
+
"subagents"
|
|
362
|
+
);
|
|
363
|
+
|
|
364
|
+
for (var mi = 0; mi < members.length; mi++) {
|
|
365
|
+
var m = members[mi];
|
|
366
|
+
var aid = typeof m === "string" ? m : (m.id || m.agentId || "");
|
|
367
|
+
if (!aid) continue;
|
|
368
|
+
var jsonlPath = path.join(subagentDir, "agent-" + aid + ".jsonl");
|
|
369
|
+
tailAgentJSONL(aid, jsonlPath);
|
|
370
|
+
}
|
|
371
|
+
}
|
|
372
|
+
|
|
373
|
+
watchConfigJson(teamId);
|
|
374
|
+
watchTaskDir(teamId);
|
|
375
|
+
|
|
376
|
+
livenessTimer = setInterval(runLivenessCheck, 15000);
|
|
377
|
+
|
|
378
|
+
emitTeamState();
|
|
379
|
+
console.log("[project-team] Team activated: " + teamId);
|
|
380
|
+
}
|
|
381
|
+
|
|
382
|
+
function onTeamCreate(teamId, cliSessionId, cwd) {
|
|
383
|
+
activateTeam(teamId, cliSessionId, cwd);
|
|
384
|
+
}
|
|
385
|
+
|
|
386
|
+
function onTeamDelete() {
|
|
387
|
+
if (teamState) deactivateTeam();
|
|
388
|
+
}
|
|
389
|
+
|
|
390
|
+
function handleClientMsg(ws, msg) {
|
|
391
|
+
if (msg.type === "team_request_state") {
|
|
392
|
+
if (teamState) {
|
|
393
|
+
try {
|
|
394
|
+
ws.send(JSON.stringify({ type: "team_state", team: teamState, messages: teamMessages }));
|
|
395
|
+
} catch (e) {}
|
|
396
|
+
}
|
|
397
|
+
return true;
|
|
398
|
+
}
|
|
399
|
+
return false;
|
|
400
|
+
}
|
|
401
|
+
|
|
402
|
+
function getState() {
|
|
403
|
+
return teamState;
|
|
404
|
+
}
|
|
405
|
+
|
|
406
|
+
// Feature-detect: if ~/.claude/teams/ doesn't exist, this module is a no-op
|
|
407
|
+
// at activate time. Watchers are only created on activateTeam().
|
|
408
|
+
|
|
409
|
+
return {
|
|
410
|
+
onTeamCreate: onTeamCreate,
|
|
411
|
+
onTeamDelete: onTeamDelete,
|
|
412
|
+
handleClientMsg: handleClientMsg,
|
|
413
|
+
getState: getState,
|
|
414
|
+
};
|
|
415
|
+
}
|
|
416
|
+
|
|
417
|
+
module.exports = { attachTeam: attachTeam };
|
|
@@ -72,17 +72,12 @@ function attachUserMessage(ctx) {
|
|
|
72
72
|
|
|
73
73
|
// --------------- Terminal list broadcast ---------------
|
|
74
74
|
|
|
75
|
-
//
|
|
76
|
-
// send filtered term_list messages individually instead of broadcasting one.
|
|
75
|
+
// Each client only sees their own terminals — send filtered term_list messages individually.
|
|
77
76
|
function broadcastTermList() {
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
sendTo(bws, { type: "term_list", terminals: tm.list(bws) });
|
|
82
|
-
}
|
|
77
|
+
for (var bws of clients) {
|
|
78
|
+
if (bws.readyState === 1) {
|
|
79
|
+
sendTo(bws, { type: "term_list", terminals: tm.list(bws) });
|
|
83
80
|
}
|
|
84
|
-
} else {
|
|
85
|
-
send({ type: "term_list", terminals: tm.list() });
|
|
86
81
|
}
|
|
87
82
|
}
|
|
88
83
|
|
|
@@ -314,7 +309,7 @@ function attachUserMessage(ctx) {
|
|
|
314
309
|
}
|
|
315
310
|
|
|
316
311
|
// Backfill ownerId for legacy sessions restored without one (multi-user only)
|
|
317
|
-
if (!session.ownerId && ws._clayUser
|
|
312
|
+
if (!session.ownerId && ws._clayUser) {
|
|
318
313
|
session.ownerId = ws._clayUser.id;
|
|
319
314
|
sm.saveSessionFile(session);
|
|
320
315
|
}
|
package/lib/project.js
CHANGED
|
@@ -27,6 +27,7 @@ var { attachConnection } = require("./project-connection");
|
|
|
27
27
|
var { detectLite } = require("./lite-detect");
|
|
28
28
|
var { attachMcp } = require("./project-mcp");
|
|
29
29
|
var { createLocalMcp } = require("./mcp-local");
|
|
30
|
+
var { attachTeam } = require("./project-team");
|
|
30
31
|
// project-notifications is attached globally in server.js, passed via opts.notificationsModule
|
|
31
32
|
|
|
32
33
|
// --- Context Sources persistence ---
|
|
@@ -159,7 +160,7 @@ function createProjectContext(opts) {
|
|
|
159
160
|
// We hard-disable it when multi-user mode is active so the per-user permission
|
|
160
161
|
// model remains intact. Admins who want bypassPermissions must do so per-session.
|
|
161
162
|
var dangerouslySkipPermissionsConfigured = opts.dangerouslySkipPermissions || false;
|
|
162
|
-
var dangerouslySkipPermissions =
|
|
163
|
+
var dangerouslySkipPermissions = false;
|
|
163
164
|
var currentVersion = opts.currentVersion;
|
|
164
165
|
var lanHost = opts.lanHost || null;
|
|
165
166
|
var getProjectCount = opts.getProjectCount || function () { return 1; };
|
|
@@ -173,6 +174,7 @@ function createProjectContext(opts) {
|
|
|
173
174
|
var onSessionDone = opts.onSessionDone || function () {};
|
|
174
175
|
var onPresenceChange = opts.onPresenceChange || function () {};
|
|
175
176
|
var updateChannel = opts.updateChannel || "stable";
|
|
177
|
+
var onSetUpdateChannel = opts.onSetUpdateChannel || null;
|
|
176
178
|
var osUsers = opts.osUsers || false;
|
|
177
179
|
var projectOwnerId = opts.projectOwnerId || null;
|
|
178
180
|
var worktreeMeta = opts.worktreeMeta || null; // { parentSlug, branch, accessible }
|
|
@@ -340,26 +342,24 @@ function createProjectContext(opts) {
|
|
|
340
342
|
|
|
341
343
|
function broadcastClientCount() {
|
|
342
344
|
var msg = { type: "client_count", count: clients.size };
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
});
|
|
360
|
-
}
|
|
361
|
-
msg.users = userList;
|
|
345
|
+
var seen = {};
|
|
346
|
+
var userList = [];
|
|
347
|
+
for (var c of clients) {
|
|
348
|
+
if (!c._clayUser) continue;
|
|
349
|
+
var u = c._clayUser;
|
|
350
|
+
if (seen[u.id]) continue;
|
|
351
|
+
seen[u.id] = true;
|
|
352
|
+
var p = u.profile || {};
|
|
353
|
+
userList.push({
|
|
354
|
+
id: u.id,
|
|
355
|
+
displayName: p.name || u.displayName || u.username,
|
|
356
|
+
username: u.username,
|
|
357
|
+
avatarStyle: p.avatarStyle || "thumbs",
|
|
358
|
+
avatarSeed: p.avatarSeed || u.username,
|
|
359
|
+
avatarCustom: p.avatarCustom || "",
|
|
360
|
+
});
|
|
362
361
|
}
|
|
362
|
+
msg.users = userList;
|
|
363
363
|
send(msg);
|
|
364
364
|
onPresenceChange();
|
|
365
365
|
}
|
|
@@ -420,7 +420,7 @@ function createProjectContext(opts) {
|
|
|
420
420
|
for (var ws of clients) {
|
|
421
421
|
var user = ws._clayUser;
|
|
422
422
|
var filterFn = null;
|
|
423
|
-
if (
|
|
423
|
+
if (user) {
|
|
424
424
|
filterFn = (function (u) {
|
|
425
425
|
return function (s) {
|
|
426
426
|
return usersModule.canAccessSession(u.id, s, { visibility: "public" });
|
|
@@ -554,6 +554,9 @@ function createProjectContext(opts) {
|
|
|
554
554
|
return hasAny ? filtered : undefined;
|
|
555
555
|
}
|
|
556
556
|
|
|
557
|
+
// --- Team activity watcher (delegated to project-team.js) ---
|
|
558
|
+
var _team = attachTeam({ send: send, config: require("./config"), sm: sm });
|
|
559
|
+
|
|
557
560
|
// --- SDK bridge ---
|
|
558
561
|
var sdk = createSDKBridge({
|
|
559
562
|
cwd: cwd,
|
|
@@ -572,19 +575,15 @@ function createProjectContext(opts) {
|
|
|
572
575
|
clayAuthToken: serverAuthToken,
|
|
573
576
|
onProcessingChanged: onProcessingChanged,
|
|
574
577
|
onTurnDone: null,
|
|
578
|
+
onTeamCreate: function (teamId, cliSessionId, cwd) { _team.onTeamCreate(teamId, cliSessionId, cwd); },
|
|
579
|
+
onTeamDelete: function () { _team.onTeamDelete(); },
|
|
575
580
|
scheduleMessage: function (session, text, resetsAt) {
|
|
576
581
|
scheduleMessage(session, text, resetsAt);
|
|
577
582
|
},
|
|
578
583
|
getAutoContinueSetting: function (session) {
|
|
579
|
-
|
|
580
|
-
if (usersModule.isMultiUser() && session && session.ownerId) {
|
|
584
|
+
if (session && session.ownerId) {
|
|
581
585
|
return usersModule.getAutoContinue(session.ownerId);
|
|
582
586
|
}
|
|
583
|
-
// Single-user: fall back to daemon config
|
|
584
|
-
if (typeof opts.onGetDaemonConfig === "function") {
|
|
585
|
-
var dc = opts.onGetDaemonConfig();
|
|
586
|
-
return !!dc.autoContinueOnRateLimit;
|
|
587
|
-
}
|
|
588
587
|
return false;
|
|
589
588
|
},
|
|
590
589
|
// lr-2d91: Live config callback so sdk-bridge reads the current threshold on
|
|
@@ -627,8 +626,6 @@ function createProjectContext(opts) {
|
|
|
627
626
|
|
|
628
627
|
// --- Terminal manager ---
|
|
629
628
|
// broadcastTermList sends each connected client only the terminals they own.
|
|
630
|
-
// In single-user mode the terminal manager falls back to the bare send() broadcast,
|
|
631
|
-
// so this closure is only exercised when isMultiUser() is true at startup.
|
|
632
629
|
var tm;
|
|
633
630
|
function broadcastTermListToAll() {
|
|
634
631
|
for (var bws of clients) {
|
|
@@ -641,8 +638,8 @@ function createProjectContext(opts) {
|
|
|
641
638
|
cwd: cwd,
|
|
642
639
|
send: send,
|
|
643
640
|
sendTo: sendTo,
|
|
644
|
-
isMultiUser:
|
|
645
|
-
broadcastTermList:
|
|
641
|
+
isMultiUser: true,
|
|
642
|
+
broadcastTermList: broadcastTermListToAll,
|
|
646
643
|
});
|
|
647
644
|
var nm = createNotesManager({ cwd: cwd, send: send, sendTo: sendTo });
|
|
648
645
|
|
|
@@ -726,6 +723,9 @@ function createProjectContext(opts) {
|
|
|
726
723
|
}
|
|
727
724
|
}
|
|
728
725
|
|
|
726
|
+
// --- Team activity messages (delegated to project-team.js) ---
|
|
727
|
+
if (_team.handleClientMsg(ws, msg)) return;
|
|
728
|
+
|
|
729
729
|
// --- DM messages (delegated to server-level handler) ---
|
|
730
730
|
if (msg.type === "dm_open" || msg.type === "dm_send" || msg.type === "dm_list" || msg.type === "dm_typing" || msg.type === "dm_add_favorite" || msg.type === "dm_remove_favorite") {
|
|
731
731
|
if (typeof opts.onDmMessage === "function") {
|
|
@@ -863,7 +863,6 @@ function createProjectContext(opts) {
|
|
|
863
863
|
|
|
864
864
|
// --- Session presence (who is viewing which session) ---
|
|
865
865
|
function broadcastPresence() {
|
|
866
|
-
if (!usersModule.isMultiUser()) return;
|
|
867
866
|
var presence = {};
|
|
868
867
|
for (var c of clients) {
|
|
869
868
|
if (!c._clayUser || !c._clayActiveSession) continue;
|
|
@@ -942,7 +941,10 @@ function createProjectContext(opts) {
|
|
|
942
941
|
getProjectOwnerId: function () { return projectOwnerId; },
|
|
943
942
|
setProjectOwnerId: function (id) { projectOwnerId = id; },
|
|
944
943
|
getUpdateChannel: function () { return updateChannel; },
|
|
945
|
-
setUpdateChannel: function (ch) {
|
|
944
|
+
setUpdateChannel: function (ch) {
|
|
945
|
+
updateChannel = ch;
|
|
946
|
+
if (onSetUpdateChannel) onSetUpdateChannel(ch);
|
|
947
|
+
},
|
|
946
948
|
getLatestVersion: function () { return latestVersion; },
|
|
947
949
|
setLatestVersion: function (v) { latestVersion = v; },
|
|
948
950
|
onCreateWorktree: onCreateWorktree,
|
|
@@ -1266,26 +1268,24 @@ function createProjectContext(opts) {
|
|
|
1266
1268
|
status.branch = worktreeMeta.branch;
|
|
1267
1269
|
status.worktreeAccessible = worktreeMeta.accessible;
|
|
1268
1270
|
}
|
|
1269
|
-
|
|
1270
|
-
|
|
1271
|
-
|
|
1272
|
-
|
|
1273
|
-
|
|
1274
|
-
|
|
1275
|
-
|
|
1276
|
-
|
|
1277
|
-
|
|
1278
|
-
|
|
1279
|
-
|
|
1280
|
-
|
|
1281
|
-
|
|
1282
|
-
|
|
1283
|
-
|
|
1284
|
-
|
|
1285
|
-
});
|
|
1286
|
-
}
|
|
1287
|
-
status.onlineUsers = onlineUsers;
|
|
1271
|
+
var seen = {};
|
|
1272
|
+
var onlineUsers = [];
|
|
1273
|
+
for (var c of clients) {
|
|
1274
|
+
if (!c._clayUser) continue;
|
|
1275
|
+
var u = c._clayUser;
|
|
1276
|
+
if (seen[u.id]) continue;
|
|
1277
|
+
seen[u.id] = true;
|
|
1278
|
+
var p = u.profile || {};
|
|
1279
|
+
onlineUsers.push({
|
|
1280
|
+
id: u.id,
|
|
1281
|
+
displayName: p.name || u.displayName || u.username,
|
|
1282
|
+
username: u.username,
|
|
1283
|
+
avatarStyle: p.avatarStyle || "thumbs",
|
|
1284
|
+
avatarSeed: p.avatarSeed || u.username,
|
|
1285
|
+
avatarCustom: p.avatarCustom || "",
|
|
1286
|
+
});
|
|
1288
1287
|
}
|
|
1288
|
+
status.onlineUsers = onlineUsers;
|
|
1289
1289
|
return status;
|
|
1290
1290
|
}
|
|
1291
1291
|
|