@clagentic/console 1.0.4 → 1.1.0-beta.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.
@@ -6,16 +6,42 @@ 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, isMultiUser }
10
+ *
11
+ * isMultiUser: optional boolean — when true, ownership enforcement is active.
12
+ * Each terminal records ownerUserId from ws._clayUser.id at creation time.
13
+ * Operations that mutate or read private output (attach, write, close, rename)
14
+ * are restricted to the owning user or admins (ws._clayUser.role === "admin").
15
+ * term_list results are filtered to the requesting user's own terminals;
16
+ * admins see all with an ownerUserId field attached.
10
17
  */
11
18
  function createTerminalManager(opts) {
12
19
  var cwd = opts.cwd;
13
20
  var send = opts.send;
14
21
  var sendTo = opts.sendTo;
22
+ var isMultiUser = opts.isMultiUser || false;
23
+ // broadcastTermList(callerWs): optional callback for filtered list broadcasts.
24
+ // When provided, replaces the bare send({ type: "term_list" }) on exit so that
25
+ // each connected client only sees their own terminals in multi-user mode.
26
+ // Signature: function(callerWs) — callerWs is null to mean "broadcast to all clients".
27
+ var broadcastTermList = opts.broadcastTermList || null;
15
28
 
16
29
  var nextId = 1;
17
30
  var terminals = new Map(); // id -> terminal session
18
31
 
32
+ // Returns true if callerWs is authorized for the given terminal session.
33
+ // In single-user mode, always authorized.
34
+ // In multi-user mode, authorized if: no owner set, same user, or caller is admin.
35
+ function isAuthorized(session, callerWs) {
36
+ if (!isMultiUser) return true;
37
+ if (!callerWs) return true;
38
+ if (!session.ownerUserId) return true; // legacy terminal with no owner
39
+ var caller = callerWs._clayUser;
40
+ if (!caller) return true; // unauthenticated caller — no user context, allow (single-user compat)
41
+ if (caller.role === "admin") return true;
42
+ return caller.id === session.ownerUserId;
43
+ }
44
+
19
45
  function create(cols, rows, osUserInfo, ownerWs) {
20
46
  if (terminals.size >= MAX_TERMINALS) return null;
21
47
 
@@ -36,6 +62,7 @@ function createTerminalManager(opts) {
36
62
  exitCode: null,
37
63
  subscribers: new Set(),
38
64
  ownerWs: ownerWs || null,
65
+ ownerUserId: (ownerWs && ownerWs._clayUser && ownerWs._clayUser.id) ? ownerWs._clayUser.id : null,
39
66
  };
40
67
 
41
68
  pty.onData(function (data) {
@@ -66,8 +93,12 @@ function createTerminalManager(opts) {
66
93
  if (ws.readyState === 1) ws.send(msg);
67
94
  }
68
95
 
69
- // Broadcast updated list
70
- send({ type: "term_list", terminals: list() });
96
+ // Broadcast updated list (filtered per-user in multi-user mode)
97
+ if (broadcastTermList) {
98
+ broadcastTermList(null);
99
+ } else {
100
+ send({ type: "term_list", terminals: list() });
101
+ }
71
102
  });
72
103
 
73
104
  terminals.set(id, session);
@@ -78,6 +109,9 @@ function createTerminalManager(opts) {
78
109
  var session = terminals.get(id);
79
110
  if (!session) return false;
80
111
 
112
+ // Ownership check: only the owner (or an admin) may attach to a terminal.
113
+ if (!isAuthorized(session, ws)) return false;
114
+
81
115
  // Skip scrollback replay if already subscribed (e.g. create then activate)
82
116
  var alreadySubscribed = session.subscribers.has(ws);
83
117
  session.subscribers.add(ws);
@@ -113,9 +147,11 @@ function createTerminalManager(opts) {
113
147
  }
114
148
  }
115
149
 
116
- function write(id, data) {
150
+ function write(id, data, callerWs) {
117
151
  var session = terminals.get(id);
118
- if (session && session.pty) {
152
+ if (!session) return;
153
+ if (!isAuthorized(session, callerWs)) return;
154
+ if (session.pty) {
119
155
  session.pty.write(data);
120
156
  }
121
157
  }
@@ -140,9 +176,10 @@ function createTerminalManager(opts) {
140
176
  }
141
177
  }
142
178
 
143
- function close(id) {
179
+ function close(id, callerWs) {
144
180
  var session = terminals.get(id);
145
181
  if (!session) return;
182
+ if (!isAuthorized(session, callerWs)) return;
146
183
 
147
184
  if (session.pty) {
148
185
  try { session.pty.kill(); } catch (e) {}
@@ -161,27 +198,35 @@ function createTerminalManager(opts) {
161
198
  if (terminals.size === 0) nextId = 1;
162
199
  }
163
200
 
164
- function rename(id, title) {
201
+ function rename(id, title, callerWs) {
165
202
  var session = terminals.get(id);
166
203
  if (!session) return;
204
+ if (!isAuthorized(session, callerWs)) return;
167
205
  session.title = String(title).substring(0, 50);
168
206
  }
169
207
 
170
- function list() {
208
+ function list(callerWs) {
171
209
  var result = [];
172
210
  for (var session of terminals.values()) {
173
- result.push({
211
+ if (!isAuthorized(session, callerWs)) continue;
212
+ var entry = {
174
213
  id: session.id,
175
214
  title: session.title,
176
215
  exited: session.exited,
177
- });
216
+ };
217
+ // Admins see the owner label so they can distinguish whose terminal it is.
218
+ if (isMultiUser && callerWs && callerWs._clayUser && callerWs._clayUser.role === "admin" && session.ownerUserId) {
219
+ entry.ownerUserId = session.ownerUserId;
220
+ }
221
+ result.push(entry);
178
222
  }
179
223
  return result;
180
224
  }
181
225
 
182
- function getScrollback(id) {
226
+ function getScrollback(id, callerWs) {
183
227
  var session = terminals.get(id);
184
228
  if (!session) return null;
229
+ if (!isAuthorized(session, callerWs)) return null;
185
230
  var content = session.scrollback.map(function(c) { return c.data; }).join("");
186
231
  return {
187
232
  content: content,
package/lib/users.js CHANGED
@@ -6,6 +6,7 @@ var { CONFIG_DIR } = require("./config");
6
6
  var { attachAuth } = require("./users-auth");
7
7
  var { DEFAULT_PERMISSIONS, ALL_PERMISSIONS, attachPermissions } = require("./users-permissions");
8
8
  var { attachPreferences } = require("./users-preferences");
9
+ var store = require("./store");
9
10
 
10
11
  var USERS_FILE = path.join(CONFIG_DIR, "users.json");
11
12
 
@@ -24,6 +25,10 @@ function defaultData() {
24
25
  // --- Load / Save ---
25
26
 
26
27
  function loadUsers() {
28
+ // Synchronous shim: read from disk directly so existing sync callers keep working.
29
+ // store.js is async-first; we fall back to synchronous fs here because the
30
+ // entire users.js call graph is synchronous and converting all ~79 call sites
31
+ // is a follow-up task (TODO(lr-b372): convert users.js callers to async).
27
32
  try {
28
33
  var raw = fs.readFileSync(USERS_FILE, "utf8");
29
34
  var data = JSON.parse(raw);
@@ -40,10 +45,12 @@ function loadUsers() {
40
45
  }
41
46
 
42
47
  function saveUsers(data) {
43
- fs.mkdirSync(path.dirname(USERS_FILE), { recursive: true });
44
- var tmpPath = USERS_FILE + ".tmp";
45
- fs.writeFileSync(tmpPath, JSON.stringify(data, null, 2));
46
- fs.renameSync(tmpPath, USERS_FILE);
48
+ // Fire-and-forget async write through store.js (atomic, queued, 0o600).
49
+ // Callers within this module are synchronous; converting them all to async
50
+ // is deferred (TODO(lr-b372): convert users.js callers to async).
51
+ store.writeJson("users.json", data).catch(function (err) {
52
+ process.stderr.write("[users] saveUsers failed: " + (err && err.message ? err.message : err) + "\n");
53
+ });
47
54
  }
48
55
 
49
56
  // --- User CRUD ---
@@ -17,6 +17,7 @@ var net = require("net");
17
17
  var crypto = require("crypto");
18
18
  var path = require("path");
19
19
  var fs = require("fs");
20
+ var os = require("os");
20
21
 
21
22
  var socketPath = process.argv[2];
22
23
  if (!socketPath) {
@@ -106,13 +107,12 @@ var buffer = "";
106
107
  // --- Message queue (same implementation as sdk-bridge.js) ---
107
108
  function createMessageQueue() {
108
109
  var queue = [];
109
- var waiting = null;
110
+ var waitingResolvers = [];
110
111
  var ended = false;
111
112
  return {
112
113
  push: function(msg) {
113
- if (waiting) {
114
- var resolve = waiting;
115
- waiting = null;
114
+ if (waitingResolvers.length > 0) {
115
+ var resolve = waitingResolvers.shift();
116
116
  resolve({ value: msg, done: false });
117
117
  } else {
118
118
  queue.push(msg);
@@ -120,9 +120,8 @@ function createMessageQueue() {
120
120
  },
121
121
  end: function() {
122
122
  ended = true;
123
- if (waiting) {
124
- var resolve = waiting;
125
- waiting = null;
123
+ while (waitingResolvers.length > 0) {
124
+ var resolve = waitingResolvers.shift();
126
125
  resolve({ value: undefined, done: true });
127
126
  }
128
127
  },
@@ -136,7 +135,7 @@ function createMessageQueue() {
136
135
  return Promise.resolve({ value: undefined, done: true });
137
136
  }
138
137
  return new Promise(function(resolve) {
139
- waiting = resolve;
138
+ waitingResolvers.push(resolve);
140
139
  });
141
140
  },
142
141
  };
@@ -309,11 +308,23 @@ function canUseTool(toolName, input, opts) {
309
308
  decisionReason: opts.decisionReason || "",
310
309
  });
311
310
  return new Promise(function(resolve) {
312
- pendingPermissions[requestId] = resolve;
311
+ var timeoutId = setTimeout(function() {
312
+ if (pendingPermissions[requestId]) {
313
+ delete pendingPermissions[requestId];
314
+ resolve({ behavior: "deny", message: "Permission request timed out after 30s" });
315
+ }
316
+ }, 30000);
317
+ pendingPermissions[requestId] = function(result) {
318
+ clearTimeout(timeoutId);
319
+ resolve(result);
320
+ };
313
321
  if (opts.signal) {
314
322
  opts.signal.addEventListener("abort", function() {
315
- delete pendingPermissions[requestId];
316
- resolve({ behavior: "deny", message: "Cancelled" });
323
+ if (pendingPermissions[requestId]) {
324
+ clearTimeout(timeoutId);
325
+ delete pendingPermissions[requestId];
326
+ resolve({ behavior: "deny", message: "Cancelled" });
327
+ }
317
328
  });
318
329
  }
319
330
  });
@@ -406,8 +417,15 @@ async function handleQueryStart(msg) {
406
417
  // Build query options (callbacks are local, everything else from daemon)
407
418
  var options = msg.options || {};
408
419
  options.abortController = abortController;
409
- options.debug = true;
410
- options.debugFile = "/tmp/clagentic-cli-debug-" + process.pid + ".log";
420
+ if (process.env.CLAGENTIC_DEBUG === "1") {
421
+ var _logDir = path.join(os.homedir(), ".clagentic", "worker-logs");
422
+ fs.mkdirSync(_logDir, { recursive: true, mode: 0o700 });
423
+ var _logFile = path.join(_logDir, process.pid + ".log");
424
+ // Create with 0o600 before passing to the SDK so the file is never world-readable
425
+ fs.writeFileSync(_logFile, "", { flag: "a", mode: 0o600 });
426
+ options.debug = true;
427
+ options.debugFile = _logFile;
428
+ }
411
429
  applyWorkerClaudeBinary(options);
412
430
  if (options.mcpServerDescriptors && options.mcpServerDescriptors.length) {
413
431
  try {
@@ -557,12 +575,25 @@ async function handleQueryStart(msg) {
557
575
  stderr: err.stderr || null,
558
576
  });
559
577
  } finally {
578
+ for (var k in pendingPermissions) {
579
+ try { pendingPermissions[k]({ behavior: "deny", message: "Worker shutting down" }); } catch(e) {}
580
+ }
581
+ for (var k in pendingMcpToolCalls) {
582
+ try { pendingMcpToolCalls[k].reject(new Error("Worker shutting down")); } catch(e) {}
583
+ }
584
+ for (var k in pendingAskUser) {
585
+ try { pendingAskUser[k](new Error("Worker shutting down")); } catch(e) {}
586
+ }
587
+ for (var k in pendingElicitations) {
588
+ try { pendingElicitations[k](new Error("Worker shutting down")); } catch(e) {}
589
+ }
560
590
  queryInstance = null;
561
591
  messageQueue = null;
562
592
  abortController = null;
563
593
  pendingPermissions = {};
564
594
  pendingAskUser = {};
565
595
  pendingElicitations = {};
596
+ pendingMcpToolCalls = {};
566
597
  }
567
598
  }
568
599
 
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "publishConfig": {
4
4
  "access": "public"
5
5
  },
6
- "version": "1.0.4",
6
+ "version": "1.1.0-beta.1",
7
7
  "description": "Self-hosted console for Claude Code and Codex. Multi-user, browser-based, persistent AI sessions.",
8
8
  "bin": {
9
9
  "clagentic": "./bin/cli.js",