@clagentic/console 1.9.0-beta.3 → 1.10.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.
- package/LICENSE +117 -12
- package/LICENSES/MIT-legacy.txt +22 -0
- package/LICENSES/README.md +15 -0
- package/README.md +8 -2
- package/bin/cli.js +30 -5
- package/deploy/clagentic-console.service +10 -6
- package/lib/audit.js +3 -2
- package/lib/build-sha.json +2 -2
- package/lib/build-update-check.js +138 -0
- package/lib/cli/daemon-launch.js +17 -17
- package/lib/config.js +32 -20
- package/lib/daemon-env-settings.js +84 -0
- package/lib/daemon-projects.js +38 -0
- package/lib/daemon.js +202 -158
- package/lib/drain.js +74 -17
- package/lib/env-compat.js +61 -0
- package/lib/extension-commands.js +45 -0
- package/lib/history-visibility.js +4 -0
- package/lib/idle-adapter-reaper.js +71 -0
- package/lib/link-trap.js +78 -0
- package/lib/lore-attestation.js +73 -0
- package/lib/mcp-local.js +8 -6
- package/lib/mcp-tool-input.js +116 -0
- package/lib/mcp-tool-schema.js +179 -0
- package/lib/memory-limits.js +61 -5
- package/lib/memory-setting-validate.js +65 -0
- package/lib/new-work-gate.js +47 -0
- package/lib/os-users.js +5 -3
- package/lib/project-access.js +139 -0
- package/lib/project-connection.js +23 -22
- package/lib/project-external-trigger.js +103 -10
- package/lib/project-file-scope.js +172 -0
- package/lib/project-file-watch.js +86 -61
- package/lib/project-filesystem.js +144 -128
- package/lib/project-git.js +119 -0
- package/lib/project-http.js +44 -28
- package/lib/project-loop.js +12 -5
- package/lib/project-mcp.js +53 -72
- package/lib/project-message-gate.js +70 -0
- package/lib/project-notifications.js +31 -4
- package/lib/project-prompt-responses.js +216 -0
- package/lib/project-sessions.js +164 -302
- package/lib/project-user-message.js +36 -11
- package/lib/project.js +189 -142
- package/lib/projects-dir.js +90 -0
- package/lib/prompt-access.js +22 -0
- package/lib/prompt-kinds/answer-limits.js +15 -0
- package/lib/prompt-kinds/ask-user.js +58 -0
- package/lib/prompt-kinds/codecs.js +97 -0
- package/lib/prompt-kinds/elicitation.js +77 -0
- package/lib/prompt-kinds/extension.js +39 -0
- package/lib/prompt-kinds/index.js +68 -0
- package/lib/prompt-kinds/permission.js +114 -0
- package/lib/prompt-kinds/plan.js +79 -0
- package/lib/prompt-kinds/tool-call.js +38 -0
- package/lib/prompt-registry.js +673 -0
- package/lib/public/app.js +1 -1
- package/lib/public/css/diagnostics.css +50 -0
- package/lib/public/css/input.css +17 -3
- package/lib/public/css/menus.css +10 -0
- package/lib/public/css/messages.css +5 -0
- package/lib/public/css/rewind.css +22 -0
- package/lib/public/index.html +4 -12
- package/lib/public/modules/app-connection.js +7 -0
- package/lib/public/modules/app-cursors.js +7 -5
- package/lib/public/modules/app-messages.js +45 -45
- package/lib/public/modules/app-notifications.js +47 -71
- package/lib/public/modules/app-panels.js +61 -58
- package/lib/public/modules/app-projects.js +2 -1
- package/lib/public/modules/app-rendering.js +4 -10
- package/lib/public/modules/diagnostics.js +60 -16
- package/lib/public/modules/filebrowser.js +18 -16
- package/lib/public/modules/history-visibility.js +4 -0
- package/lib/public/modules/mention.js +3 -2
- package/lib/public/modules/mode-options.js +38 -0
- package/lib/public/modules/project-settings.js +19 -8
- package/lib/public/modules/prompt-banner.js +78 -0
- package/lib/public/modules/prompt-card.js +201 -0
- package/lib/public/modules/prompt-kinds/ask-user-codec.js +131 -0
- package/lib/public/modules/prompt-kinds/ask-user.js +213 -0
- package/lib/public/modules/prompt-kinds/elicitation-codec.js +343 -0
- package/lib/public/modules/prompt-kinds/elicitation.js +176 -0
- package/lib/public/modules/prompt-kinds/index.js +18 -0
- package/lib/public/modules/prompt-kinds/own-key.js +29 -0
- package/lib/public/modules/prompt-kinds/package.json +3 -0
- package/lib/public/modules/prompt-kinds/permission-choices.js +31 -0
- package/lib/public/modules/prompt-kinds/permission.js +209 -0
- package/lib/public/modules/prompt-kinds/plan.js +102 -0
- package/lib/public/modules/prompt-state.js +142 -0
- package/lib/public/modules/prompts.js +134 -0
- package/lib/public/modules/rewind.js +4 -1
- package/lib/public/modules/server-settings.js +2 -4
- package/lib/public/modules/sidebar-mobile.js +19 -9
- package/lib/public/modules/sidebar-sessions.js +21 -14
- package/lib/public/modules/sticky-notes.js +3 -2
- package/lib/public/modules/team-panel.js +5 -4
- package/lib/public/modules/tools.js +67 -904
- package/lib/public/modules/vendor-picker.js +53 -0
- package/lib/public/modules/vendor-registry.js +133 -0
- package/lib/public/sw.js +3 -1
- package/lib/rc-migrate.js +44 -0
- package/lib/runtime-env-keys.js +109 -0
- package/lib/runtime-env.js +236 -0
- package/lib/sdk-bridge.js +290 -273
- package/lib/sdk-message-processor.js +125 -145
- package/lib/server-hub-sessions.js +13 -10
- package/lib/server-palette.js +28 -19
- package/lib/server.js +141 -113
- package/lib/service-install.js +96 -0
- package/lib/session-capabilities.js +76 -0
- package/lib/sessions.js +45 -28
- package/lib/users-permissions.js +9 -6
- package/lib/users.js +9 -0
- package/lib/utils.js +4 -2
- package/lib/vendor-auth.js +22 -0
- package/lib/vendor-registry-message.js +65 -0
- package/lib/ws-origin.js +99 -0
- package/lib/ws-schema.js +33 -22
- package/lib/yoke/adapters/claude-capabilities.js +38 -0
- package/lib/yoke/adapters/claude-vendor.js +35 -0
- package/lib/yoke/adapters/claude-worker.js +55 -87
- package/lib/yoke/adapters/claude.js +156 -62
- package/lib/yoke/adapters/codex-capabilities.js +37 -0
- package/lib/yoke/adapters/codex-vendor.js +46 -0
- package/lib/yoke/adapters/codex.js +347 -156
- package/lib/yoke/adapters/effort-control.js +34 -0
- package/lib/yoke/adapters/permission-relay.js +58 -0
- package/lib/yoke/adapters/worker-mcp-servers.js +81 -0
- package/lib/yoke/auth-checks.js +104 -0
- package/lib/yoke/capabilities.js +49 -0
- package/lib/yoke/codex-app-server.js +23 -5
- package/lib/yoke/env-ownership.js +40 -0
- package/lib/yoke/index.js +67 -173
- package/lib/yoke/install-probe.js +121 -0
- package/lib/yoke/instructions.js +7 -11
- package/lib/yoke/interface.js +199 -3
- package/lib/yoke/package.json +1 -1
- package/lib/yoke/provider-credentials.js +96 -0
- package/lib/yoke/registry.js +340 -0
- package/package.json +12 -8
- package/scripts/check-sdk-lock-drift.js +160 -0
- package/scripts/check-test-count.js +76 -1
- package/scripts/postinstall.js +218 -136
- package/scripts/prompt-harness-history.js +202 -0
- package/scripts/verify-installed.js +67 -0
- package/lib/sdk-permission-ownership.js +0 -136
package/lib/daemon.js
CHANGED
|
@@ -25,23 +25,31 @@ var fs = require("fs");
|
|
|
25
25
|
var path = require("path");
|
|
26
26
|
var { loadConfig, saveConfig, socketPath, ensureConfigDir, generateSlug, syncClayrc, removeFromClayrc, writeCrashInfo, readCrashInfo, clearCrashInfo, isPidAlive, clearStaleConfig, REAL_HOME, CONFIG_DIR, CLAGENTIC_HOME } = require("./config");
|
|
27
27
|
var { createIPCServer } = require("./ipc");
|
|
28
|
+
var { createEnvSettings, removeEnvrcOnOwnerChange } = require("./daemon-env-settings");
|
|
29
|
+
var { startIdleAdapterReaper } = require("./idle-adapter-reaper");
|
|
28
30
|
var { createServer } = require("./server");
|
|
31
|
+
var promptRegistry = require("./prompt-registry");
|
|
29
32
|
var { checkAclSupport, grantProjectAccess, revokeProjectAccess, provisionAllUsers, provisionLinuxUser, grantAllUsersAccess, deactivateLinuxUser, ensureProjectsDir } = require("./os-users");
|
|
30
33
|
var usersModule = require("./users");
|
|
31
34
|
var { createWorktree, removeWorktree, isWorktree } = require("./worktree");
|
|
32
|
-
var { isWorktreeSlug, scanAndRegisterWorktrees, rescanWorktrees, cleanupWorktreesForParent, getFilteredRemovedProjects, registerWorktreeSlug, unregisterWorktreeSlug } = require("./daemon-projects");
|
|
35
|
+
var { isWorktreeSlug, scanAndRegisterWorktrees, rescanWorktrees, cleanupWorktreesForParent, getFilteredRemovedProjects, registerWorktreeSlug, unregisterWorktreeSlug, getProjectAccessRecord } = require("./daemon-projects");
|
|
33
36
|
var { validateCloneUrl, buildCloneArgs } = require("./clone-validate");
|
|
34
37
|
var { DEFAULT_MEM_AVAILABLE_MIN_MB, DEFAULT_TOKENS_PER_MB_HEADROOM, getActiveLiveCount, buildActivityDiagnosticsResponse } = require("./sdk-bridge");
|
|
38
|
+
var { validateMemAvailableThresholdMB, validateTokensPerMbHeadroom } = require("./memory-setting-validate");
|
|
35
39
|
var { startMemoryHighWatcher, checkAppliedMemoryCeiling } = require("./memory-limits");
|
|
36
40
|
var { createDrain } = require("./drain");
|
|
41
|
+
var { setNewWorkGate } = require("./new-work-gate");
|
|
37
42
|
var { shedMemory } = require("./memory-shed");
|
|
38
43
|
var { dropSkillsCache } = require("./server-skills");
|
|
44
|
+
var { readInstalledBuildSha, checkForNewerInstalledBuild, waitForIdleThenAct } = require("./build-update-check");
|
|
39
45
|
var liteDetect = require("./lite-detect");
|
|
40
46
|
var { execFile: liteExecFile } = require("child_process");
|
|
41
47
|
var { SLUG_RE: CUSTOM_ICON_SLUG_RE, CUSTOM_EMOJI_CT } = require("./server-settings");
|
|
42
48
|
|
|
43
49
|
var daemonVersion = require("../package.json").version;
|
|
44
|
-
var
|
|
50
|
+
var { readConsoleEnv } = require("./env-compat");
|
|
51
|
+
var { resolveProjectsDir, legacyNotice } = require("./projects-dir");
|
|
52
|
+
var configFile = readConsoleEnv("CLAGENTIC_CONSOLE_CONFIG") || require("./config").configPath();
|
|
45
53
|
var config;
|
|
46
54
|
|
|
47
55
|
// Ensure dirs exist before any file access — daemon must be self-sufficient when
|
|
@@ -52,25 +60,25 @@ try {
|
|
|
52
60
|
config = JSON.parse(fs.readFileSync(configFile, "utf8"));
|
|
53
61
|
} catch (e) {
|
|
54
62
|
if (e.code === "ENOENT") {
|
|
55
|
-
// Guard: if
|
|
63
|
+
// Guard: if CLAGENTIC_CONSOLE_HOME was erroneously set to the socket subdirectory
|
|
56
64
|
// (e.g. ~/.clagentic/console instead of ~/.clagentic), a real daemon.json
|
|
57
|
-
// will exist one level above
|
|
65
|
+
// will exist one level above CLAGENTIC_CONSOLE_HOME. Detect this and refuse to
|
|
58
66
|
// bootstrap an empty config — that would silently discard all projects.
|
|
59
67
|
var { CLAGENTIC_HOME: _cgHome } = require("./config");
|
|
60
68
|
var _siblingConfig = path.join(path.dirname(_cgHome), "daemon.json");
|
|
61
69
|
try {
|
|
62
70
|
var _sibling = JSON.parse(fs.readFileSync(_siblingConfig, "utf8"));
|
|
63
71
|
if (_sibling && Array.isArray(_sibling.projects) && _sibling.projects.length > 0) {
|
|
64
|
-
console.error("[daemon] ERROR:
|
|
72
|
+
console.error("[daemon] ERROR: CLAGENTIC_CONSOLE_HOME appears to point at the console/ socket subdirectory (" + _cgHome + ").");
|
|
65
73
|
console.error("[daemon] A populated daemon.json with " + _sibling.projects.length + " project(s) exists at " + _siblingConfig + ".");
|
|
66
|
-
console.error("[daemon] Set
|
|
74
|
+
console.error("[daemon] Set CLAGENTIC_CONSOLE_HOME to the parent directory (" + path.dirname(_cgHome) + ") to use the correct config.");
|
|
67
75
|
process.exit(78); // EX_CONFIG — do not auto-restart
|
|
68
76
|
}
|
|
69
77
|
} catch (_e) { /* sibling check is best-effort; fall through to normal bootstrap */ }
|
|
70
78
|
|
|
71
79
|
// No config file yet (fresh install, systemd-only start). Bootstrap minimal defaults.
|
|
72
80
|
console.warn("[daemon] No config file found at " + configFile + " — bootstrapping defaults. Run clagentic-console to configure projects.");
|
|
73
|
-
var _isDev = !!(
|
|
81
|
+
var _isDev = !!readConsoleEnv("CLAGENTIC_CONSOLE_DEV");
|
|
74
82
|
config = { port: _isDev ? 2635 : 2633, projects: [], mode: "single", setupCompleted: false };
|
|
75
83
|
// Persist so subsequent reads succeed.
|
|
76
84
|
try {
|
|
@@ -88,6 +96,8 @@ console.log("[daemon] v" + daemonVersion + " PID " + process.pid + " config " +
|
|
|
88
96
|
|
|
89
97
|
console.log("[daemon] Config: " + configFile);
|
|
90
98
|
console.log("[daemon] Users: " + usersModule.USERS_FILE);
|
|
99
|
+
var _projectsDirNotice = legacyNotice(resolveProjectsDir({ config: config, realHome: REAL_HOME }), configFile);
|
|
100
|
+
if (_projectsDirNotice) console.log(_projectsDirNotice);
|
|
91
101
|
if (process.env.SUDO_USER) console.log("[daemon] SUDO_USER: " + process.env.SUDO_USER);
|
|
92
102
|
console.log("[daemon] UID: " + (typeof process.getuid === "function" ? process.getuid() : "N/A"));
|
|
93
103
|
|
|
@@ -272,6 +282,14 @@ var lanIp = (function () {
|
|
|
272
282
|
|
|
273
283
|
// getFilteredRemovedProjects extracted to daemon-projects.js
|
|
274
284
|
|
|
285
|
+
// --- Environment variables saved in Settings (shared and per project) ---
|
|
286
|
+
// A saved change reaches the runtimes started after it; a runtime already
|
|
287
|
+
// running keeps the environment it started with.
|
|
288
|
+
var envSettings = createEnvSettings({
|
|
289
|
+
getConfig: function () { return config; },
|
|
290
|
+
saveConfig: saveConfig,
|
|
291
|
+
});
|
|
292
|
+
|
|
275
293
|
// --- Create multi-project server ---
|
|
276
294
|
var listenHost = config.host || "0.0.0.0";
|
|
277
295
|
|
|
@@ -283,6 +301,9 @@ var relay = createServer({
|
|
|
283
301
|
// from a reverse proxy (e.g. Caddy). Never read the header unconditionally —
|
|
284
302
|
// see lib/effective-protocol.js.
|
|
285
303
|
trustedProxy: !!config.trustedProxy,
|
|
304
|
+
// Origins besides the daemon's own host that may open a WebSocket
|
|
305
|
+
// (daemon.json allowedOrigins, e.g. ["https://console.example.com"]).
|
|
306
|
+
allowedOrigins: Array.isArray(config.allowedOrigins) ? config.allowedOrigins : [],
|
|
286
307
|
port: config.port,
|
|
287
308
|
debug: config.debug || false,
|
|
288
309
|
dangerouslySkipPermissions: config.dangerouslySkipPermissions || false,
|
|
@@ -354,26 +375,7 @@ var relay = createServer({
|
|
|
354
375
|
console.log("[daemon] onCreateProject wsUser:", JSON.stringify(wsUser ? { id: wsUser.id, role: wsUser.role, username: wsUser.username, linuxUser: wsUser.linuxUser } : null));
|
|
355
376
|
var os = require("os");
|
|
356
377
|
var execFileSync = require("child_process").execFileSync;
|
|
357
|
-
var baseDir;
|
|
358
|
-
if (config.osUsers) {
|
|
359
|
-
baseDir = "/var/clagentic/projects";
|
|
360
|
-
} else {
|
|
361
|
-
baseDir = config.projectsDir || (function () {
|
|
362
|
-
var newDir = path.join(REAL_HOME, "clagentic-projects");
|
|
363
|
-
var oldDir = path.join(REAL_HOME, "clay-projects");
|
|
364
|
-
// One-time migration: if new dir absent but old dir exists, rename it
|
|
365
|
-
if (!fs.existsSync(newDir) && fs.existsSync(oldDir)) {
|
|
366
|
-
try {
|
|
367
|
-
fs.renameSync(oldDir, newDir);
|
|
368
|
-
console.log("[config] Renamed " + oldDir + " → " + newDir);
|
|
369
|
-
} catch (e) {
|
|
370
|
-
// rename failed (e.g. cross-device) — fall back to old dir to avoid data loss
|
|
371
|
-
return oldDir;
|
|
372
|
-
}
|
|
373
|
-
}
|
|
374
|
-
return newDir;
|
|
375
|
-
})();
|
|
376
|
-
}
|
|
378
|
+
var baseDir = resolveProjectsDir({ config: config, realHome: REAL_HOME }).dir;
|
|
377
379
|
try { fs.mkdirSync(baseDir, { recursive: true }); } catch (e) {}
|
|
378
380
|
// Generate slug and deduplicate
|
|
379
381
|
var slugs = config.projects.map(function (p) { return p.slug; });
|
|
@@ -451,26 +453,7 @@ var relay = createServer({
|
|
|
451
453
|
var os = require("os");
|
|
452
454
|
var spawn = require("child_process").spawn;
|
|
453
455
|
var execFileSync = require("child_process").execFileSync;
|
|
454
|
-
var baseDir;
|
|
455
|
-
if (config.osUsers) {
|
|
456
|
-
baseDir = "/var/clagentic/projects";
|
|
457
|
-
} else {
|
|
458
|
-
baseDir = config.projectsDir || (function () {
|
|
459
|
-
var newDir = path.join(REAL_HOME, "clagentic-projects");
|
|
460
|
-
var oldDir = path.join(REAL_HOME, "clay-projects");
|
|
461
|
-
// One-time migration: if new dir absent but old dir exists, rename it
|
|
462
|
-
if (!fs.existsSync(newDir) && fs.existsSync(oldDir)) {
|
|
463
|
-
try {
|
|
464
|
-
fs.renameSync(oldDir, newDir);
|
|
465
|
-
console.log("[config] Renamed " + oldDir + " → " + newDir);
|
|
466
|
-
} catch (e) {
|
|
467
|
-
// rename failed (e.g. cross-device) — fall back to old dir to avoid data loss
|
|
468
|
-
return oldDir;
|
|
469
|
-
}
|
|
470
|
-
}
|
|
471
|
-
return newDir;
|
|
472
|
-
})();
|
|
473
|
-
}
|
|
456
|
+
var baseDir = resolveProjectsDir({ config: config, realHome: REAL_HOME }).dir;
|
|
474
457
|
try { fs.mkdirSync(baseDir, { recursive: true }); } catch (e) {}
|
|
475
458
|
// Derive slug from repo URL
|
|
476
459
|
var repoName = cloneUrl.replace(/\.git$/, "").split("/").pop() || "project";
|
|
@@ -911,6 +894,7 @@ var relay = createServer({
|
|
|
911
894
|
} else {
|
|
912
895
|
delete config.projects[oi].ownerId;
|
|
913
896
|
}
|
|
897
|
+
removeEnvrcOnOwnerChange(config.projects[oi], oldOwnerId, ownerId);
|
|
914
898
|
break;
|
|
915
899
|
}
|
|
916
900
|
}
|
|
@@ -944,40 +928,10 @@ var relay = createServer({
|
|
|
944
928
|
});
|
|
945
929
|
return { ok: true };
|
|
946
930
|
},
|
|
947
|
-
onGetProjectEnv:
|
|
948
|
-
|
|
949
|
-
|
|
950
|
-
|
|
951
|
-
}
|
|
952
|
-
}
|
|
953
|
-
return { envrc: "" };
|
|
954
|
-
},
|
|
955
|
-
onSetProjectEnv: function (slug, envrc) {
|
|
956
|
-
for (var ei = 0; ei < config.projects.length; ei++) {
|
|
957
|
-
if (config.projects[ei].slug === slug) {
|
|
958
|
-
if (envrc) {
|
|
959
|
-
config.projects[ei].envrc = envrc;
|
|
960
|
-
} else {
|
|
961
|
-
delete config.projects[ei].envrc;
|
|
962
|
-
}
|
|
963
|
-
saveConfig(config);
|
|
964
|
-
return { ok: true };
|
|
965
|
-
}
|
|
966
|
-
}
|
|
967
|
-
return { ok: false, error: "Project not found" };
|
|
968
|
-
},
|
|
969
|
-
onGetSharedEnv: function () {
|
|
970
|
-
return { envrc: config.sharedEnv || "" };
|
|
971
|
-
},
|
|
972
|
-
onSetSharedEnv: function (envrc) {
|
|
973
|
-
if (envrc) {
|
|
974
|
-
config.sharedEnv = envrc;
|
|
975
|
-
} else {
|
|
976
|
-
delete config.sharedEnv;
|
|
977
|
-
}
|
|
978
|
-
saveConfig(config);
|
|
979
|
-
return { ok: true };
|
|
980
|
-
},
|
|
931
|
+
onGetProjectEnv: envSettings.onGetProjectEnv,
|
|
932
|
+
onSetProjectEnv: envSettings.onSetProjectEnv,
|
|
933
|
+
onGetSharedEnv: envSettings.onGetSharedEnv,
|
|
934
|
+
onSetSharedEnv: envSettings.onSetSharedEnv,
|
|
981
935
|
onGetServerDefaultEffort: function () {
|
|
982
936
|
return { effort: config.defaultEffort || null };
|
|
983
937
|
},
|
|
@@ -1225,34 +1179,36 @@ var relay = createServer({
|
|
|
1225
1179
|
return { ok: true, autoContinueOnRateLimit: want };
|
|
1226
1180
|
},
|
|
1227
1181
|
onSetMemAvailableThreshold: function (mb) {
|
|
1228
|
-
var val = parseInt(mb, 10);
|
|
1229
1182
|
// lr-93e3c8 (item 6): out-of-range used to silently reset to the
|
|
1230
1183
|
// default and still report ok:true -- a UX trap on the exact knob an
|
|
1231
1184
|
// operator reaches for while already blocked by this same guard.
|
|
1232
1185
|
// Reject and report instead of silently substituting a value the
|
|
1233
|
-
// caller didn't ask for.
|
|
1234
|
-
|
|
1235
|
-
|
|
1236
|
-
|
|
1237
|
-
|
|
1238
|
-
|
|
1186
|
+
// caller didn't ask for. Validation lives in memory-setting-validate.js
|
|
1187
|
+
// so this contract can't drift from the raw IPC path (lr-553d27).
|
|
1188
|
+
var result = validateMemAvailableThresholdMB(mb);
|
|
1189
|
+
if (!result.ok) {
|
|
1190
|
+
console.warn("[daemon] MemAvailable threshold rejected: " + mb + " (" + result.error + ")");
|
|
1191
|
+
return { ok: false, error: result.error, memAvailableMinMB: config.memAvailableMinMB !== undefined ? config.memAvailableMinMB : DEFAULT_MEM_AVAILABLE_MIN_MB };
|
|
1192
|
+
}
|
|
1193
|
+
config.memAvailableMinMB = result.value;
|
|
1239
1194
|
saveConfig(config);
|
|
1240
|
-
console.log("[daemon] MemAvailable threshold:",
|
|
1241
|
-
return { ok: true, memAvailableMinMB:
|
|
1195
|
+
console.log("[daemon] MemAvailable threshold:", result.value, "MB (web)");
|
|
1196
|
+
return { ok: true, memAvailableMinMB: result.value };
|
|
1242
1197
|
},
|
|
1243
1198
|
onSetTokensPerMbHeadroom: function (tpm) {
|
|
1244
|
-
var val = parseInt(tpm, 10);
|
|
1245
1199
|
// lr-93e3c8 (item 6): valid range 10-500 tokens/MB. Out-of-range used to
|
|
1246
1200
|
// silently clamp to the default and still report ok:true -- see comment
|
|
1247
|
-
// on onSetMemAvailableThreshold above; same trap, same fix.
|
|
1248
|
-
|
|
1249
|
-
|
|
1250
|
-
|
|
1251
|
-
|
|
1252
|
-
|
|
1201
|
+
// on onSetMemAvailableThreshold above; same trap, same fix. Validation
|
|
1202
|
+
// lives in memory-setting-validate.js (lr-553d27).
|
|
1203
|
+
var result = validateTokensPerMbHeadroom(tpm);
|
|
1204
|
+
if (!result.ok) {
|
|
1205
|
+
console.warn("[daemon] Tokens per MB headroom rejected: " + tpm + " (" + result.error + ")");
|
|
1206
|
+
return { ok: false, error: result.error, tokensPerMbHeadroom: config.tokensPerMbHeadroom !== undefined ? config.tokensPerMbHeadroom : DEFAULT_TOKENS_PER_MB_HEADROOM };
|
|
1207
|
+
}
|
|
1208
|
+
config.tokensPerMbHeadroom = result.value;
|
|
1253
1209
|
saveConfig(config);
|
|
1254
|
-
console.log("[daemon] Tokens per MB headroom:",
|
|
1255
|
-
return { ok: true, tokensPerMbHeadroom:
|
|
1210
|
+
console.log("[daemon] Tokens per MB headroom:", result.value, "(web)");
|
|
1211
|
+
return { ok: true, tokensPerMbHeadroom: result.value };
|
|
1256
1212
|
},
|
|
1257
1213
|
onGetToolPalettes: function () {
|
|
1258
1214
|
return config.toolPalettes || {};
|
|
@@ -1297,6 +1253,26 @@ var relay = createServer({
|
|
|
1297
1253
|
console.log("[daemon] Restart requested via web UI");
|
|
1298
1254
|
spawnAndRestart();
|
|
1299
1255
|
},
|
|
1256
|
+
// lr-e85fec: operator clicked "Restart to apply update" on the
|
|
1257
|
+
// build-adoption diagnostic above. Unlike onRestart (immediate —
|
|
1258
|
+
// restart_server is already an explicit admin action with no reason to
|
|
1259
|
+
// delay further), this waits for in-flight sessions to finish first, the
|
|
1260
|
+
// same signal drain.js's memory-pressure path already keys off
|
|
1261
|
+
// (getActiveLiveCount()) — an operator asking to "apply the update" is not
|
|
1262
|
+
// also asking to drop whatever is running right now. Still bounded: a
|
|
1263
|
+
// stuck session cannot hold this open forever. See
|
|
1264
|
+
// build-update-check.js's waitForIdleThenAct for the (unit-tested) timing
|
|
1265
|
+
// logic itself.
|
|
1266
|
+
onRestartForBuildUpdate: function () {
|
|
1267
|
+
console.log("[daemon] Restart-for-build-update requested via web UI — waiting for in-flight sessions to finish");
|
|
1268
|
+
waitForIdleThenAct({
|
|
1269
|
+
getActiveCount: getActiveLiveCount,
|
|
1270
|
+
onIdle: function () {
|
|
1271
|
+
console.log("[daemon] Restarting to adopt new build (activeCount=" + getActiveLiveCount() + ")");
|
|
1272
|
+
spawnAndRestart();
|
|
1273
|
+
},
|
|
1274
|
+
});
|
|
1275
|
+
},
|
|
1300
1276
|
onSetProjectVisibility: function (slug, visibility) {
|
|
1301
1277
|
for (var i = 0; i < config.projects.length; i++) {
|
|
1302
1278
|
if (config.projects[i].slug === slug) {
|
|
@@ -1365,17 +1341,7 @@ var relay = createServer({
|
|
|
1365
1341
|
return { error: "Project not found" };
|
|
1366
1342
|
},
|
|
1367
1343
|
onGetProjectAccess: function (slug) {
|
|
1368
|
-
|
|
1369
|
-
if (config.projects[i].slug === slug) {
|
|
1370
|
-
return {
|
|
1371
|
-
slug: slug,
|
|
1372
|
-
visibility: config.projects[i].visibility || (config.osUsers ? "private" : "public"),
|
|
1373
|
-
allowedUsers: config.projects[i].allowedUsers || [],
|
|
1374
|
-
ownerId: config.projects[i].ownerId || null,
|
|
1375
|
-
};
|
|
1376
|
-
}
|
|
1377
|
-
}
|
|
1378
|
-
return { error: "Project not found" };
|
|
1344
|
+
return getProjectAccessRecord(config, slug);
|
|
1379
1345
|
},
|
|
1380
1346
|
onUserProvisioned: function (userId, linuxUser) {
|
|
1381
1347
|
// Grant ACL on all public projects to the newly provisioned user
|
|
@@ -1433,31 +1399,14 @@ if (staleCheckHandle && typeof staleCheckHandle.unref === "function") {
|
|
|
1433
1399
|
staleCheckHandle.unref();
|
|
1434
1400
|
}
|
|
1435
1401
|
|
|
1436
|
-
var IDLE_MS = Number(
|
|
1437
|
-
var REAP_MS = Number(
|
|
1438
|
-
var
|
|
1439
|
-
if (!relay || typeof relay.forEachProject !== "function") return;
|
|
1440
|
-
relay.forEachProject(function (ctx) {
|
|
1441
|
-
try {
|
|
1442
|
-
if (ctx && ctx.adapters && ctx.adapters.codex && typeof ctx.adapters.codex.shutdownIfIdle === "function") {
|
|
1443
|
-
var result = ctx.adapters.codex.shutdownIfIdle(IDLE_MS);
|
|
1444
|
-
if (result && typeof result.catch === "function") {
|
|
1445
|
-
result.catch(function (e) {
|
|
1446
|
-
console.error("[daemon] Codex idle reclaim failed:", e && e.message ? e.message : e);
|
|
1447
|
-
});
|
|
1448
|
-
}
|
|
1449
|
-
}
|
|
1450
|
-
} catch (e) {}
|
|
1451
|
-
});
|
|
1452
|
-
}, REAP_MS);
|
|
1453
|
-
if (reaperHandle && typeof reaperHandle.unref === "function") {
|
|
1454
|
-
reaperHandle.unref();
|
|
1455
|
-
}
|
|
1402
|
+
var IDLE_MS = Number(readConsoleEnv("CLAGENTIC_CONSOLE_IDLE_RUNTIME_MS")) || 5 * 60 * 1000;
|
|
1403
|
+
var REAP_MS = Number(readConsoleEnv("CLAGENTIC_CONSOLE_IDLE_REAPER_MS")) || 60 * 1000;
|
|
1404
|
+
var stopIdleReaper = startIdleAdapterReaper(function () { return relay; }, { idleMs: IDLE_MS, intervalMs: REAP_MS });
|
|
1456
1405
|
|
|
1457
1406
|
function stopCodexReaper() {
|
|
1458
|
-
if (
|
|
1459
|
-
|
|
1460
|
-
|
|
1407
|
+
if (stopIdleReaper) {
|
|
1408
|
+
stopIdleReaper();
|
|
1409
|
+
stopIdleReaper = null;
|
|
1461
1410
|
}
|
|
1462
1411
|
if (staleCheckHandle) {
|
|
1463
1412
|
clearInterval(staleCheckHandle);
|
|
@@ -1726,22 +1675,37 @@ var ipc = createIPCServer(socketPath(), function (msg) {
|
|
|
1726
1675
|
return { ok: true };
|
|
1727
1676
|
}
|
|
1728
1677
|
|
|
1678
|
+
// lr-553d27: this case used to silently clamp an out-of-range value to
|
|
1679
|
+
// the default and still report ok:true, diverging from the WS/web path
|
|
1680
|
+
// (onSetMemAvailableThreshold above), which lr-93e3c8 already fixed to
|
|
1681
|
+
// reject-and-report. This is the documented operator escape hatch used
|
|
1682
|
+
// when the UI can't save (see architecture.md "CLI <-> Daemon"), so a
|
|
1683
|
+
// lying ok:true here is worse than no escape hatch at all -- brought to
|
|
1684
|
+
// parity via the SAME validator both paths now share
|
|
1685
|
+
// (memory-setting-validate.js), instead of carrying a second,
|
|
1686
|
+
// independently-maintained copy of the range check.
|
|
1729
1687
|
case "set_mem_available_threshold": {
|
|
1730
|
-
var
|
|
1731
|
-
if (
|
|
1732
|
-
|
|
1688
|
+
var memResult = validateMemAvailableThresholdMB(msg.value);
|
|
1689
|
+
if (!memResult.ok) {
|
|
1690
|
+
console.warn("[daemon] MemAvailable threshold rejected: " + msg.value + " (" + memResult.error + ") (cli)");
|
|
1691
|
+
return { ok: false, error: memResult.error, memAvailableMinMB: config.memAvailableMinMB !== undefined ? config.memAvailableMinMB : DEFAULT_MEM_AVAILABLE_MIN_MB };
|
|
1692
|
+
}
|
|
1693
|
+
config.memAvailableMinMB = memResult.value;
|
|
1733
1694
|
saveConfig(config);
|
|
1734
|
-
console.log("[daemon] MemAvailable threshold:",
|
|
1735
|
-
return { ok: true, memAvailableMinMB:
|
|
1695
|
+
console.log("[daemon] MemAvailable threshold:", memResult.value, "MB (cli)");
|
|
1696
|
+
return { ok: true, memAvailableMinMB: memResult.value };
|
|
1736
1697
|
}
|
|
1737
1698
|
|
|
1738
1699
|
case "set_tokens_per_mb_headroom": {
|
|
1739
|
-
var
|
|
1740
|
-
if (
|
|
1741
|
-
|
|
1700
|
+
var tpmResult = validateTokensPerMbHeadroom(msg.value);
|
|
1701
|
+
if (!tpmResult.ok) {
|
|
1702
|
+
console.warn("[daemon] Tokens per MB headroom rejected: " + msg.value + " (" + tpmResult.error + ") (cli)");
|
|
1703
|
+
return { ok: false, error: tpmResult.error, tokensPerMbHeadroom: config.tokensPerMbHeadroom !== undefined ? config.tokensPerMbHeadroom : DEFAULT_TOKENS_PER_MB_HEADROOM };
|
|
1704
|
+
}
|
|
1705
|
+
config.tokensPerMbHeadroom = tpmResult.value;
|
|
1742
1706
|
saveConfig(config);
|
|
1743
|
-
console.log("[daemon] Tokens per MB headroom:",
|
|
1744
|
-
return { ok: true, tokensPerMbHeadroom:
|
|
1707
|
+
console.log("[daemon] Tokens per MB headroom:", tpmResult.value, "(cli)");
|
|
1708
|
+
return { ok: true, tokensPerMbHeadroom: tpmResult.value };
|
|
1745
1709
|
}
|
|
1746
1710
|
|
|
1747
1711
|
case "enable_recovery": {
|
|
@@ -1783,10 +1747,10 @@ var ipc = createIPCServer(socketPath(), function (msg) {
|
|
|
1783
1747
|
}
|
|
1784
1748
|
|
|
1785
1749
|
// Production: install to global npm, then shut down so the process manager
|
|
1786
|
-
// (systemd
|
|
1787
|
-
// This is the only reliable path — npx
|
|
1788
|
-
//
|
|
1789
|
-
// old global version on the next supervised restart.
|
|
1750
|
+
// (systemd, whose ExecStart is the global `clagentic-console daemon`) restarts
|
|
1751
|
+
// from the updated global install. This is the only reliable path — npx
|
|
1752
|
+
// installs to a cache location the unit does not consult, so npx-spawned
|
|
1753
|
+
// daemons get replaced by the old global version on the next supervised restart.
|
|
1790
1754
|
// Resolve + install asynchronously. ipc.js awaits a returned Promise, so
|
|
1791
1755
|
// returning an async IIFE here is safe without changing the outer handler.
|
|
1792
1756
|
return (async function () {
|
|
@@ -1824,9 +1788,9 @@ var ipc = createIPCServer(socketPath(), function (msg) {
|
|
|
1824
1788
|
stdio: ["ignore", "pipe", "pipe"],
|
|
1825
1789
|
timeout: 120000,
|
|
1826
1790
|
encoding: "utf8",
|
|
1827
|
-
//
|
|
1791
|
+
// CLAGENTIC_CONSOLE_SELF_UPDATE=1 tells postinstall.js not to restart the
|
|
1828
1792
|
// service — gracefulShutdown() below hands off to systemd Restart=always.
|
|
1829
|
-
env: Object.assign({}, process.env, {
|
|
1793
|
+
env: Object.assign({}, process.env, { CLAGENTIC_CONSOLE_SELF_UPDATE: "1" }),
|
|
1830
1794
|
});
|
|
1831
1795
|
console.log("[daemon] Global install complete. Shutting down for supervised restart.");
|
|
1832
1796
|
updOk = true;
|
|
@@ -1886,8 +1850,20 @@ function startListening() {
|
|
|
1886
1850
|
gracefulShutdown: gracefulShutdown,
|
|
1887
1851
|
getActiveCount: getActiveLiveCount,
|
|
1888
1852
|
drainTimeoutMs: drainTimeoutMs,
|
|
1853
|
+
onPressureChange: function (underPressure, detail) {
|
|
1854
|
+
relay.broadcastAll({
|
|
1855
|
+
type: "diagnostic",
|
|
1856
|
+
severity: underPressure ? "warning" : "info",
|
|
1857
|
+
source: "memory-pressure",
|
|
1858
|
+
message: underPressure
|
|
1859
|
+
? "Clagentic: Console is over its memory soft limit. New sessions and agent work are paused; existing sessions keep running."
|
|
1860
|
+
: "Clagentic: Console memory is back under the soft limit. New sessions and agent work are accepted again.",
|
|
1861
|
+
detail: detail && detail.currentBytes ? "memory.current " + detail.currentBytes + " bytes" : undefined,
|
|
1862
|
+
});
|
|
1863
|
+
},
|
|
1889
1864
|
});
|
|
1890
1865
|
_drain.registerSignals();
|
|
1866
|
+
setNewWorkGate(_drain.isRefusingNewWork);
|
|
1891
1867
|
// Expose the drain controller on the relay so server.js can gate new connections.
|
|
1892
1868
|
relay.setDrain(_drain);
|
|
1893
1869
|
|
|
@@ -1895,11 +1871,13 @@ function startListening() {
|
|
|
1895
1871
|
// Detects soft memory ceiling crossings and emits structured log events;
|
|
1896
1872
|
// onCrossing runs an in-process shedding pass (lr-5e70) FIRST — an
|
|
1897
1873
|
// immediate attempt to reduce RSS via retrim/evict/cache-drop — then
|
|
1898
|
-
// notifies the drain controller (lr-6b30), which
|
|
1899
|
-
//
|
|
1900
|
-
//
|
|
1901
|
-
//
|
|
1902
|
-
//
|
|
1874
|
+
// notifies the drain controller (lr-6b30), which starts refusing new
|
|
1875
|
+
// sessions and agent work until onRecovery reports usage back under the
|
|
1876
|
+
// limit. Pressure never exits the daemon: the memory belongs to session
|
|
1877
|
+
// child processes a restart would only kill. Shedding and pressure are
|
|
1878
|
+
// deliberately independent responses to the same signal: a shedding pass
|
|
1879
|
+
// that fails or is rate-limited must never block pressure from entering,
|
|
1880
|
+
// and pressure entering must never skip a shedding attempt.
|
|
1903
1881
|
if (process.platform === "linux") {
|
|
1904
1882
|
_memoryWatcher = startMemoryHighWatcher(config, {
|
|
1905
1883
|
onCrossing: function (detail) {
|
|
@@ -1919,6 +1897,9 @@ function startListening() {
|
|
|
1919
1897
|
}
|
|
1920
1898
|
_drain.onMemoryHighCrossing(detail);
|
|
1921
1899
|
},
|
|
1900
|
+
onRecovery: function (detail) {
|
|
1901
|
+
_drain.onMemoryHighRecovery(detail);
|
|
1902
|
+
},
|
|
1922
1903
|
});
|
|
1923
1904
|
|
|
1924
1905
|
// Startup sanity check (lr-c10f6d): verify the applied cgroup memory.max
|
|
@@ -1949,12 +1930,70 @@ function startListening() {
|
|
|
1949
1930
|
}
|
|
1950
1931
|
}
|
|
1951
1932
|
|
|
1933
|
+
// --- lr-e85fec: build-adoption diagnostic ---
|
|
1934
|
+
// Polls whether the on-disk build (lib/build-sha.json, rewritten by every
|
|
1935
|
+
// `npm install -g`) has moved past what THIS process loaded at startup
|
|
1936
|
+
// (loadedBuildSha, captured once above and never re-read). lr-22e8's
|
|
1937
|
+
// stale-inode/journald warning already surfaces this on the log, but
|
|
1938
|
+
// nothing acted on it (see lr-e85fec's task description — the same
|
|
1939
|
+
// warning fired 403 times before anyone noticed). This turns the
|
|
1940
|
+
// detector into an OFFERED, operator-initiated affordance instead of a
|
|
1941
|
+
// passive log line: a diagnostic with an actionable "restart to apply"
|
|
1942
|
+
// button the operator can act on when THEY choose, never an automatic
|
|
1943
|
+
// restart (see onRestartForBuildUpdate below — restart only ever fires
|
|
1944
|
+
// in direct response to that click).
|
|
1945
|
+
//
|
|
1946
|
+
// Only fires once per detected staleness (edge-triggered on
|
|
1947
|
+
// _buildUpdateAnnounced), not on every poll — a 5-minute interval would
|
|
1948
|
+
// otherwise re-toast the same condition indefinitely until the operator
|
|
1949
|
+
// actually restarts.
|
|
1950
|
+
var _buildUpdateAnnounced = false;
|
|
1951
|
+
var BUILD_UPDATE_POLL_MS = 5 * 60 * 1000;
|
|
1952
|
+
var _buildShaPath = path.join(__dirname, "build-sha.json");
|
|
1953
|
+
function _pollBuildUpdate() {
|
|
1954
|
+
try {
|
|
1955
|
+
var installedSha = readInstalledBuildSha(_buildShaPath);
|
|
1956
|
+
var result = checkForNewerInstalledBuild({
|
|
1957
|
+
loadedBuildSha: loadedBuildSha,
|
|
1958
|
+
installedBuildSha: installedSha,
|
|
1959
|
+
});
|
|
1960
|
+
if (result.stale && !_buildUpdateAnnounced) {
|
|
1961
|
+
_buildUpdateAnnounced = true;
|
|
1962
|
+
console.log("[daemon] Newer build installed on disk (" + result.installedBuildSha +
|
|
1963
|
+
") than this process loaded (" + result.loadedBuildSha + ") — offering restart in UI.");
|
|
1964
|
+
relay.broadcastAll({
|
|
1965
|
+
type: "diagnostic",
|
|
1966
|
+
severity: "warning",
|
|
1967
|
+
source: "build-update",
|
|
1968
|
+
message: "A newer build has been installed but is not yet running. Restart to apply it.",
|
|
1969
|
+
actionable: { label: "Restart to apply update", action: "restart_for_build_update" },
|
|
1970
|
+
});
|
|
1971
|
+
} else if (!result.stale) {
|
|
1972
|
+
// Covers the (rare) case of a manual downgrade/rollback reinstalling
|
|
1973
|
+
// the same SHA this process already has — re-arm so a subsequent
|
|
1974
|
+
// genuine update is announced again rather than staying suppressed
|
|
1975
|
+
// forever from one earlier announcement.
|
|
1976
|
+
_buildUpdateAnnounced = false;
|
|
1977
|
+
}
|
|
1978
|
+
} catch (e) {
|
|
1979
|
+
// A detection failure must never crash the daemon — this is a
|
|
1980
|
+
// best-effort UI nudge, not a load-bearing control path.
|
|
1981
|
+
console.error("[daemon] Build-update check failed (non-fatal):", e && e.message ? e.message : e);
|
|
1982
|
+
}
|
|
1983
|
+
}
|
|
1984
|
+
var _buildUpdateTimer = setInterval(_pollBuildUpdate, BUILD_UPDATE_POLL_MS);
|
|
1985
|
+
if (_buildUpdateTimer && typeof _buildUpdateTimer.unref === "function") _buildUpdateTimer.unref();
|
|
1986
|
+
// Run once shortly after startup too — otherwise an install that lands
|
|
1987
|
+
// moments after this process started would sit undetected for a full
|
|
1988
|
+
// poll interval before the operator sees anything.
|
|
1989
|
+
setTimeout(_pollBuildUpdate, 10000);
|
|
1990
|
+
|
|
1952
1991
|
// Auto-provision Linux accounts on startup if OS users mode is enabled.
|
|
1953
1992
|
// ACLs are NOT re-applied on every startup (too slow with recursive setfacl).
|
|
1954
1993
|
// ACLs are set when: projects are added, users are added, or visibility changes.
|
|
1955
1994
|
if (config.osUsers) {
|
|
1956
1995
|
setTimeout(function () {
|
|
1957
|
-
try { ensureProjectsDir(); } catch (e) {}
|
|
1996
|
+
try { ensureProjectsDir(resolveProjectsDir({ config: config, realHome: REAL_HOME }).dir); } catch (e) {}
|
|
1958
1997
|
try {
|
|
1959
1998
|
var provResult = provisionAllUsers(usersModule);
|
|
1960
1999
|
if (provResult.provisioned.length > 0) {
|
|
@@ -2016,7 +2055,12 @@ relay.server.on("error", function (err) {
|
|
|
2016
2055
|
process.exit(1);
|
|
2017
2056
|
});
|
|
2018
2057
|
|
|
2019
|
-
|
|
2058
|
+
// Every prompt is parsed and keyed by modules the registry imports, so no
|
|
2059
|
+
// client is served until they are in; a daemon that cannot load them stops.
|
|
2060
|
+
promptRegistry.ready().then(startListening, function (err) {
|
|
2061
|
+
console.error("[daemon] " + (err && err.message ? err.message : err));
|
|
2062
|
+
process.exit(1);
|
|
2063
|
+
});
|
|
2020
2064
|
|
|
2021
2065
|
// --- HTTP onboarding server (only when TLS is active) ---
|
|
2022
2066
|
if (relay.onboardingServer) {
|
|
@@ -2065,8 +2109,8 @@ function spawnAndRestart() {
|
|
|
2065
2109
|
windowsHide: true,
|
|
2066
2110
|
stdio: ["ignore", logFd, logFd],
|
|
2067
2111
|
env: Object.assign({}, process.env, {
|
|
2068
|
-
|
|
2069
|
-
|
|
2112
|
+
CLAGENTIC_CONSOLE_CONFIG: restartConfigPath(),
|
|
2113
|
+
CLAGENTIC_CONSOLE_HOME: restartClagenticHome,
|
|
2070
2114
|
}),
|
|
2071
2115
|
});
|
|
2072
2116
|
child.unref();
|