@tpsdev-ai/flair 0.45.0 → 0.46.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/config.yaml +35 -2
- package/dist/cli.js +369 -6
- package/dist/doctor-client.js +266 -0
- package/dist/federation/scheduler.js +114 -9
- package/dist/hook-install.js +150 -1
- package/dist/lib/mcp-enable.js +59 -19
- package/dist/lib/scheduler-platform.js +210 -1
- package/dist/rem/scheduler.js +113 -13
- package/dist/resources/MemoryMaintenance.js +8 -2
- package/dist/resources/mcp-oauth-flag.js +20 -0
- package/dist/resources/mcp-oauth.js +6 -1
- package/dist/src/lib/scheduler-platform.js +210 -1
- package/dist/src/rem/scheduler.js +113 -13
- package/docs/notes/mcp-oauth-model2.md +10 -3
- package/package.json +1 -1
- package/templates/bin/flair-federation-sync.sh.tmpl +8 -1
- package/templates/bin/flair-rem-nightly.sh.tmpl +8 -1
|
@@ -13,9 +13,15 @@
|
|
|
13
13
|
*
|
|
14
14
|
* `interpretActiveResult()` in particular encodes a production lesson
|
|
15
15
|
* (flair#850) that took a real outage to learn. It must not be re-derived.
|
|
16
|
+
* flair#1231 extended it one layer deeper: a load command exiting 0 proves the
|
|
17
|
+
* service manager ACCEPTED the job, not that the job can RUN — two fleet
|
|
18
|
+
* incidents (a stripped exec bit, a missing log directory) both passed the
|
|
19
|
+
* load check and died on the first real run, invisibly. The rule now encoded
|
|
20
|
+
* in `verifyFirstRun()`: success may not be claimed until the thing the
|
|
21
|
+
* operator asked for has been observed to happen once.
|
|
16
22
|
*/
|
|
17
23
|
import { existsSync, mkdirSync, writeFileSync, readFileSync } from "node:fs";
|
|
18
|
-
import { resolve, dirname } from "node:path";
|
|
24
|
+
import { resolve, dirname, isAbsolute } from "node:path";
|
|
19
25
|
import { platform } from "node:os";
|
|
20
26
|
import { spawnSync } from "node:child_process";
|
|
21
27
|
/**
|
|
@@ -126,3 +132,206 @@ export function writeFileWithDir(path, contents, mode = 0o600) {
|
|
|
126
132
|
mkdirSync(dir, { recursive: true, mode: 0o700 });
|
|
127
133
|
writeFileSync(path, contents, { mode });
|
|
128
134
|
}
|
|
135
|
+
// ─── node binary resolution (flair#1231) ────────────────────────────────────
|
|
136
|
+
/**
|
|
137
|
+
* Resolves the ABSOLUTE path to the node binary at enable time, so the shim
|
|
138
|
+
* can `exec "<node>" "<script>"` with ZERO PATH lookups at run time.
|
|
139
|
+
*
|
|
140
|
+
* Why this exists: the shims switched from `exec "{{FLAIR_BIN}}"` (which
|
|
141
|
+
* required an exec bit that tarball extraction strips — the #1231 regression)
|
|
142
|
+
* to running the CLI under node, which needs read permission only. But a bare
|
|
143
|
+
* `exec node …` would introduce a run-time PATH lookup the old absolute-path
|
|
144
|
+
* form never had: whatever PATH the service manager's environment carries
|
|
145
|
+
* would pick the `node` that runs with the operator's credentials. So the
|
|
146
|
+
* node path is resolved HERE, once, from the enabling process's own
|
|
147
|
+
* environment, and baked into the shim — symmetric with how FLAIR_BIN is
|
|
148
|
+
* already handled.
|
|
149
|
+
*
|
|
150
|
+
* Resolution order:
|
|
151
|
+
* 1. `explicit` — caller/test override.
|
|
152
|
+
* 2. `process.execPath` when the enabling runtime IS node (the published
|
|
153
|
+
* CLI's case): absolute, known-good, already trusted to run this code.
|
|
154
|
+
* 3. `command -v node` in the enabling shell environment (dev/test under
|
|
155
|
+
* bun): the one deliberate PATH consultation, made at enable time by the
|
|
156
|
+
* operator's own session, never later by the service manager.
|
|
157
|
+
* Nothing resolvable ⇒ throw — enable must fail loudly rather than bake a
|
|
158
|
+
* run-time lookup into the shim.
|
|
159
|
+
*/
|
|
160
|
+
export function resolveNodeBin(explicit) {
|
|
161
|
+
if (explicit)
|
|
162
|
+
return explicit;
|
|
163
|
+
if (!process.versions.bun && process.execPath && isAbsolute(process.execPath)) {
|
|
164
|
+
return process.execPath;
|
|
165
|
+
}
|
|
166
|
+
const r = spawnReport(["/bin/sh", "-c", "command -v node"], STATUS_CHECK_TIMEOUT_MS);
|
|
167
|
+
const found = r.stdout.trim().split("\n")[0]?.trim() ?? "";
|
|
168
|
+
if (r.code === 0 && found && isAbsolute(found) && existsSync(found))
|
|
169
|
+
return found;
|
|
170
|
+
throw new Error("unable to resolve an absolute path to a node binary (not running under node, and `command -v node` " +
|
|
171
|
+
"found nothing). The scheduler shim runs `<node> <flair-script>` with the node path baked in at " +
|
|
172
|
+
"enable time — refusing to install a shim that would resolve `node` from the service manager's PATH " +
|
|
173
|
+
"at run time. Install node (or put it on PATH for this shell) and re-run enable.");
|
|
174
|
+
}
|
|
175
|
+
// ─── first-run verification (flair#1231) ────────────────────────────────────
|
|
176
|
+
// A load/bootstrap command exiting 0 proves the service manager accepted the
|
|
177
|
+
// job — not that the job can run. The only vantage that exercises the real
|
|
178
|
+
// failure modes (launchd spawn error 209 from a missing log dir, exit 126
|
|
179
|
+
// from a stripped exec bit) is the service manager itself, so the first run
|
|
180
|
+
// is triggered and observed THROUGH it, never via a bare spawn of the shim.
|
|
181
|
+
/** Poll cadence for darwin `launchctl print` first-run polling. */
|
|
182
|
+
export const FIRST_RUN_POLL_INTERVAL_MS = 150;
|
|
183
|
+
/** Total budget for first-run verification on both platforms. */
|
|
184
|
+
export const FIRST_RUN_BUDGET_MS = 12_000;
|
|
185
|
+
/** Synchronous sleep without spawning anything. */
|
|
186
|
+
function sleepSync(ms) {
|
|
187
|
+
Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
|
|
188
|
+
}
|
|
189
|
+
/**
|
|
190
|
+
* Parses `launchctl print <domain>/<label>` for run state. `last exit code`
|
|
191
|
+
* is absent (or "(never exited)") until a run has completed, and `pid =` /
|
|
192
|
+
* `state = running` are present only while one is in flight.
|
|
193
|
+
*/
|
|
194
|
+
export function parseLaunchdPrintExit(output) {
|
|
195
|
+
const running = /^\s*state\s*=\s*(?:running|spawn)/m.test(output) || /^\s*pid\s*=\s*\d+/m.test(output);
|
|
196
|
+
const m = /last exit (?:code|status)\s*=\s*(-?\d+)/.exec(output);
|
|
197
|
+
return { running, lastExitCode: m ? Number(m[1]) : null };
|
|
198
|
+
}
|
|
199
|
+
/** Parses `systemctl --user show <unit> --property=ExecMainStatus,Result`. */
|
|
200
|
+
export function parseSystemdShowExit(output) {
|
|
201
|
+
const m = /^ExecMainStatus=(-?\d+)\s*$/m.exec(output);
|
|
202
|
+
const r = /^Result=(\S+)\s*$/m.exec(output);
|
|
203
|
+
return { execMainStatus: m ? Number(m[1]) : null, result: r ? r[1] : null };
|
|
204
|
+
}
|
|
205
|
+
/** Reads the last lines of a log file for failure diagnostics. Never throws. */
|
|
206
|
+
export function readLogTail(path, maxLines = 12, maxChars = 1500) {
|
|
207
|
+
let text;
|
|
208
|
+
try {
|
|
209
|
+
text = readFileSync(path, "utf-8");
|
|
210
|
+
}
|
|
211
|
+
catch {
|
|
212
|
+
return { exists: false, empty: false, tail: "" };
|
|
213
|
+
}
|
|
214
|
+
const trimmed = text.trimEnd();
|
|
215
|
+
if (!trimmed)
|
|
216
|
+
return { exists: true, empty: true, tail: "" };
|
|
217
|
+
let tail = trimmed.split("\n").slice(-maxLines).join("\n");
|
|
218
|
+
if (tail.length > maxChars)
|
|
219
|
+
tail = tail.slice(-maxChars);
|
|
220
|
+
return { exists: true, empty: false, tail };
|
|
221
|
+
}
|
|
222
|
+
/**
|
|
223
|
+
* Names the failure class for a recorded exit status, so the report can lead
|
|
224
|
+
* with actor+state instead of a bare number.
|
|
225
|
+
*/
|
|
226
|
+
export function describeExitCode(code) {
|
|
227
|
+
if (code === null)
|
|
228
|
+
return "no exit status recorded";
|
|
229
|
+
if (code === 126)
|
|
230
|
+
return "exit 126 — found but not runnable (permission denied / exec format)";
|
|
231
|
+
if (code === 127)
|
|
232
|
+
return "exit 127 — command not found";
|
|
233
|
+
if (code === 209)
|
|
234
|
+
return "exit 209 — launchd could not spawn the job (a missing/unwritable log directory produces this)";
|
|
235
|
+
return `exit ${code}`;
|
|
236
|
+
}
|
|
237
|
+
function spawnedNothing(r) {
|
|
238
|
+
return r.code === null && !r.stdout.trim() && !r.stderr.trim();
|
|
239
|
+
}
|
|
240
|
+
/**
|
|
241
|
+
* Triggers the job's first run through the service manager and reads back how
|
|
242
|
+
* it ended (flair#1231). Call ONLY after the load/bootstrap command exited 0 —
|
|
243
|
+
* a load failure is its own failure mode with its own remedy, and layering a
|
|
244
|
+
* kickstart on top of it would blur which actor failed.
|
|
245
|
+
*
|
|
246
|
+
* darwin: `launchctl kickstart -k` returns immediately (it does NOT block for
|
|
247
|
+
* exit), so the recorded exit status is POLLED out of `launchctl print` until
|
|
248
|
+
* a completed run is visible or the budget lapses. linux: `systemctl --user
|
|
249
|
+
* start` on a oneshot blocks until the run exits, so a single
|
|
250
|
+
* `systemctl --user show` read afterwards suffices.
|
|
251
|
+
*
|
|
252
|
+
* "Can't tell" is its own state: a missing/unreachable service manager yields
|
|
253
|
+
* outcome "manager-unavailable", distinct from "run-failed" — the remedy
|
|
254
|
+
* points at the service manager, not at the job.
|
|
255
|
+
*/
|
|
256
|
+
export function verifyFirstRun(opts) {
|
|
257
|
+
const run = opts.hooks?.run ?? ((cmd, timeoutMs) => spawnReport(cmd, timeoutMs));
|
|
258
|
+
const sleep = opts.hooks?.sleep ?? sleepSync;
|
|
259
|
+
const now = opts.hooks?.now ?? Date.now;
|
|
260
|
+
const pollIntervalMs = opts.pollIntervalMs ?? FIRST_RUN_POLL_INTERVAL_MS;
|
|
261
|
+
const budgetMs = opts.budgetMs ?? FIRST_RUN_BUDGET_MS;
|
|
262
|
+
const finish = (outcome, exitCode, detail) => {
|
|
263
|
+
const log = outcome === "success"
|
|
264
|
+
? { exists: false, empty: false, tail: "" } // no diagnostics needed on success
|
|
265
|
+
: readLogTail(opts.stderrLogPath);
|
|
266
|
+
return {
|
|
267
|
+
verified: outcome === "success",
|
|
268
|
+
outcome,
|
|
269
|
+
exitCode,
|
|
270
|
+
detail,
|
|
271
|
+
logPath: opts.stderrLogPath,
|
|
272
|
+
stderrTail: log.tail,
|
|
273
|
+
logEmpty: log.exists && log.empty,
|
|
274
|
+
budgetMs,
|
|
275
|
+
};
|
|
276
|
+
};
|
|
277
|
+
if (opts.plat === "darwin") {
|
|
278
|
+
const target = opts.darwinTarget;
|
|
279
|
+
if (!target)
|
|
280
|
+
throw new Error("verifyFirstRun: darwinTarget is required on darwin");
|
|
281
|
+
const kickCmd = ["launchctl", "kickstart", "-k", target];
|
|
282
|
+
const kick = run(kickCmd, SPAWN_TIMEOUT_MS);
|
|
283
|
+
if (spawnedNothing(kick)) {
|
|
284
|
+
return finish("manager-unavailable", null, `launchctl could not be run (${kickCmd.join(" ")})`);
|
|
285
|
+
}
|
|
286
|
+
if (kick.code !== 0) {
|
|
287
|
+
return finish("start-failed", null, `${kickCmd.join(" ")} → code ${kick.code}${kick.stderr.trim() ? `: ${kick.stderr.trim()}` : ""}`);
|
|
288
|
+
}
|
|
289
|
+
const deadline = now() + budgetMs;
|
|
290
|
+
// Poll: kickstart returned immediately, so watch `launchctl print` until a
|
|
291
|
+
// COMPLETED run (not running + a recorded exit code) is visible.
|
|
292
|
+
for (;;) {
|
|
293
|
+
const printCmd = ["launchctl", "print", target];
|
|
294
|
+
const r = run(printCmd, STATUS_CHECK_TIMEOUT_MS);
|
|
295
|
+
if (spawnedNothing(r)) {
|
|
296
|
+
return finish("manager-unavailable", null, `launchctl could not be run (${printCmd.join(" ")})`);
|
|
297
|
+
}
|
|
298
|
+
if (r.code === 0) {
|
|
299
|
+
const { running, lastExitCode } = parseLaunchdPrintExit(r.stdout);
|
|
300
|
+
if (!running && lastExitCode !== null) {
|
|
301
|
+
return lastExitCode === 0
|
|
302
|
+
? finish("success", 0, `${printCmd.join(" ")} → last exit code = 0`)
|
|
303
|
+
: finish("run-failed", lastExitCode, `${printCmd.join(" ")} → last exit code = ${lastExitCode}`);
|
|
304
|
+
}
|
|
305
|
+
}
|
|
306
|
+
if (now() >= deadline) {
|
|
307
|
+
return finish("timeout", null, `no completed run visible in ${printCmd.join(" ")} within ${Math.round(budgetMs / 1000)}s`);
|
|
308
|
+
}
|
|
309
|
+
sleep(pollIntervalMs);
|
|
310
|
+
}
|
|
311
|
+
}
|
|
312
|
+
// linux
|
|
313
|
+
const unit = opts.linuxServiceUnit;
|
|
314
|
+
if (!unit)
|
|
315
|
+
throw new Error("verifyFirstRun: linuxServiceUnit is required on linux");
|
|
316
|
+
const startCmd = ["systemctl", "--user", "start", unit];
|
|
317
|
+
const start = run(startCmd, budgetMs);
|
|
318
|
+
if (spawnedNothing(start)) {
|
|
319
|
+
return finish("manager-unavailable", null, `systemctl could not be run (${startCmd.join(" ")})`);
|
|
320
|
+
}
|
|
321
|
+
if (/failed to connect to bus/i.test(start.stderr)) {
|
|
322
|
+
return finish("manager-unavailable", null, `${startCmd.join(" ")} → ${start.stderr.trim()}`);
|
|
323
|
+
}
|
|
324
|
+
if (start.code === null) {
|
|
325
|
+
return finish("timeout", null, `${startCmd.join(" ")} did not return within ${Math.round(budgetMs / 1000)}s`);
|
|
326
|
+
}
|
|
327
|
+
const showCmd = ["systemctl", "--user", "show", unit, "--property=ExecMainStatus,Result"];
|
|
328
|
+
const show = run(showCmd, STATUS_CHECK_TIMEOUT_MS);
|
|
329
|
+
const parsed = parseSystemdShowExit(show.stdout);
|
|
330
|
+
if (start.code === 0) {
|
|
331
|
+
// A blocking start of a oneshot exits 0 only when the run succeeded; the
|
|
332
|
+
// show read supplies the recorded status for the report.
|
|
333
|
+
return finish("success", parsed.execMainStatus ?? 0, `${startCmd.join(" ")} → ok`);
|
|
334
|
+
}
|
|
335
|
+
const resultTxt = parsed.result ? `, Result=${parsed.result}` : "";
|
|
336
|
+
return finish("run-failed", parsed.execMainStatus, `${startCmd.join(" ")} → code ${start.code}${resultTxt}${start.stderr.trim() ? `: ${start.stderr.trim()}` : ""}`);
|
|
337
|
+
}
|
|
@@ -13,13 +13,13 @@
|
|
|
13
13
|
* No daemon code lives here — the scheduler invokes the shim, the shim
|
|
14
14
|
* invokes `flair rem nightly run-once`, the runner module does the work.
|
|
15
15
|
*/
|
|
16
|
-
import { existsSync, chmodSync, rmSync } from "node:fs";
|
|
16
|
+
import { existsSync, mkdirSync, chmodSync, rmSync } from "node:fs";
|
|
17
17
|
import { resolve, dirname } from "node:path";
|
|
18
18
|
import { homedir } from "node:os";
|
|
19
19
|
import { spawn } from "node:child_process";
|
|
20
20
|
import { fileURLToPath } from "node:url";
|
|
21
21
|
import { escapeXml } from "../lib/xml-escape.js";
|
|
22
|
-
import { detectPlatform as detectPlatformFor, spawnReport, readTemplate as readTemplateFrom, renderTemplateWith, writeFileWithDir, interpretActiveResult, describeLoadFailure as describeLoadFailureFor, STATUS_CHECK_TIMEOUT_MS, } from "../lib/scheduler-platform.js";
|
|
22
|
+
import { detectPlatform as detectPlatformFor, spawnReport, readTemplate as readTemplateFrom, renderTemplateWith, writeFileWithDir, interpretActiveResult, describeLoadFailure as describeLoadFailureFor, describeExitCode, resolveNodeBin, verifyFirstRun, STATUS_CHECK_TIMEOUT_MS, } from "../lib/scheduler-platform.js";
|
|
23
23
|
// Re-exported so this module's public surface is unchanged by the extraction
|
|
24
24
|
// into src/lib/scheduler-platform.ts (a second scheduler — `flair federation
|
|
25
25
|
// sync enable` — needs the identical launchctl/systemctl interpretation, and
|
|
@@ -87,15 +87,16 @@ function validateSchedule(hour, minute) {
|
|
|
87
87
|
throw new Error(`minute must be an integer 0-59, got ${minute}`);
|
|
88
88
|
}
|
|
89
89
|
}
|
|
90
|
-
function buildSubstitutions(opts, shimPath, flairBin) {
|
|
90
|
+
function buildSubstitutions(opts, shimPath, flairBin, nodeBin) {
|
|
91
91
|
validateSchedule(opts.hour, opts.minute);
|
|
92
92
|
if (!/^[a-zA-Z0-9_-]+$/.test(opts.agentId)) {
|
|
93
93
|
throw new Error(`invalid agent id: ${opts.agentId}`);
|
|
94
94
|
}
|
|
95
95
|
return {
|
|
96
96
|
FLAIR_BIN: flairBin,
|
|
97
|
+
NODE_BIN: nodeBin,
|
|
97
98
|
SHIM_PATH: shimPath,
|
|
98
|
-
HOME: homedir(),
|
|
99
|
+
HOME: opts.homeOverride ?? homedir(),
|
|
99
100
|
AGENT_ID: opts.agentId,
|
|
100
101
|
FLAIR_URL: opts.flairUrl,
|
|
101
102
|
HOUR: String(opts.hour),
|
|
@@ -183,10 +184,14 @@ export function describeLoadFailure(plat, loadResult) {
|
|
|
183
184
|
* succeeded) is unit-testable without spawning a real launchctl/systemctl or
|
|
184
185
|
* parsing CLI argv.
|
|
185
186
|
*
|
|
186
|
-
*
|
|
187
|
-
*
|
|
188
|
-
*
|
|
189
|
-
*
|
|
187
|
+
* flair#1231 deepened the #850 rule by one layer: activation exiting 0 proves
|
|
188
|
+
* the service manager ACCEPTED the job, not that the job can run — a stripped
|
|
189
|
+
* exec bit and a missing log directory both passed activation and killed the
|
|
190
|
+
* first real run invisibly. So the ✅ headline is now additionally gated on
|
|
191
|
+
* `firstRunVerified`: success may not be claimed until the thing the operator
|
|
192
|
+
* asked for — a REM run through the service manager — has been observed to
|
|
193
|
+
* happen once. A missing `loadResult`/`firstRun` (test-only skipLoad shape)
|
|
194
|
+
* therefore withholds the headline too, instead of being treated as success.
|
|
190
195
|
*/
|
|
191
196
|
export function formatEnableReport(r, input) {
|
|
192
197
|
const { hour, minute, agentId, flairUrl } = input;
|
|
@@ -212,6 +217,57 @@ export function formatEnableReport(r, input) {
|
|
|
212
217
|
lines.push(` Nothing is scheduled until activation succeeds. Check anytime with: flair rem nightly status`);
|
|
213
218
|
return { lines, ok: false };
|
|
214
219
|
}
|
|
220
|
+
if (!r.firstRunVerified) {
|
|
221
|
+
const fr = r.firstRun;
|
|
222
|
+
const headline = fr?.outcome === "run-failed"
|
|
223
|
+
? `⚠️ REM nightly scheduler installed but the first run FAILED (${describeExitCode(fr.exitCode)})`
|
|
224
|
+
: fr?.outcome === "timeout"
|
|
225
|
+
? `⚠️ REM nightly scheduler installed but the first run did not complete within ${Math.round(fr.budgetMs / 1000)}s — cannot confirm it works`
|
|
226
|
+
: fr?.outcome === "manager-unavailable"
|
|
227
|
+
? `⚠️ REM nightly scheduler installed but the service manager is unreachable — cannot verify the first run`
|
|
228
|
+
: fr?.outcome === "start-failed"
|
|
229
|
+
? `⚠️ REM nightly scheduler installed but the first run could not be started`
|
|
230
|
+
: `⚠️ REM nightly scheduler installed but the first run was never verified`;
|
|
231
|
+
const lines = [
|
|
232
|
+
headline,
|
|
233
|
+
` Schedule: ${scheduleTime} local time`,
|
|
234
|
+
` Scheduler: ${r.schedulerPath}`,
|
|
235
|
+
` Shim: ${r.shimPath}`,
|
|
236
|
+
` Agent: ${agentId}`,
|
|
237
|
+
` Flair URL: ${flairUrl}`,
|
|
238
|
+
];
|
|
239
|
+
if (r.loadResult)
|
|
240
|
+
lines.push(` Load: ${r.loadCommand.join(" ")} → ok`);
|
|
241
|
+
if (fr) {
|
|
242
|
+
lines.push(` First run: ${fr.detail}`);
|
|
243
|
+
if (fr.stderrTail) {
|
|
244
|
+
lines.push(` Log tail (${fr.logPath}):`);
|
|
245
|
+
for (const l of fr.stderrTail.split("\n"))
|
|
246
|
+
lines.push(` ${l}`);
|
|
247
|
+
}
|
|
248
|
+
else if (fr.logEmpty) {
|
|
249
|
+
lines.push(` Log file ${fr.logPath} exists but is EMPTY — the run died before writing anything.`);
|
|
250
|
+
}
|
|
251
|
+
else {
|
|
252
|
+
lines.push(` No log file at ${fr.logPath}.`);
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
lines.push("");
|
|
256
|
+
if (fr?.outcome === "timeout") {
|
|
257
|
+
lines.push(` The run may legitimately still be going (a REM cycle can be slow). Check the log above and`);
|
|
258
|
+
lines.push(` \`flair rem nightly status\`; no cycle has been CONFIRMED to work yet.`);
|
|
259
|
+
}
|
|
260
|
+
else if (fr?.outcome === "manager-unavailable") {
|
|
261
|
+
lines.push(` The scheduler files are installed, but launchctl/systemctl could not be consulted, so whether`);
|
|
262
|
+
lines.push(` the nightly cycle runs is UNKNOWN. Fix the service manager for this session, then re-run \`flair rem nightly enable\`.`);
|
|
263
|
+
}
|
|
264
|
+
else {
|
|
265
|
+
lines.push(` No REM cycle has run. Fix the cause above, then re-run \`flair rem nightly enable\`.`);
|
|
266
|
+
}
|
|
267
|
+
lines.push("");
|
|
268
|
+
lines.push(` Check anytime with: flair rem nightly status`);
|
|
269
|
+
return { lines, ok: false };
|
|
270
|
+
}
|
|
215
271
|
const lines = [
|
|
216
272
|
`✅ REM nightly scheduler enabled (${r.platform})`,
|
|
217
273
|
` Schedule: ${scheduleTime} local time`,
|
|
@@ -223,9 +279,9 @@ export function formatEnableReport(r, input) {
|
|
|
223
279
|
if (r.loadResult) {
|
|
224
280
|
lines.push(` Load: ${r.loadCommand.join(" ")} → ok`);
|
|
225
281
|
}
|
|
282
|
+
lines.push(` First run: completed through the service manager, exit 0`);
|
|
226
283
|
lines.push("");
|
|
227
|
-
lines.push(`
|
|
228
|
-
lines.push(` before the first scheduled fire. Disable with \`flair rem nightly disable\`.`);
|
|
284
|
+
lines.push(`Disable with \`flair rem nightly disable\`.`);
|
|
229
285
|
return { lines, ok: true };
|
|
230
286
|
}
|
|
231
287
|
/**
|
|
@@ -268,9 +324,29 @@ export function formatStatusReport(s) {
|
|
|
268
324
|
export function enableScheduler(opts) {
|
|
269
325
|
const plat = detectPlatform(opts.platformOverride);
|
|
270
326
|
const flairBin = opts.flairBin ?? process.argv[1] ?? "flair";
|
|
327
|
+
const nodeBin = resolveNodeBin(opts.nodeBin);
|
|
271
328
|
const shimPath = opts.shimPathOverride ?? SHIM_PATH_DEFAULT;
|
|
272
329
|
const templateRoot = opts.templateRootOverride ?? defaultTemplateRoot();
|
|
273
|
-
const subs = buildSubstitutions(opts, shimPath, flairBin);
|
|
330
|
+
const subs = buildSubstitutions(opts, shimPath, flairBin, nodeBin);
|
|
331
|
+
// 0. Create the log directory the unit files point stdout/stderr at.
|
|
332
|
+
// Nothing else ever creates it — launchd kills a job whose StandardOutPath
|
|
333
|
+
// directory is missing (spawn error 209) and systemd fails the unit (#1231).
|
|
334
|
+
//
|
|
335
|
+
// Mode 0700 is load-bearing, NOT cosmetic: REM's nightly log carries
|
|
336
|
+
// distillation CANDIDATE CONTENT — actual memory text, not just counts.
|
|
337
|
+
// Relaxing it to 0755 (e.g. "for shared debugging") would expose memory
|
|
338
|
+
// content to every local user.
|
|
339
|
+
const logsDir = resolve(subs.HOME, ".flair", "logs");
|
|
340
|
+
try {
|
|
341
|
+
mkdirSync(logsDir, { recursive: true, mode: 0o700 });
|
|
342
|
+
}
|
|
343
|
+
catch (err) {
|
|
344
|
+
throw new Error(`could not create the scheduler log directory ${logsDir}: ${err?.message ?? err}. ` +
|
|
345
|
+
`The service manager writes the job's stdout/stderr there; without it the first run dies ` +
|
|
346
|
+
`before producing any output. Fix whatever blocks creating that directory, then re-run ` +
|
|
347
|
+
`\`flair rem nightly enable\`.`);
|
|
348
|
+
}
|
|
349
|
+
const stderrLogPath = resolve(logsDir, "rem-nightly.stderr.log");
|
|
274
350
|
// 1. Deploy the shim (always — both platforms invoke it).
|
|
275
351
|
const shimContents = renderTemplate(readTemplate(templateRoot, "bin/flair-rem-nightly.sh.tmpl"), subs);
|
|
276
352
|
writeFileWithDir(shimPath, shimContents, 0o700);
|
|
@@ -282,12 +358,26 @@ export function enableScheduler(opts) {
|
|
|
282
358
|
writeFileWithDir(plistPath, plistContents, 0o600);
|
|
283
359
|
const loadCommand = ["launchctl", "bootstrap", `gui/${process.getuid?.() ?? ""}`, plistPath];
|
|
284
360
|
let loadResult;
|
|
361
|
+
let firstRun;
|
|
285
362
|
if (!opts.skipLoad) {
|
|
286
363
|
// Bootout first in case a prior install left the job loaded.
|
|
287
364
|
spawnReport(["launchctl", "bootout", `gui/${process.getuid?.() ?? ""}`, plistPath]);
|
|
288
365
|
loadResult = spawnReport(loadCommand);
|
|
366
|
+
if (loadResult.code === 0) {
|
|
367
|
+
// Ordering gate (#1231): verify the first run ONLY after the load
|
|
368
|
+
// exited 0. A load failure is its own failure mode with its own
|
|
369
|
+
// remedy — kickstarting on top of it would blur which actor failed.
|
|
370
|
+
firstRun = verifyFirstRun({
|
|
371
|
+
plat,
|
|
372
|
+
darwinTarget: `gui/${process.getuid?.() ?? ""}/dev.flair.rem.nightly`,
|
|
373
|
+
stderrLogPath,
|
|
374
|
+
});
|
|
375
|
+
}
|
|
289
376
|
}
|
|
290
|
-
return {
|
|
377
|
+
return {
|
|
378
|
+
platform: plat, shimPath, schedulerPath: plistPath, loadCommand, loadResult,
|
|
379
|
+
firstRunVerified: firstRun?.verified === true, firstRun,
|
|
380
|
+
};
|
|
291
381
|
}
|
|
292
382
|
// Linux: systemd user units.
|
|
293
383
|
const timerPath = opts.systemdTimerOverride ?? SYSTEMD_TIMER_PATH;
|
|
@@ -298,11 +388,21 @@ export function enableScheduler(opts) {
|
|
|
298
388
|
writeFileWithDir(timerPath, timerContents, 0o600);
|
|
299
389
|
const loadCommand = ["systemctl", "--user", "enable", "--now", "flair-rem-nightly.timer"];
|
|
300
390
|
let loadResult;
|
|
391
|
+
let firstRun;
|
|
301
392
|
if (!opts.skipLoad) {
|
|
302
393
|
spawnReport(["systemctl", "--user", "daemon-reload"]);
|
|
303
394
|
loadResult = spawnReport(loadCommand);
|
|
395
|
+
if (loadResult.code === 0) {
|
|
396
|
+
// Ordering gate (#1231): only after the load exited 0. Starts the
|
|
397
|
+
// SERVICE unit directly (oneshot ⇒ blocks until the run exits) rather
|
|
398
|
+
// than waiting for the nightly timer to fire.
|
|
399
|
+
firstRun = verifyFirstRun({ plat, linuxServiceUnit: "flair-rem-nightly.service", stderrLogPath });
|
|
400
|
+
}
|
|
304
401
|
}
|
|
305
|
-
return {
|
|
402
|
+
return {
|
|
403
|
+
platform: plat, shimPath, schedulerPath: timerPath, loadCommand, loadResult,
|
|
404
|
+
firstRunVerified: firstRun?.verified === true, firstRun,
|
|
405
|
+
};
|
|
306
406
|
}
|
|
307
407
|
/**
|
|
308
408
|
* Removes the scheduler entry. Audit log + snapshots are preserved.
|
|
@@ -59,9 +59,12 @@ never from the tool arguments (no forging of agentId / authorId).
|
|
|
59
59
|
clientId: ${OAUTH_GITHUB_CLIENT_ID}
|
|
60
60
|
clientSecret: ${OAUTH_GITHUB_CLIENT_SECRET}
|
|
61
61
|
mcp:
|
|
62
|
-
enabled:
|
|
62
|
+
enabled: ${FLAIR_MCP_OAUTH} # whole-token env reference (flair#1152) — the choice lives in the ENVIRONMENT, so a re-packed deploy can't revert it
|
|
63
63
|
issuer: ${FLAIR_MCP_ISSUER} # pin to your public origin — REQUIRED
|
|
64
|
-
resource
|
|
64
|
+
# NO resource key (flair#1180): the plugin derives <issuer>/mcp when it is
|
|
65
|
+
# absent. A composite like ${FLAIR_MCP_ISSUER}/mcp never interpolates
|
|
66
|
+
# (whole-token-only expansion) and fails every connect with
|
|
67
|
+
# invalid_target. Non-standard resource: set an explicit LITERAL URL.
|
|
65
68
|
accessTokenTtl: 900 # 5–15 min (Sherlock req 1) — short-lived
|
|
66
69
|
dynamicClientRegistration:
|
|
67
70
|
enabled: false # DCR is NOT SUPPORTED (flair#756) — explicit, not omitted (an absent block leaves DCR OPEN by the plugin's own default)
|
|
@@ -82,7 +85,11 @@ never from the tool arguments (no forging of agentId / authorId).
|
|
|
82
85
|
turning the surface on.
|
|
83
86
|
|
|
84
87
|
2. **Set the env:**
|
|
85
|
-
- `FLAIR_MCP_OAUTH=
|
|
88
|
+
- `FLAIR_MCP_OAUTH=true` — turns on the `/mcp` route registration AND the
|
|
89
|
+
component AS (flair#1152: `true` is the ONE value both readers accept —
|
|
90
|
+
flair's flag takes 1/true/yes/on, but the component's config read of the
|
|
91
|
+
same var accepts only "true"/"false" and deletes anything else, so `1`
|
|
92
|
+
gives you a guarded `/mcp` with no authorization server behind it).
|
|
86
93
|
- `FLAIR_MCP_ISSUER=https://your-public-origin` (or `FLAIR_PUBLIC_URL`).
|
|
87
94
|
- `FLAIR_MCP_JIT_PROVISION=1` — ONLY if you want unknown subjects
|
|
88
95
|
auto-provisioned (default OFF; pre-provision Agent+Credential otherwise).
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tpsdev-ai/flair",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.46.0",
|
|
4
4
|
"packageManager": "bun@1.3.10",
|
|
5
5
|
"description": "Identity, memory, and soul for AI agents. Cryptographic identity (Ed25519), semantic memory with local embeddings, and persistent personality — all in a single process.",
|
|
6
6
|
"type": "module",
|
|
@@ -25,4 +25,11 @@ if [ -n "${FLAIR_ADMIN_PASS_FILE:-}" ] && [ -f "${FLAIR_ADMIN_PASS_FILE}" ]; the
|
|
|
25
25
|
set -- "$@" --admin-pass-file "${FLAIR_ADMIN_PASS_FILE}"
|
|
26
26
|
fi
|
|
27
27
|
|
|
28
|
-
exec
|
|
28
|
+
# Run the CLI under node rather than exec-ing it directly: `node <script>`
|
|
29
|
+
# needs READ permission only, so the shim keeps working when a deploy method
|
|
30
|
+
# (npm-pack tarball extraction) strips the exec bit from the script (#1231).
|
|
31
|
+
# NODE_BIN is an ABSOLUTE path resolved at enable time — the shim performs
|
|
32
|
+
# zero PATH lookups at run time, exactly like the old absolute-FLAIR_BIN
|
|
33
|
+
# form. Do not replace it with a bare `node`: that would hand binary
|
|
34
|
+
# selection to whatever PATH the service manager happens to carry.
|
|
35
|
+
exec "{{NODE_BIN}}" "{{FLAIR_BIN}}" federation sync "$@"
|
|
@@ -5,5 +5,12 @@
|
|
|
5
5
|
#
|
|
6
6
|
# Single line that invokes the CLI's run-once subcommand — the runner module
|
|
7
7
|
# does all the work. Logs land in {{HOME}}/.flair/logs/.
|
|
8
|
+
#
|
|
9
|
+
# Run the CLI under node rather than exec-ing it directly: `node <script>`
|
|
10
|
+
# needs READ permission only, so the shim keeps working when a deploy method
|
|
11
|
+
# (npm-pack tarball extraction) strips the exec bit from the script (#1231).
|
|
12
|
+
# NODE_BIN is an ABSOLUTE path resolved at enable time — the shim performs
|
|
13
|
+
# zero PATH lookups at run time. Do not replace it with a bare `node`: that
|
|
14
|
+
# would hand binary selection to whatever PATH the service manager carries.
|
|
8
15
|
set -e
|
|
9
|
-
exec {{FLAIR_BIN}} rem nightly run-once
|
|
16
|
+
exec "{{NODE_BIN}}" "{{FLAIR_BIN}}" rem nightly run-once
|