@clagentic/console 1.11.0-beta.1 → 1.11.0-beta.2
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 +0 -1
- package/bin/cli.js +24 -14
- package/lib/bash-auto-approve.js +1 -1
- package/lib/build-sha.json +2 -2
- package/lib/cli/arg-validation.js +50 -0
- package/lib/cli/daemon-launch.js +5 -4
- package/lib/cli/menus.js +2 -2
- package/lib/cli/session-subcommands.js +3 -2
- package/lib/daemon.js +18 -1
- package/lib/identity/index.js +9 -4
- package/lib/permission-mode-policy.js +2 -2
- package/lib/permission-settings.js +96 -0
- package/lib/project-connection.js +9 -11
- package/lib/project-loop.js +24 -3
- package/lib/project-permission-settings.js +59 -0
- package/lib/project-prompt-responses.js +7 -3
- package/lib/project-sessions.js +93 -41
- package/lib/project.js +11 -13
- package/lib/public/app.js +1 -2
- package/lib/public/css/overlays.css +0 -3
- package/lib/public/css/scheduler-modal.css +5 -0
- package/lib/public/index.html +44 -8
- package/lib/public/modules/app-loop-ui.js +11 -1
- package/lib/public/modules/app-messages.js +4 -13
- package/lib/public/modules/app-panels.js +1 -1
- package/lib/public/modules/app-rate-limit.js +1 -1
- package/lib/public/modules/approve-tools-toggle.js +33 -0
- package/lib/public/modules/loop-hooks-warning.js +20 -0
- package/lib/public/modules/mode-options.js +16 -0
- package/lib/public/modules/permission-settings.js +56 -0
- package/lib/public/modules/project-settings.js +3 -0
- package/lib/public/modules/scheduler-config.js +12 -0
- package/lib/public/modules/scheduler.js +8 -0
- package/lib/public/modules/server-settings.js +5 -9
- package/lib/public/modules/settings-defaults.js +18 -4
- package/lib/scheduler.js +4 -0
- package/lib/sdk-bridge.js +74 -40
- package/lib/server.js +9 -3
- package/lib/session-input-ipc.js +1 -0
- package/lib/session-input.js +41 -4
- package/lib/session-resume.js +2 -0
- package/lib/sessions.js +67 -2
- package/lib/updater.js +8 -2
- package/lib/ws-schema.js +5 -2
- package/lib/yoke/adapters/claude.js +0 -10
- package/package.json +1 -1
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
// The WebSocket side of the server-wide permission settings
|
|
4
|
+
// (lib/permission-settings.js): one message to change them, answered to every
|
|
5
|
+
// client of the server so an open settings page follows the change.
|
|
6
|
+
|
|
7
|
+
var { pickSettingChanges, settingsMessage } = require("./permission-settings");
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* Whether a connection may change a server-wide setting: an administrator only
|
|
11
|
+
* (the server default mode is gated the same way). In single-user mode the
|
|
12
|
+
* authenticated connection is the implicit administrator (projectAccess.isAdmin).
|
|
13
|
+
*/
|
|
14
|
+
function isServerAdmin(projectAccess, ws) {
|
|
15
|
+
if (!projectAccess || typeof projectAccess.isAdmin !== "function") return false;
|
|
16
|
+
return !!projectAccess.isAdmin(ws._clagenticUser, projectAccess.authOf(ws));
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
/**
|
|
20
|
+
* ctx fields: slug, sendTo, send, opts, projectAccess,
|
|
21
|
+
* checkRequestedMode(session, mode, what) -> {ok, error}
|
|
22
|
+
*/
|
|
23
|
+
function attachPermissionSettings(ctx) {
|
|
24
|
+
var opts = ctx.opts || {};
|
|
25
|
+
|
|
26
|
+
function refuse(ws, text) {
|
|
27
|
+
ctx.sendTo(ws, { type: "error", text: text });
|
|
28
|
+
return true;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
/** Returns true when msg was a permission-settings message (handled). */
|
|
32
|
+
function handlePermissionSettingsMessage(ws, msg) {
|
|
33
|
+
if (msg.type !== "set_permission_settings") return false;
|
|
34
|
+
if (!isServerAdmin(ctx.projectAccess, ws)) {
|
|
35
|
+
console.warn("[project-permission-settings] refused set_permission_settings in " + ctx.slug + ": caller is not an admin");
|
|
36
|
+
return refuse(ws, "Only admins can change the server permission settings.");
|
|
37
|
+
}
|
|
38
|
+
var picked = pickSettingChanges(msg);
|
|
39
|
+
if (picked.rejected.length > 0) {
|
|
40
|
+
return refuse(ws, "Unknown or invalid permission setting: " + picked.rejected.join(", "));
|
|
41
|
+
}
|
|
42
|
+
if (picked.values.openedSessionMode !== undefined) {
|
|
43
|
+
var verdict = ctx.checkRequestedMode(null, picked.values.openedSessionMode, "set_permission_settings openedSessionMode");
|
|
44
|
+
if (!verdict.ok) return refuse(ws, verdict.error);
|
|
45
|
+
}
|
|
46
|
+
if (Object.keys(picked.values).length === 0) return true;
|
|
47
|
+
if (typeof opts.onSetPermissionSettings !== "function" || typeof opts.onGetPermissionSettings !== "function") {
|
|
48
|
+
return refuse(ws, "The server cannot store permission settings.");
|
|
49
|
+
}
|
|
50
|
+
opts.onSetPermissionSettings(picked.values);
|
|
51
|
+
var announce = typeof opts.broadcastAll === "function" ? opts.broadcastAll : ctx.send;
|
|
52
|
+
announce(settingsMessage(opts.onGetPermissionSettings()));
|
|
53
|
+
return true;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
return { handlePermissionSettingsMessage: handlePermissionSettingsMessage };
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
module.exports = { attachPermissionSettings: attachPermissionSettings, isServerAdmin: isServerAdmin };
|
|
@@ -18,6 +18,7 @@ var { ownValue } = require("./prompt-kinds/codecs");
|
|
|
18
18
|
var { INITIATORS } = require("./turn-initiator");
|
|
19
19
|
var { stampRecord } = require("./injected-sender");
|
|
20
20
|
var promptSource = require("./prompt-source");
|
|
21
|
+
var { effectiveSessionMode } = require("./sessions");
|
|
21
22
|
|
|
22
23
|
// alias type -> { toPrompt(msg), kinds it may answer, stale reply type }
|
|
23
24
|
var LEGACY_RESPONSES = {
|
|
@@ -64,7 +65,7 @@ function attachPromptResponses(ctx) {
|
|
|
64
65
|
sendToSession(session.localId, {
|
|
65
66
|
type: "config_state",
|
|
66
67
|
model: sm.effectiveSessionModel ? sm.effectiveSessionModel(session) : (sm.currentModel || ""),
|
|
67
|
-
mode: session
|
|
68
|
+
mode: effectiveSessionMode(session, sm),
|
|
68
69
|
effort: sm.currentEffort || CONFIG_STATE_DEFAULTS.effort,
|
|
69
70
|
betas: sm.currentBetas || [],
|
|
70
71
|
thinking: sm.currentThinking || CONFIG_STATE_DEFAULTS.thinking,
|
|
@@ -112,6 +113,7 @@ function attachPromptResponses(ctx) {
|
|
|
112
113
|
// Only the answering session's mode changes (the new session's is set
|
|
113
114
|
// below); the project default and every other session are untouched.
|
|
114
115
|
session.permissionMode = "acceptEdits";
|
|
116
|
+
sm.saveSessionFile(session);
|
|
115
117
|
sendConfigState(session);
|
|
116
118
|
|
|
117
119
|
var planPrompt;
|
|
@@ -129,7 +131,8 @@ function attachPromptResponses(ctx) {
|
|
|
129
131
|
new Promise(function (resolve) { setTimeout(resolve, 3000); }),
|
|
130
132
|
]).then(function () {
|
|
131
133
|
try {
|
|
132
|
-
|
|
134
|
+
// Given at creation so the first session_switched carries it.
|
|
135
|
+
var newSession = sm.createSession({ permissionMode: "acceptEdits" }, ws);
|
|
133
136
|
var userMsg = stampRecord({ type: "user_message", text: planPrompt, planContent: planContent || null, initiator: INITIATORS.HUMAN });
|
|
134
137
|
sm.recordHistoryEntry(newSession, userMsg, true);
|
|
135
138
|
sm.appendToSessionFile(newSession, userMsg);
|
|
@@ -143,7 +146,7 @@ function attachPromptResponses(ctx) {
|
|
|
143
146
|
newSession.sentToolResults = {};
|
|
144
147
|
sendToSession(newSession.localId, { type: "status", status: "processing" });
|
|
145
148
|
newSession.acceptEditsAfterStart = true;
|
|
146
|
-
newSession
|
|
149
|
+
sm.saveSessionFile(newSession);
|
|
147
150
|
sdk.startQuery(newSession, planPrompt, undefined, ensureProjectAccessForSession(newSession), INITIATORS.HUMAN, userMsg.messageId);
|
|
148
151
|
} catch (e) {
|
|
149
152
|
console.error("[project] Error starting plan execution:", e);
|
|
@@ -158,6 +161,7 @@ function attachPromptResponses(ctx) {
|
|
|
158
161
|
if (response.decision === "allow_accept_edits") {
|
|
159
162
|
sdk.setPermissionMode(session, "acceptEdits");
|
|
160
163
|
session.permissionMode = "acceptEdits";
|
|
164
|
+
sm.saveSessionFile(session);
|
|
161
165
|
sendConfigState(session);
|
|
162
166
|
} else if (response.decision === "allow_clear_context") {
|
|
163
167
|
executePlanInFreshContext(ws, session, prompt, response.planContent || "");
|
package/lib/project-sessions.js
CHANGED
|
@@ -17,6 +17,8 @@ var { logField, logText } = require("./log-field");
|
|
|
17
17
|
var { isKnownVendor } = require("./yoke");
|
|
18
18
|
var sessionCapabilities = require("./session-capabilities");
|
|
19
19
|
var { checkPermissionMode } = require("./permission-mode-policy");
|
|
20
|
+
var { attachPermissionSettings, isServerAdmin } = require("./project-permission-settings");
|
|
21
|
+
var { effectiveSessionMode } = require("./sessions");
|
|
20
22
|
var { composeRestartingNotice } = require("./build-update-offer");
|
|
21
23
|
// Kick off SDK agent discovery in the background at module load.
|
|
22
24
|
// Errors are swallowed inside refresh(); the cache starts empty and fills
|
|
@@ -46,7 +48,7 @@ if (!process.env.NODE_TEST_CONTEXT) {
|
|
|
46
48
|
* message handlers to a project context.
|
|
47
49
|
*
|
|
48
50
|
* ctx fields:
|
|
49
|
-
* cwd, slug, isMate, osUsers, debug,
|
|
51
|
+
* cwd, slug, isMate, osUsers, debug, currentVersion,
|
|
50
52
|
* sm, sdk, tm, clients,
|
|
51
53
|
* send, sendTo, sendToAdmins, sendToSession, sendToSessionOthers,
|
|
52
54
|
* opts, usersModule, userPresence, matesModule, pushModule,
|
|
@@ -149,6 +151,14 @@ function attachSessions(ctx) {
|
|
|
149
151
|
sendToSessionOthers: sendToSessionOthers,
|
|
150
152
|
getSessionForWs: getSessionForWs,
|
|
151
153
|
});
|
|
154
|
+
var permissionSettings = attachPermissionSettings({
|
|
155
|
+
slug: slug,
|
|
156
|
+
sendTo: sendTo,
|
|
157
|
+
send: send,
|
|
158
|
+
opts: opts,
|
|
159
|
+
projectAccess: projectAccess,
|
|
160
|
+
checkRequestedMode: checkRequestedMode,
|
|
161
|
+
});
|
|
152
162
|
|
|
153
163
|
// The shared mode check (lib/permission-mode-policy.js) for a mode that a
|
|
154
164
|
// client asks for. `session` is the session it would run in, or null for a
|
|
@@ -158,7 +168,6 @@ function attachSessions(ctx) {
|
|
|
158
168
|
function checkRequestedMode(session, mode, what) {
|
|
159
169
|
var vendor = sessionCapabilities.effectiveVendorId(sm, session, adapter && adapter.vendor);
|
|
160
170
|
var verdict = checkPermissionMode(mode, {
|
|
161
|
-
skipPermissionsAllowed: ctx.dangerouslySkipPermissions === true,
|
|
162
171
|
supportedModes: sessionCapabilities.capabilitiesFor(sm, vendor).permissionModes,
|
|
163
172
|
});
|
|
164
173
|
if (!verdict.ok) {
|
|
@@ -176,7 +185,7 @@ function attachSessions(ctx) {
|
|
|
176
185
|
function maySetDefaultMode(ws, ownerAllowed) {
|
|
177
186
|
if (!projectAccess || typeof projectAccess.isAdmin !== "function") return false;
|
|
178
187
|
var user = ws._clagenticUser;
|
|
179
|
-
if (projectAccess
|
|
188
|
+
if (isServerAdmin(projectAccess, ws)) return true;
|
|
180
189
|
if (!ownerAllowed) return false;
|
|
181
190
|
var ownerId = getProjectOwnerId ? getProjectOwnerId() : null;
|
|
182
191
|
return !!(user && ownerId && user.id === ownerId);
|
|
@@ -202,10 +211,60 @@ function attachSessions(ctx) {
|
|
|
202
211
|
return false;
|
|
203
212
|
}
|
|
204
213
|
|
|
214
|
+
// The mode a client is shown for a session (sessions.js effectiveSessionMode).
|
|
215
|
+
function shownMode(session) {
|
|
216
|
+
return effectiveSessionMode(session, sm);
|
|
217
|
+
}
|
|
218
|
+
|
|
219
|
+
// Re-modes every session this project holds to `mode`, each through the
|
|
220
|
+
// shared check for its own vendor. A refusal skips that session and is
|
|
221
|
+
// reported; it never stops the others. Resolves { applied, skipped }.
|
|
222
|
+
function applyModeToSessions(mode) {
|
|
223
|
+
var applied = 0;
|
|
224
|
+
var skipped = [];
|
|
225
|
+
var pending = [];
|
|
226
|
+
sm.sessions.forEach(function (s) {
|
|
227
|
+
var verdict = sdk.checkModeFor(s, mode, true);
|
|
228
|
+
if (!verdict.ok) {
|
|
229
|
+
console.warn("[project-sessions] apply of " + logField(mode) + " skipped session " + s.localId + " in " + slug + ": " + verdict.error);
|
|
230
|
+
skipped.push({ sessionId: s.localId, reason: verdict.error });
|
|
231
|
+
return;
|
|
232
|
+
}
|
|
233
|
+
pending.push(sdk.setPermissionMode(s, mode).then(function (ok) {
|
|
234
|
+
if (ok) applied++;
|
|
235
|
+
else skipped.push({ sessionId: s.localId, reason: "The session did not accept the mode" });
|
|
236
|
+
}));
|
|
237
|
+
});
|
|
238
|
+
return Promise.all(pending).then(function () { return { applied: applied, skipped: skipped }; });
|
|
239
|
+
}
|
|
240
|
+
|
|
241
|
+
// Each client is told the mode of the session it is viewing, never the
|
|
242
|
+
// project default (see effectiveSessionMode in sessions.js).
|
|
243
|
+
function pushSessionModes() {
|
|
244
|
+
clients.forEach(function (client) {
|
|
245
|
+
var viewed = getSessionForWs(client);
|
|
246
|
+
sendTo(client, { type: "config_state", model: sm.effectiveSessionModel(viewed), mode: shownMode(viewed), effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
|
|
247
|
+
});
|
|
248
|
+
}
|
|
249
|
+
|
|
250
|
+
// The default a new session starts in (and the fallback for one that has no
|
|
251
|
+
// mode of its own). A running session keeps its mode unless the person chose
|
|
252
|
+
// to apply the new one to the running sessions.
|
|
253
|
+
function changeDefaultMode(ws, msg) {
|
|
254
|
+
sm.currentPermissionMode = msg.mode;
|
|
255
|
+
sm._savedDefaultMode = msg.mode;
|
|
256
|
+
if (msg.applyToRunning !== true) return;
|
|
257
|
+
applyModeToSessions(msg.mode).then(function (outcome) {
|
|
258
|
+
pushSessionModes();
|
|
259
|
+
sendTo(ws, { type: "permission_mode_applied", mode: msg.mode, applied: outcome.applied, skipped: outcome.skipped });
|
|
260
|
+
});
|
|
261
|
+
}
|
|
262
|
+
|
|
205
263
|
function handleSessionsMessage(ws, msg) {
|
|
206
264
|
|
|
207
265
|
if (promptResponses.handlePromptMessage(ws, msg)) return true;
|
|
208
266
|
if (sessionGrants.handleGrantMessage(ws, msg)) return true;
|
|
267
|
+
if (permissionSettings.handlePermissionSettingsMessage(ws, msg)) return true;
|
|
209
268
|
|
|
210
269
|
if (msg.type === "push_subscribe") {
|
|
211
270
|
var _pushUserId = ws._clagenticUser ? ws._clagenticUser.id : null;
|
|
@@ -283,17 +342,17 @@ function attachSessions(ctx) {
|
|
|
283
342
|
catch (e) { /* recents are best-effort */ }
|
|
284
343
|
}
|
|
285
344
|
var newSess = sm.createSession(sessionOpts, ws);
|
|
286
|
-
// Seed per-session model
|
|
287
|
-
// (sm._savedDefaultModel
|
|
288
|
-
//
|
|
289
|
-
//
|
|
290
|
-
//
|
|
291
|
-
//
|
|
292
|
-
//
|
|
293
|
-
//
|
|
294
|
-
//
|
|
345
|
+
// Seed the per-session model from the project/global DEFAULT
|
|
346
|
+
// (sm._savedDefaultModel, populated at project startup from
|
|
347
|
+
// onGetProjectDefaultModel/onGetServerDefaultModel — see lib/project.js)
|
|
348
|
+
// so the first query uses the right value even before the user changes
|
|
349
|
+
// anything. Seeding from sm.currentModel directly is wrong: that field
|
|
350
|
+
// also mirrors whatever model the CURRENTLY ACTIVE session happens to be
|
|
351
|
+
// using, so a brand-new session would inherit another session's
|
|
352
|
+
// in-progress choice instead of the actual saved default.
|
|
353
|
+
// The mode is given by sm.createSession from sm._savedDefaultMode and is
|
|
354
|
+
// saved with the session, so it is not copied here.
|
|
295
355
|
newSess.model = sm._savedDefaultModel || null;
|
|
296
|
-
newSess.permissionMode = sm._savedDefaultMode || null;
|
|
297
356
|
ws._clagenticActiveSession = newSess.localId;
|
|
298
357
|
// Apply project-level email defaults to new session
|
|
299
358
|
if (typeof ctx._email === "object" && ctx._email.getEmailDefaults) {
|
|
@@ -638,7 +697,7 @@ function attachSessions(ctx) {
|
|
|
638
697
|
// reintroducing the sm.currentModel-only bug this task fixes.
|
|
639
698
|
var _swSess = sm.sessions.get(msg.id);
|
|
640
699
|
var _swModel = sm.effectiveSessionModel(_swSess);
|
|
641
|
-
var _swMode = (_swSess
|
|
700
|
+
var _swMode = shownMode(_swSess);
|
|
642
701
|
sendTo(ws, { type: "config_state", model: _swModel, mode: _swMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
|
|
643
702
|
var swPresKey = ws._clagenticUser ? ws._clagenticUser.id : "_default";
|
|
644
703
|
userPresence.setPresence(slug, swPresKey, msg.id, null);
|
|
@@ -870,7 +929,7 @@ function attachSessions(ctx) {
|
|
|
870
929
|
// Targeted reply — only this client's chip updates, not all sessions.
|
|
871
930
|
// lr-041af8: shared helper (see switch_session above and
|
|
872
931
|
// effectiveSessionModel() in sessions.js).
|
|
873
|
-
sendTo(ws, { type: "config_state", model: sm.effectiveSessionModel(session), mode: session
|
|
932
|
+
sendTo(ws, { type: "config_state", model: sm.effectiveSessionModel(session), mode: shownMode(session), effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
|
|
874
933
|
}).catch(function (e) {
|
|
875
934
|
// Defensive: setModel is not expected to reject (its own try/catch
|
|
876
935
|
// returns { ok: false } instead), but a rejection must still reach
|
|
@@ -958,7 +1017,7 @@ function attachSessions(ctx) {
|
|
|
958
1017
|
// fixes elsewhere. vendorSession may be null (no active session for
|
|
959
1018
|
// this ws yet) — effectiveSessionModel handles that by falling back
|
|
960
1019
|
// to the shared default, same as every other targeted sender.
|
|
961
|
-
sendTo(ws, { type: "config_state", model: sm.effectiveSessionModel(vendorSession), mode:
|
|
1020
|
+
sendTo(ws, { type: "config_state", model: sm.effectiveSessionModel(vendorSession), mode: shownMode(vendorSession), effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
|
|
962
1021
|
}
|
|
963
1022
|
return true;
|
|
964
1023
|
}
|
|
@@ -976,7 +1035,7 @@ function attachSessions(ctx) {
|
|
|
976
1035
|
// (sdk-bridge.js) as the project/global default.
|
|
977
1036
|
sm.currentModel = msg.model;
|
|
978
1037
|
sm._savedDefaultModel = msg.model;
|
|
979
|
-
send({ type: "config_state", model: sm.currentModel || "",
|
|
1038
|
+
send({ type: "config_state", model: sm.currentModel || "", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
|
|
980
1039
|
return true;
|
|
981
1040
|
}
|
|
982
1041
|
|
|
@@ -987,7 +1046,7 @@ function attachSessions(ctx) {
|
|
|
987
1046
|
// lr-db0437: same as set_server_default_model above — default-only write.
|
|
988
1047
|
sm.currentModel = msg.model;
|
|
989
1048
|
sm._savedDefaultModel = msg.model;
|
|
990
|
-
send({ type: "config_state", model: sm.currentModel || "",
|
|
1049
|
+
send({ type: "config_state", model: sm.currentModel || "", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
|
|
991
1050
|
return true;
|
|
992
1051
|
}
|
|
993
1052
|
|
|
@@ -997,30 +1056,29 @@ function attachSessions(ctx) {
|
|
|
997
1056
|
if (!modeVerdict.ok) {
|
|
998
1057
|
sendTo(ws, { type: "error", text: modeVerdict.error });
|
|
999
1058
|
if (!session) return true;
|
|
1000
|
-
sendTo(ws, { type: "config_state", model: sm.effectiveSessionModel(session), mode: session
|
|
1059
|
+
sendTo(ws, { type: "config_state", model: sm.effectiveSessionModel(session), mode: shownMode(session), effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
|
|
1001
1060
|
return true;
|
|
1002
1061
|
}
|
|
1003
1062
|
if (session) {
|
|
1004
1063
|
sdk.setPermissionMode(session, msg.mode).then(function () {
|
|
1005
1064
|
// Targeted reply — only update the requesting client's chip.
|
|
1006
1065
|
// lr-041af8: shared helper (see effectiveSessionModel() in sessions.js).
|
|
1007
|
-
sendTo(ws, { type: "config_state", model: sm.effectiveSessionModel(session), mode: session
|
|
1066
|
+
sendTo(ws, { type: "config_state", model: sm.effectiveSessionModel(session), mode: shownMode(session), effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
|
|
1008
1067
|
});
|
|
1009
1068
|
}
|
|
1010
1069
|
return true;
|
|
1011
1070
|
}
|
|
1012
1071
|
|
|
1072
|
+
// Changing a default changes what NEW sessions start in and nothing else.
|
|
1073
|
+
// The request may also carry applyToRunning: true, the person's explicit
|
|
1074
|
+
// "Apply to running sessions" choice for this one change (it is not a
|
|
1075
|
+
// stored setting), which re-modes this project's sessions as well.
|
|
1013
1076
|
if (msg.type === "set_server_default_mode" && msg.mode) {
|
|
1014
1077
|
if (refuseDefaultMode(ws, msg)) return true;
|
|
1015
1078
|
if (typeof opts.onSetServerDefaultMode === "function") {
|
|
1016
1079
|
opts.onSetServerDefaultMode(msg.mode);
|
|
1017
1080
|
}
|
|
1018
|
-
|
|
1019
|
-
var session = getSessionForWs(ws);
|
|
1020
|
-
if (session) {
|
|
1021
|
-
sdk.setPermissionMode(session, msg.mode);
|
|
1022
|
-
}
|
|
1023
|
-
send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
|
|
1081
|
+
changeDefaultMode(ws, msg);
|
|
1024
1082
|
return true;
|
|
1025
1083
|
}
|
|
1026
1084
|
|
|
@@ -1029,13 +1087,7 @@ function attachSessions(ctx) {
|
|
|
1029
1087
|
if (typeof opts.onSetProjectDefaultMode === "function") {
|
|
1030
1088
|
opts.onSetProjectDefaultMode(slug, msg.mode);
|
|
1031
1089
|
}
|
|
1032
|
-
|
|
1033
|
-
// Apply to ALL active sessions in this project, not just the focused one.
|
|
1034
|
-
// Without this, sessions that already started a query keep the old mode.
|
|
1035
|
-
sm.sessions.forEach(function (s) {
|
|
1036
|
-
sdk.setPermissionMode(s, msg.mode);
|
|
1037
|
-
});
|
|
1038
|
-
send({ type: "config_state", model: sm.currentModel || "", mode: sm.currentPermissionMode, effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
|
|
1090
|
+
changeDefaultMode(ws, msg);
|
|
1039
1091
|
return true;
|
|
1040
1092
|
}
|
|
1041
1093
|
|
|
@@ -1043,7 +1095,7 @@ function attachSessions(ctx) {
|
|
|
1043
1095
|
var session = getSessionForWs(ws);
|
|
1044
1096
|
if (!session) {
|
|
1045
1097
|
sm.currentEffort = msg.effort;
|
|
1046
|
-
send({ type: "config_state", model: sm.currentModel || "",
|
|
1098
|
+
send({ type: "config_state", model: sm.currentModel || "", effort: sm.currentEffort, betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
|
|
1047
1099
|
return true;
|
|
1048
1100
|
}
|
|
1049
1101
|
// The effort is recorded only once the running query has taken it
|
|
@@ -1051,7 +1103,7 @@ function attachSessions(ctx) {
|
|
|
1051
1103
|
// bridge as an error; the requester's picker is put back on the effort
|
|
1052
1104
|
// the session still runs at.
|
|
1053
1105
|
sdk.setEffort(session, msg.effort).then(function (result) {
|
|
1054
|
-
var state = { type: "config_state", model: sm.currentModel || "",
|
|
1106
|
+
var state = { type: "config_state", model: sm.currentModel || "", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 };
|
|
1055
1107
|
if (result && result.ok === false) sendTo(ws, state);
|
|
1056
1108
|
else send(state);
|
|
1057
1109
|
}).catch(function (err) {
|
|
@@ -1065,7 +1117,7 @@ function attachSessions(ctx) {
|
|
|
1065
1117
|
opts.onSetServerDefaultEffort(msg.effort);
|
|
1066
1118
|
}
|
|
1067
1119
|
sm.currentEffort = msg.effort;
|
|
1068
|
-
send({ type: "config_state", model: sm.currentModel || "",
|
|
1120
|
+
send({ type: "config_state", model: sm.currentModel || "", effort: sm.currentEffort, betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
|
|
1069
1121
|
return true;
|
|
1070
1122
|
}
|
|
1071
1123
|
|
|
@@ -1074,13 +1126,13 @@ function attachSessions(ctx) {
|
|
|
1074
1126
|
opts.onSetProjectDefaultEffort(slug, msg.effort);
|
|
1075
1127
|
}
|
|
1076
1128
|
sm.currentEffort = msg.effort;
|
|
1077
|
-
send({ type: "config_state", model: sm.currentModel || "",
|
|
1129
|
+
send({ type: "config_state", model: sm.currentModel || "", effort: sm.currentEffort, betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
|
|
1078
1130
|
return true;
|
|
1079
1131
|
}
|
|
1080
1132
|
|
|
1081
1133
|
if (msg.type === "set_betas") {
|
|
1082
1134
|
sm.currentBetas = msg.betas || [];
|
|
1083
|
-
send({ type: "config_state", model: sm.currentModel || "",
|
|
1135
|
+
send({ type: "config_state", model: sm.currentModel || "", effort: sm.currentEffort || "medium", betas: sm.currentBetas, thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
|
|
1084
1136
|
return true;
|
|
1085
1137
|
}
|
|
1086
1138
|
|
|
@@ -1089,7 +1141,7 @@ function attachSessions(ctx) {
|
|
|
1089
1141
|
opts.onSetServerDefaultBetas(msg.betas || []);
|
|
1090
1142
|
}
|
|
1091
1143
|
sm.currentBetas = msg.betas || [];
|
|
1092
|
-
send({ type: "config_state", model: sm.currentModel || "",
|
|
1144
|
+
send({ type: "config_state", model: sm.currentModel || "", effort: sm.currentEffort || "medium", betas: sm.currentBetas, thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
|
|
1093
1145
|
return true;
|
|
1094
1146
|
}
|
|
1095
1147
|
|
|
@@ -1098,14 +1150,14 @@ function attachSessions(ctx) {
|
|
|
1098
1150
|
opts.onSetProjectDefaultBetas(slug, msg.betas || []);
|
|
1099
1151
|
}
|
|
1100
1152
|
sm.currentBetas = msg.betas || [];
|
|
1101
|
-
send({ type: "config_state", model: sm.currentModel || "",
|
|
1153
|
+
send({ type: "config_state", model: sm.currentModel || "", effort: sm.currentEffort || "medium", betas: sm.currentBetas, thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
|
|
1102
1154
|
return true;
|
|
1103
1155
|
}
|
|
1104
1156
|
|
|
1105
1157
|
if (msg.type === "set_thinking") {
|
|
1106
1158
|
sm.currentThinking = msg.thinking || "adaptive";
|
|
1107
1159
|
if (msg.budgetTokens) sm.currentThinkingBudget = msg.budgetTokens;
|
|
1108
|
-
send({ type: "config_state", model: sm.currentModel || "",
|
|
1160
|
+
send({ type: "config_state", model: sm.currentModel || "", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [], thinking: sm.currentThinking || "adaptive", thinkingBudget: sm.currentThinkingBudget || 10000 });
|
|
1109
1161
|
return true;
|
|
1110
1162
|
}
|
|
1111
1163
|
|
package/lib/project.js
CHANGED
|
@@ -98,7 +98,7 @@ var FS_MAX_SIZE = 512 * 1024;
|
|
|
98
98
|
|
|
99
99
|
/**
|
|
100
100
|
* Create a project context — per-project state and handlers.
|
|
101
|
-
* opts: { cwd, slug, title, pushModule, debug,
|
|
101
|
+
* opts: { cwd, slug, title, pushModule, debug, currentVersion }
|
|
102
102
|
*/
|
|
103
103
|
function createProjectContext(opts) {
|
|
104
104
|
var cwd = opts.cwd;
|
|
@@ -110,13 +110,6 @@ function createProjectContext(opts) {
|
|
|
110
110
|
var preferredAgent = opts.preferredAgent || null;
|
|
111
111
|
var pushModule = opts.pushModule || null;
|
|
112
112
|
var debug = opts.debug || false;
|
|
113
|
-
// dangerouslySkipPermissions is a global bypass that disables tool-call approval
|
|
114
|
-
// for EVERY user in the daemon. In multi-user mode this is unsafe: an admin enabling
|
|
115
|
-
// it for convenience removes approval gates for all users simultaneously.
|
|
116
|
-
// We hard-disable it when multi-user mode is active so the per-user permission
|
|
117
|
-
// model remains intact. Admins who want bypassPermissions must do so per-session.
|
|
118
|
-
var dangerouslySkipPermissionsConfigured = opts.dangerouslySkipPermissions || false;
|
|
119
|
-
var dangerouslySkipPermissions = false;
|
|
120
113
|
var currentVersion = opts.currentVersion;
|
|
121
114
|
var lanHost = opts.lanHost || null;
|
|
122
115
|
var getProjectCount = opts.getProjectCount || function () { return 1; };
|
|
@@ -468,7 +461,7 @@ function createProjectContext(opts) {
|
|
|
468
461
|
// A saved default (daemon.json, hand-edited or from an older build) goes
|
|
469
462
|
// through the same check as a client's request. The vendor check is left to
|
|
470
463
|
// query start: no vendor has reported its capabilities yet.
|
|
471
|
-
var _savedMode = savedModeOrDefault(sm._savedDefaultMode
|
|
464
|
+
var _savedMode = savedModeOrDefault(sm._savedDefaultMode);
|
|
472
465
|
if (_savedMode.error) {
|
|
473
466
|
console.warn("[project] saved default permission mode " + logField(sm._savedDefaultMode) + " refused in " + slug + " (" + _savedMode.error + "); using default");
|
|
474
467
|
}
|
|
@@ -476,6 +469,9 @@ function createProjectContext(opts) {
|
|
|
476
469
|
// Immediately apply the saved default so config_state on connect reflects it
|
|
477
470
|
// before the SDK has warmed up and fired system/init.
|
|
478
471
|
if (sm._savedDefaultMode) sm.currentPermissionMode = sm._savedDefaultMode;
|
|
472
|
+
// A session saved before sessions kept their own mode takes the project's
|
|
473
|
+
// default now and keeps it from here on.
|
|
474
|
+
sm.adoptDefaultMode(sm._savedDefaultMode);
|
|
479
475
|
|
|
480
476
|
var _projEffort = typeof opts.onGetProjectDefaultEffort === "function" ? opts.onGetProjectDefaultEffort(slug) : null;
|
|
481
477
|
var _srvEffort = typeof opts.onGetServerDefaultEffort === "function" ? opts.onGetServerDefaultEffort() : null;
|
|
@@ -611,7 +607,9 @@ function createProjectContext(opts) {
|
|
|
611
607
|
adapter: adapter,
|
|
612
608
|
adapters: adapters,
|
|
613
609
|
getNotificationsModule: function () { return _notifications; },
|
|
614
|
-
|
|
610
|
+
getPermissionSettings: function () {
|
|
611
|
+
return typeof opts.onGetPermissionSettings === "function" ? opts.onGetPermissionSettings() : null;
|
|
612
|
+
},
|
|
615
613
|
mcpServers: getLocalMcpServers,
|
|
616
614
|
getRemoteMcpServers: function () { return _mcp.getMcpServers(); },
|
|
617
615
|
clayPort: serverPort,
|
|
@@ -936,7 +934,6 @@ function createProjectContext(opts) {
|
|
|
936
934
|
slug: slug,
|
|
937
935
|
osUsers: osUsers,
|
|
938
936
|
debug: debug,
|
|
939
|
-
dangerouslySkipPermissions: dangerouslySkipPermissions,
|
|
940
937
|
currentVersion: currentVersion,
|
|
941
938
|
sm: sm,
|
|
942
939
|
sdk: sdk,
|
|
@@ -1160,8 +1157,6 @@ function createProjectContext(opts) {
|
|
|
1160
1157
|
liteStatus: _liteStatus,
|
|
1161
1158
|
osUsers: osUsers,
|
|
1162
1159
|
debug: debug,
|
|
1163
|
-
dangerouslySkipPermissions: dangerouslySkipPermissions,
|
|
1164
|
-
dangerouslySkipPermissionsConfigured: dangerouslySkipPermissionsConfigured,
|
|
1165
1160
|
currentVersion: currentVersion,
|
|
1166
1161
|
lanHost: lanHost,
|
|
1167
1162
|
sm: sm,
|
|
@@ -1401,6 +1396,9 @@ function createProjectContext(opts) {
|
|
|
1401
1396
|
onProcessingChanged: onProcessingChanged,
|
|
1402
1397
|
getLinuxUserForSession: getLinuxUserForSession,
|
|
1403
1398
|
ensureProjectAccessForSession: ensureProjectAccessForSession,
|
|
1399
|
+
// The shared mode check for a session on its vendor, for a caller outside
|
|
1400
|
+
// the WebSocket handlers (session-input.js, which opens sessions).
|
|
1401
|
+
checkPermissionModeFor: function (session, mode) { return sdk.checkModeFor(session, mode, true); },
|
|
1404
1402
|
// Ends the adapters' runtimes that nothing is using (see idle-adapter-reaper.js).
|
|
1405
1403
|
reclaimIdleAdapters: function (idleMs) {
|
|
1406
1404
|
return reclaimIdleAdapters(adapters, idleMs);
|
package/lib/public/app.js
CHANGED
|
@@ -256,7 +256,6 @@ import { initDiagnostics } from './modules/diagnostics.js';
|
|
|
256
256
|
currentSlug: currentSlug,
|
|
257
257
|
currentProjectOwnerId: null,
|
|
258
258
|
isOsUsers: false,
|
|
259
|
-
skipPermsEnabled: false,
|
|
260
259
|
slashCommands: [],
|
|
261
260
|
processing: false,
|
|
262
261
|
activeSessionId: null,
|
|
@@ -446,7 +445,7 @@ import { initDiagnostics } from './modules/diagnostics.js';
|
|
|
446
445
|
// currentModels, currentModel, currentMode, currentEffort, currentBetas,
|
|
447
446
|
// currentThinking, currentThinkingBudget, sessionUsage, contextData,
|
|
448
447
|
// headerContextEl, richContextUsage, ctxPopoverVisible -> modules/app-panels.js
|
|
449
|
-
//
|
|
448
|
+
// isOsUsers -> store
|
|
450
449
|
|
|
451
450
|
function updateConfigChip() { _panUpdateConfigChip(); }
|
|
452
451
|
function getModelEffortLevels() { return _panGetModelEffortLevels(); }
|
|
@@ -518,9 +518,6 @@ button.top-bar-pill.pill-accent:hover { background: color-mix(in srgb, var(--acc
|
|
|
518
518
|
.popover-copy:hover { color: var(--text); border-color: var(--text-dimmer); }
|
|
519
519
|
.popover-copy.copied { color: var(--success); border-color: var(--success); }
|
|
520
520
|
|
|
521
|
-
/* Skip permissions pill */
|
|
522
|
-
#skip-perms-pill .lucide { width: 12px; height: 12px; flex-shrink: 0; }
|
|
523
|
-
|
|
524
521
|
/* --- Confirm modal --- */
|
|
525
522
|
#confirm-modal {
|
|
526
523
|
position: fixed;
|
package/lib/public/index.html
CHANGED
|
@@ -81,7 +81,6 @@
|
|
|
81
81
|
<button id="cmd-palette-btn" class="cmd-palette-searchbar" title="Command palette"><i data-lucide="search"></i><span class="cmd-palette-searchbar-text">Search sessions, projects, and commands</span><kbd class="cmd-palette-searchbar-kbd"></kbd></button>
|
|
82
82
|
<div class="top-bar-actions">
|
|
83
83
|
<!-- Pill badges -->
|
|
84
|
-
<div id="skip-perms-pill" class="top-bar-pill pill-error hidden"><i data-lucide="shield-off"></i> <span>Skip perms</span></div>
|
|
85
84
|
<div id="client-count" class="top-bar-pill pill-accent hidden"><i data-lucide="users"></i> <span id="client-count-text"></span></div>
|
|
86
85
|
<button id="share-pill" title="Share"><i data-lucide="share-2"></i></button>
|
|
87
86
|
<button id="diagnostics-panel-btn" title="Diagnostics" aria-label="Diagnostics" aria-expanded="false"><i data-lucide="activity"></i><span id="diagnostics-panel-badge" class="diagnostics-panel-badge hidden" aria-hidden="true">0</span></button>
|
|
@@ -668,6 +667,14 @@
|
|
|
668
667
|
<label class="settings-label">Mode</label>
|
|
669
668
|
<div class="settings-hint">Controls how Claude handles tool use and file edits.</div>
|
|
670
669
|
<div id="ps-mode-list" class="settings-model-list"></div>
|
|
670
|
+
<label class="settings-toggle-row">
|
|
671
|
+
<div>
|
|
672
|
+
<span class="settings-label">Apply to running sessions</span>
|
|
673
|
+
<div class="settings-hint">Off: only new sessions start in the mode you pick. On: this project's open sessions switch to it too. Applies to your next pick only.</div>
|
|
674
|
+
</div>
|
|
675
|
+
<input type="checkbox" id="ps-mode-apply">
|
|
676
|
+
<span class="toggle-track"><span class="toggle-thumb"></span></span>
|
|
677
|
+
</label>
|
|
671
678
|
</div>
|
|
672
679
|
</div>
|
|
673
680
|
<div class="settings-card" id="ps-effort-card">
|
|
@@ -1101,13 +1108,6 @@
|
|
|
1101
1108
|
<label class="settings-label">HTTPS</label>
|
|
1102
1109
|
<span class="settings-value settings-badge" id="settings-tls">-</span>
|
|
1103
1110
|
</div>
|
|
1104
|
-
<div class="settings-field-row">
|
|
1105
|
-
<div>
|
|
1106
|
-
<label class="settings-label">Skip Permissions</label>
|
|
1107
|
-
<div class="settings-hint">Auto-approves all tool executions. Restart with <code style="font-size:12px">--dangerously-skip-permissions</code> to enable.</div>
|
|
1108
|
-
</div>
|
|
1109
|
-
<span class="settings-value settings-badge" id="settings-skip-perms">Disabled</span>
|
|
1110
|
-
</div>
|
|
1111
1111
|
<div class="settings-field-row">
|
|
1112
1112
|
<label class="settings-label">Debug</label>
|
|
1113
1113
|
<span class="settings-value settings-badge" id="settings-debug">-</span>
|
|
@@ -1193,6 +1193,14 @@
|
|
|
1193
1193
|
<label class="settings-label">Mode</label>
|
|
1194
1194
|
<div class="settings-hint">Controls how Claude handles tool use and file edits.</div>
|
|
1195
1195
|
<div id="ss-mode-list" class="settings-model-list"></div>
|
|
1196
|
+
<label class="settings-toggle-row">
|
|
1197
|
+
<div>
|
|
1198
|
+
<span class="settings-label">Apply to running sessions</span>
|
|
1199
|
+
<div class="settings-hint">Off: only new sessions start in the mode you pick. On: this project's open sessions switch to it too. Applies to your next pick only.</div>
|
|
1200
|
+
</div>
|
|
1201
|
+
<input type="checkbox" id="ss-mode-apply">
|
|
1202
|
+
<span class="toggle-track"><span class="toggle-thumb"></span></span>
|
|
1203
|
+
</label>
|
|
1196
1204
|
</div>
|
|
1197
1205
|
</div>
|
|
1198
1206
|
<div class="settings-card" id="ss-effort-card">
|
|
@@ -1216,6 +1224,25 @@
|
|
|
1216
1224
|
</div>
|
|
1217
1225
|
<div class="server-settings-section" data-section="security">
|
|
1218
1226
|
<h2>Security</h2>
|
|
1227
|
+
<div class="settings-card">
|
|
1228
|
+
<div class="settings-field">
|
|
1229
|
+
<label class="settings-toggle-row">
|
|
1230
|
+
<div>
|
|
1231
|
+
<span class="settings-label">Auto-approve read-only tools</span>
|
|
1232
|
+
<div class="settings-hint">On (the default): read-only tools, safe shell commands, browser watch and unwatch, and the MCP servers you enabled run without a prompt. Off: each of them asks first. Only an admin can change this.</div>
|
|
1233
|
+
</div>
|
|
1234
|
+
<input type="checkbox" id="ss-auto-approve-readonly" checked>
|
|
1235
|
+
<span class="toggle-track"><span class="toggle-thumb"></span></span>
|
|
1236
|
+
</label>
|
|
1237
|
+
</div>
|
|
1238
|
+
</div>
|
|
1239
|
+
<div class="settings-card">
|
|
1240
|
+
<div class="settings-field">
|
|
1241
|
+
<label class="settings-label">Mode for sessions opened by the CLI or a trigger</label>
|
|
1242
|
+
<div class="settings-hint">The mode a session starts in when it is opened by <code>clagentic-console open-session</code> or a trigger file. The default is Accept edits. An open-session call can name its own mode with <code>--permission-mode</code>. Only an admin can change this.</div>
|
|
1243
|
+
<div id="ss-opened-mode-list" class="settings-model-list"></div>
|
|
1244
|
+
</div>
|
|
1245
|
+
</div>
|
|
1219
1246
|
<div class="settings-card">
|
|
1220
1247
|
<div class="settings-field-row">
|
|
1221
1248
|
<div>
|
|
@@ -2037,6 +2064,15 @@
|
|
|
2037
2064
|
<span class="sched-switch-text">Skip if previous run still active</span>
|
|
2038
2065
|
</label>
|
|
2039
2066
|
</div>
|
|
2067
|
+
<div class="sched-skip-running-row sched-approve-tools-row" id="sched-approve-tools-row">
|
|
2068
|
+
<label class="sched-switch-label" for="sched-approve-tools">
|
|
2069
|
+
<div class="sched-switch">
|
|
2070
|
+
<input type="checkbox" id="sched-approve-tools" checked>
|
|
2071
|
+
<span class="sched-switch-slider"></span>
|
|
2072
|
+
</div>
|
|
2073
|
+
<span class="sched-switch-text">Approve tools automatically during this loop</span>
|
|
2074
|
+
</label>
|
|
2075
|
+
</div>
|
|
2040
2076
|
</div>
|
|
2041
2077
|
</div>
|
|
2042
2078
|
<!-- Bottom bar -->
|