moflo 4.10.4 → 4.10.5
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/bin/lib/daemon-recycler.mjs +203 -0
- package/bin/session-start-launcher.mjs +157 -76
- package/dist/src/cli/commands/daemon.js +21 -17
- package/dist/src/cli/init/settings-generator.js +1 -1
- package/dist/src/cli/services/hook-block-hash.js +1 -1
- package/dist/src/cli/version.js +1 -1
- package/package.json +2 -2
|
@@ -0,0 +1,203 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
/**
|
|
3
|
+
* Detached recycler for §2a of session-start-launcher.mjs.
|
|
4
|
+
*
|
|
5
|
+
* The launcher used to inline the kill-and-restart synchronously, which kept
|
|
6
|
+
* up to 500ms of liveness-polling in the foreground — fine on Linux, but on
|
|
7
|
+
* Windows under the SessionStart hook's 3000ms timeout it eroded the budget
|
|
8
|
+
* that's supposed to be spent on real work. Per the launcher's contract
|
|
9
|
+
* ("spawns background tasks via spawn(detached + unref) and exits
|
|
10
|
+
* immediately"), the daemon recycle belongs in a detached worker.
|
|
11
|
+
*
|
|
12
|
+
* Invocation (from §2a, via fireAndForget):
|
|
13
|
+
* node bin/lib/daemon-recycler.mjs <projectRoot> <pid> <installedVersion>
|
|
14
|
+
*
|
|
15
|
+
* Steps:
|
|
16
|
+
* 1. Force-kill <pid> (Windows: taskkill /F /T, Unix: SIGKILL). Skip
|
|
17
|
+
* graceful — by this point the launcher has already decided the daemon
|
|
18
|
+
* is running stale code and its shutdown handlers are stale too.
|
|
19
|
+
* 2. Poll liveness up to 5s. Unlink the lockfile only once the PID is gone,
|
|
20
|
+
* so a surviving daemon can't re-attach to the unlinked path.
|
|
21
|
+
* 3. Spawn `node node_modules/moflo/bin/cli.js daemon start --quiet`
|
|
22
|
+
* detached + unref so this recycler can exit immediately.
|
|
23
|
+
*
|
|
24
|
+
* Output is intentionally silent — there's no parent to read it. Failures are
|
|
25
|
+
* surfaced via `.moflo/daemon-recycle.last.json` for `flo doctor` to read.
|
|
26
|
+
*/
|
|
27
|
+
|
|
28
|
+
import { spawn, execFileSync } from 'node:child_process';
|
|
29
|
+
import { existsSync, openSync, closeSync, unlinkSync, writeFileSync, readFileSync } from 'node:fs';
|
|
30
|
+
import { resolve, join } from 'node:path';
|
|
31
|
+
|
|
32
|
+
const [, , projectRootArg, pidArg, installedVersion] = process.argv;
|
|
33
|
+
|
|
34
|
+
if (!projectRootArg || !pidArg) {
|
|
35
|
+
// No way to surface this — the launcher fire-and-forgets us, no parent
|
|
36
|
+
// captures stderr. Bail silently.
|
|
37
|
+
process.exit(2);
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
const projectRoot = resolve(projectRootArg);
|
|
41
|
+
const pid = Number.parseInt(pidArg, 10);
|
|
42
|
+
const lockFile = join(projectRoot, '.moflo', 'daemon.lock');
|
|
43
|
+
|
|
44
|
+
// EPERM means "exists but owned by another user" — treat as alive (matches
|
|
45
|
+
// launcher's isDaemonPidAlive contract). ESRCH means "no such process" — dead.
|
|
46
|
+
//
|
|
47
|
+
// Linux zombie handling: on Linux, `kill(pid, 0)` succeeds for zombie processes
|
|
48
|
+
// (exited but not yet reaped). A zombie can't write to the DB or hold locks, so
|
|
49
|
+
// treating it as alive exhausts the 5s kill budget polling a corpse. Read
|
|
50
|
+
// /proc/<pid>/stat and treat 'Z' as dead — same logic the launcher uses (#1083).
|
|
51
|
+
function isAlive(p) {
|
|
52
|
+
if (!p || p <= 0) return false;
|
|
53
|
+
try {
|
|
54
|
+
process.kill(p, 0);
|
|
55
|
+
} catch (err) {
|
|
56
|
+
return err && err.code === 'EPERM';
|
|
57
|
+
}
|
|
58
|
+
if (process.platform === 'linux') {
|
|
59
|
+
try {
|
|
60
|
+
const stat = readFileSync(`/proc/${p}/stat`, 'utf-8');
|
|
61
|
+
const lastParen = stat.lastIndexOf(')');
|
|
62
|
+
if (lastParen !== -1 && stat.charAt(lastParen + 2) === 'Z') return false;
|
|
63
|
+
} catch (err) {
|
|
64
|
+
if (err && err.code === 'ENOENT') return false;
|
|
65
|
+
// /proc unavailable — fall through with the kill(0) verdict.
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
return true;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
function sleepSyncMs(ms) {
|
|
72
|
+
const buf = new Int32Array(new SharedArrayBuffer(4));
|
|
73
|
+
Atomics.wait(buf, 0, 0, ms);
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
function writeOutcome(status, detail) {
|
|
77
|
+
try {
|
|
78
|
+
writeFileSync(
|
|
79
|
+
join(projectRoot, '.moflo', 'daemon-recycle.last.json'),
|
|
80
|
+
JSON.stringify(
|
|
81
|
+
{
|
|
82
|
+
status,
|
|
83
|
+
detail,
|
|
84
|
+
pid,
|
|
85
|
+
installedVersion: installedVersion ?? null,
|
|
86
|
+
completedAt: new Date().toISOString(),
|
|
87
|
+
},
|
|
88
|
+
null,
|
|
89
|
+
2,
|
|
90
|
+
),
|
|
91
|
+
);
|
|
92
|
+
} catch { /* best-effort — doctor reads this file optionally */ }
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
// ── 0. Single-recycler advisory lock ────────────────────────────────────────
|
|
96
|
+
// Two session starts within the same second can both fire §2a, both detect
|
|
97
|
+
// behind, both spawn this recycler against the same PID. Without the lock,
|
|
98
|
+
// both call `daemon start` and race for daemon-lock acquisition — only one
|
|
99
|
+
// daemon wins but the other wastes a spawn cycle. Use O_EXCL on a sentinel
|
|
100
|
+
// file so the second invocation exits early.
|
|
101
|
+
const recycleLock = join(projectRoot, '.moflo', 'recycle.lock');
|
|
102
|
+
let lockFd;
|
|
103
|
+
let lockAcquired = false;
|
|
104
|
+
try {
|
|
105
|
+
lockFd = openSync(recycleLock, 'wx'); // O_CREAT | O_EXCL
|
|
106
|
+
lockAcquired = true;
|
|
107
|
+
} catch (err) {
|
|
108
|
+
if (err && err.code === 'EEXIST') {
|
|
109
|
+
// Another recycler is mid-flight. Bail silently — it will handle the kill.
|
|
110
|
+
writeOutcome('already-running', `another recycler holds ${recycleLock}`);
|
|
111
|
+
process.exit(0);
|
|
112
|
+
}
|
|
113
|
+
// Unexpected — proceed without the lock rather than blocking the recycle.
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
// Release the advisory lock on every exit path, including process.exit() and
|
|
117
|
+
// crashes. Idempotent: if the lock wasn't acquired this becomes a no-op.
|
|
118
|
+
process.on('exit', () => {
|
|
119
|
+
if (!lockAcquired) return;
|
|
120
|
+
try { closeSync(lockFd); } catch { /* already closed */ }
|
|
121
|
+
try { unlinkSync(recycleLock); } catch { /* already gone */ }
|
|
122
|
+
});
|
|
123
|
+
|
|
124
|
+
// ── 1. Force-kill ───────────────────────────────────────────────────────────
|
|
125
|
+
// EPERM on the kill attempt means the daemon is owned by another user. Can't
|
|
126
|
+
// kill it. Don't proceed to unlink + restart — that'd resurrect a fresh daemon
|
|
127
|
+
// alongside the foreign-owned one, double-writing the DB.
|
|
128
|
+
let killBlockedByEperm = false;
|
|
129
|
+
if (Number.isFinite(pid) && pid > 0 && isAlive(pid)) {
|
|
130
|
+
try {
|
|
131
|
+
if (process.platform === 'win32') {
|
|
132
|
+
execFileSync('taskkill', ['/F', '/T', '/PID', String(pid)], { windowsHide: true, timeout: 5000 });
|
|
133
|
+
} else {
|
|
134
|
+
process.kill(pid, 'SIGKILL');
|
|
135
|
+
}
|
|
136
|
+
} catch (err) {
|
|
137
|
+
if (err && (err.code === 'EPERM' || err.code === 'EACCES')) {
|
|
138
|
+
killBlockedByEperm = true;
|
|
139
|
+
}
|
|
140
|
+
// Other errors (ESRCH = already dead) — fall through; liveness poll confirms.
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
if (killBlockedByEperm) {
|
|
145
|
+
writeOutcome('kill-permission-denied', `PID ${pid} owned by another user — leaving daemon alive, not spawning replacement`);
|
|
146
|
+
process.exit(1);
|
|
147
|
+
}
|
|
148
|
+
|
|
149
|
+
// ── 2. Wait for death, then unlink the lockfile ─────────────────────────────
|
|
150
|
+
const deadline = Date.now() + 5000;
|
|
151
|
+
let killed = !isAlive(pid);
|
|
152
|
+
while (!killed && Date.now() < deadline) {
|
|
153
|
+
sleepSyncMs(100);
|
|
154
|
+
killed = !isAlive(pid);
|
|
155
|
+
}
|
|
156
|
+
|
|
157
|
+
if (!killed) {
|
|
158
|
+
writeOutcome('kill-failed', `PID ${pid} survived 5s force-kill window`);
|
|
159
|
+
process.exit(1);
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
// Only unlink once we know nothing's holding the lock file's old identity.
|
|
163
|
+
// A surviving daemon would re-write a lockfile with its stale PID + version
|
|
164
|
+
// and defeat the whole purpose of the recycle.
|
|
165
|
+
try {
|
|
166
|
+
if (existsSync(lockFile)) {
|
|
167
|
+
// Defensive: if the lockfile has been re-written under us (another
|
|
168
|
+
// recycler raced), only unlink if the PID still matches what we killed.
|
|
169
|
+
try {
|
|
170
|
+
const current = JSON.parse(readFileSync(lockFile, 'utf-8'));
|
|
171
|
+
if (typeof current?.pid === 'number' && current.pid !== pid) {
|
|
172
|
+
writeOutcome('lock-changed', `another daemon (PID ${current.pid}) wrote the lock; leaving it alone`);
|
|
173
|
+
process.exit(0);
|
|
174
|
+
}
|
|
175
|
+
} catch { /* unreadable / malformed — fall through and unlink */ }
|
|
176
|
+
unlinkSync(lockFile);
|
|
177
|
+
}
|
|
178
|
+
} catch { /* non-fatal */ }
|
|
179
|
+
|
|
180
|
+
// ── 3. Spawn fresh daemon, detached + unref ─────────────────────────────────
|
|
181
|
+
const cliPath = join(projectRoot, 'node_modules', 'moflo', 'bin', 'cli.js');
|
|
182
|
+
if (existsSync(cliPath)) {
|
|
183
|
+
try {
|
|
184
|
+
const child = spawn('node', [cliPath, 'daemon', 'start', '--quiet'], {
|
|
185
|
+
cwd: projectRoot,
|
|
186
|
+
stdio: 'ignore',
|
|
187
|
+
detached: true,
|
|
188
|
+
shell: false,
|
|
189
|
+
windowsHide: true,
|
|
190
|
+
});
|
|
191
|
+
child.unref();
|
|
192
|
+
writeOutcome('ok', 'fresh daemon spawn requested');
|
|
193
|
+
} catch (err) {
|
|
194
|
+
writeOutcome('spawn-failed', err && err.message ? err.message : String(err));
|
|
195
|
+
process.exit(1);
|
|
196
|
+
}
|
|
197
|
+
} else {
|
|
198
|
+
writeOutcome('cli-missing', `node_modules/moflo/bin/cli.js not present at ${cliPath}`);
|
|
199
|
+
process.exit(1);
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
// Recycler's job is done. Exit fast.
|
|
203
|
+
process.exit(0);
|
|
@@ -432,41 +432,49 @@ function stopDaemon(lockFile) {
|
|
|
432
432
|
|
|
433
433
|
let killed = false;
|
|
434
434
|
if (stalePid !== null && isDaemonPidAlive(stalePid)) {
|
|
435
|
-
//
|
|
436
|
-
//
|
|
437
|
-
//
|
|
438
|
-
//
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
//
|
|
448
|
-
|
|
449
|
-
const gracefulDeadline = Date.now() + 3000;
|
|
450
|
-
while (Date.now() < gracefulDeadline) {
|
|
451
|
-
if (!isDaemonPidAlive(stalePid)) { killed = true; break; }
|
|
452
|
-
sleepSyncMs(100);
|
|
453
|
-
}
|
|
454
|
-
|
|
455
|
-
// Force-kill if still alive.
|
|
456
|
-
if (!killed) {
|
|
435
|
+
// Platform-split shutdown. On Linux/macOS, SIGTERM lets the daemon's
|
|
436
|
+
// shutdown handler run a final sql.js dump + lock release before we
|
|
437
|
+
// escalate.
|
|
438
|
+
//
|
|
439
|
+
// On Windows there is no SIGTERM equivalent for our headless detached
|
|
440
|
+
// Node daemon — `taskkill /PID` (no /F) sends a window-close message
|
|
441
|
+
// that a non-GUI process can't receive and always fails with the visible
|
|
442
|
+
// error 'process can only be terminated forcefully'. The prior
|
|
443
|
+
// implementation invoked it anyway, swallowed the error, then polled
|
|
444
|
+
// alive for 3s before escalating — exactly the time-waste that pushed
|
|
445
|
+
// §3's stopDaemon past the 3000ms SessionStart hook timeout. Go
|
|
446
|
+
// straight to /F /T (tree-kill, in case a worker child outlived its
|
|
447
|
+
// parent) on Win.
|
|
448
|
+
if (process.platform === 'win32') {
|
|
457
449
|
try {
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
process.kill(stalePid, 'SIGKILL');
|
|
462
|
-
}
|
|
463
|
-
} catch { /* dead or unreachable */ }
|
|
464
|
-
// Short grace period for OS reap.
|
|
450
|
+
execFileSync('taskkill', ['/F', '/T', '/PID', String(stalePid)], { windowsHide: true, timeout: 5000 });
|
|
451
|
+
} catch { /* dead or unreachable — liveness poll below confirms */ }
|
|
452
|
+
// Short grace period for OS reap (typically ~ms).
|
|
465
453
|
const forceDeadline = Date.now() + 1000;
|
|
466
454
|
while (Date.now() < forceDeadline) {
|
|
467
455
|
if (!isDaemonPidAlive(stalePid)) { killed = true; break; }
|
|
468
456
|
sleepSyncMs(100);
|
|
469
457
|
}
|
|
458
|
+
} else {
|
|
459
|
+
try { process.kill(stalePid, 'SIGTERM'); } catch { /* signal failed — escalate below */ }
|
|
460
|
+
|
|
461
|
+
// Poll for death up to 3s. The daemon's shutdown handler does a final
|
|
462
|
+
// sql.js dump + lock release, which under load can take ~1s.
|
|
463
|
+
const gracefulDeadline = Date.now() + 3000;
|
|
464
|
+
while (Date.now() < gracefulDeadline) {
|
|
465
|
+
if (!isDaemonPidAlive(stalePid)) { killed = true; break; }
|
|
466
|
+
sleepSyncMs(100);
|
|
467
|
+
}
|
|
468
|
+
|
|
469
|
+
// Force-kill if still alive.
|
|
470
|
+
if (!killed) {
|
|
471
|
+
try { process.kill(stalePid, 'SIGKILL'); } catch { /* dead or unreachable */ }
|
|
472
|
+
const forceDeadline = Date.now() + 1000;
|
|
473
|
+
while (Date.now() < forceDeadline) {
|
|
474
|
+
if (!isDaemonPidAlive(stalePid)) { killed = true; break; }
|
|
475
|
+
sleepSyncMs(100);
|
|
476
|
+
}
|
|
477
|
+
}
|
|
470
478
|
}
|
|
471
479
|
|
|
472
480
|
if (!killed) {
|
|
@@ -499,6 +507,42 @@ function recycleDaemon(lockFile, label) {
|
|
|
499
507
|
return true;
|
|
500
508
|
}
|
|
501
509
|
|
|
510
|
+
// Numeric semver compare. Returns -1 / 0 / +1 for a vs b. Treats missing
|
|
511
|
+
// segments as 0 so '4.10' < '4.10.4'. Strips pre-release tags ('1.2.3-beta'
|
|
512
|
+
// compares as '1.2.3') — close enough for "is the daemon's version behind
|
|
513
|
+
// the installed package's version", which is all §2a needs.
|
|
514
|
+
function compareVersionsSemver(a, b) {
|
|
515
|
+
const norm = (v) => String(v || '').split('-')[0].split('.').map((s) => {
|
|
516
|
+
const n = parseInt(s, 10);
|
|
517
|
+
return Number.isFinite(n) ? n : 0;
|
|
518
|
+
});
|
|
519
|
+
const aa = norm(a);
|
|
520
|
+
const bb = norm(b);
|
|
521
|
+
const len = Math.max(aa.length, bb.length);
|
|
522
|
+
for (let i = 0; i < len; i++) {
|
|
523
|
+
const av = aa[i] ?? 0;
|
|
524
|
+
const bv = bb[i] ?? 0;
|
|
525
|
+
if (av < bv) return -1;
|
|
526
|
+
if (av > bv) return 1;
|
|
527
|
+
}
|
|
528
|
+
return 0;
|
|
529
|
+
}
|
|
530
|
+
|
|
531
|
+
// Resolve `bin/lib/daemon-recycler.mjs` across the three places it can live:
|
|
532
|
+
// 1. node_modules/moflo/bin/lib/ (consumer install, always present)
|
|
533
|
+
// 2. .claude/scripts/lib/ (synced copy in consumer/dogfood projects)
|
|
534
|
+
// 3. bin/lib/ (dogfood source tree)
|
|
535
|
+
// Returns null when not found — §2a falls back to inline force-kill in that
|
|
536
|
+
// case, which is the pre-recycler behavior.
|
|
537
|
+
function resolveDaemonRecyclerPath() {
|
|
538
|
+
const candidates = [
|
|
539
|
+
resolve(projectRoot, 'node_modules/moflo/bin/lib/daemon-recycler.mjs'),
|
|
540
|
+
resolve(projectRoot, '.claude/scripts/lib/daemon-recycler.mjs'),
|
|
541
|
+
resolve(projectRoot, 'bin/lib/daemon-recycler.mjs'),
|
|
542
|
+
];
|
|
543
|
+
return candidates.find((p) => existsSync(p)) || null;
|
|
544
|
+
}
|
|
545
|
+
|
|
502
546
|
// ── 2. Reset workflow state for new session ──────────────────────────────────
|
|
503
547
|
const stateDir = resolve(projectRoot, '.claude');
|
|
504
548
|
const stateFile = resolve(stateDir, 'workflow-state.json');
|
|
@@ -514,6 +558,84 @@ try {
|
|
|
514
558
|
// Non-fatal - workflow gate will use defaults
|
|
515
559
|
}
|
|
516
560
|
|
|
561
|
+
// ── 2a. Recycle daemon when behind installed version (#1054 follow-up) ──────
|
|
562
|
+
// Promoted from §3a-pre to run BEFORE §3's file-sync work. The launcher has
|
|
563
|
+
// a 3000ms SessionStart hook timeout (src/cli/services/hook-block-hash.ts);
|
|
564
|
+
// §0c (DB repair) + §3 (file-sync, manifest, cherry-pick) + stopDaemon's
|
|
565
|
+
// up-to-4s graceful poll routinely exceeds it on upgrade sessions, killing
|
|
566
|
+
// the launcher mid-§3. Result: §3a-pre never ran on the very sessions that
|
|
567
|
+
// needed it, leaving a stale-version daemon alive after `npm install moflo`
|
|
568
|
+
// + Claude restart — `📊 ?` in the statusline (this bug's tell).
|
|
569
|
+
//
|
|
570
|
+
// Semver-BEHIND only — a downgrade-test daemon ahead of installed is left
|
|
571
|
+
// alone. Pre-#1054 daemons (no `version` field in the lock) are treated as
|
|
572
|
+
// behind because by construction they predate version publishing.
|
|
573
|
+
//
|
|
574
|
+
// Force-kill skips the graceful poll: a stale-code daemon's flush handlers
|
|
575
|
+
// are themselves stale, and losing one in-flight flush beats running past
|
|
576
|
+
// the hook timeout. fireAndForget the fresh `daemon start` so spawn returns
|
|
577
|
+
// immediately and the launcher can move on to §3.
|
|
578
|
+
try {
|
|
579
|
+
const mofloPkgPath = resolve(projectRoot, 'node_modules/moflo/package.json');
|
|
580
|
+
const lockFile = resolve(projectRoot, '.moflo', 'daemon.lock');
|
|
581
|
+
// Single readFileSync each (try/catch instead of existsSync + readFileSync)
|
|
582
|
+
// — halves the syscalls in the hot path and closes the TOCTOU window where
|
|
583
|
+
// the file existed for existsSync but was unlinked before readFileSync.
|
|
584
|
+
let installedVersion;
|
|
585
|
+
let daemonVersion;
|
|
586
|
+
let daemonPid;
|
|
587
|
+
try {
|
|
588
|
+
installedVersion = JSON.parse(readFileSync(mofloPkgPath, 'utf-8')).version;
|
|
589
|
+
} catch { /* node_modules/moflo absent — fresh consumer or fatal, nothing §2a can do */ }
|
|
590
|
+
let lockReadOk = false;
|
|
591
|
+
try {
|
|
592
|
+
const lock = JSON.parse(readFileSync(lockFile, 'utf-8'));
|
|
593
|
+
lockReadOk = true;
|
|
594
|
+
if (typeof lock?.version === 'string') daemonVersion = lock.version;
|
|
595
|
+
if (typeof lock?.pid === 'number' && lock.pid > 0) daemonPid = lock.pid;
|
|
596
|
+
} catch { /* no lock or corrupt — no daemon to recycle, skip the block below */ }
|
|
597
|
+
|
|
598
|
+
if (installedVersion && lockReadOk) {
|
|
599
|
+
const isBehind = !daemonVersion || compareVersionsSemver(daemonVersion, installedVersion) < 0;
|
|
600
|
+
if (isBehind) {
|
|
601
|
+
const observed = daemonVersion ?? '<pre-1054 / unknown>';
|
|
602
|
+
const recyclerPath = resolveDaemonRecyclerPath();
|
|
603
|
+
if (recyclerPath && daemonPid && daemonPid > 0) {
|
|
604
|
+
// Fire-and-forget the detached recycler. Per the launcher's contract
|
|
605
|
+
// ("spawns background tasks ... and exits immediately"), the
|
|
606
|
+
// kill+wait+restart sequence runs in a separate process so §2a's
|
|
607
|
+
// foreground cost is ~ms instead of up-to-5s. The recycler writes
|
|
608
|
+
// .moflo/daemon-recycle.last.json on completion for doctor to read.
|
|
609
|
+
fireAndForget(
|
|
610
|
+
'node',
|
|
611
|
+
[recyclerPath, projectRoot, String(daemonPid), installedVersion],
|
|
612
|
+
'daemon-behind-recycle',
|
|
613
|
+
);
|
|
614
|
+
emitMutation(
|
|
615
|
+
'recycled stale daemon',
|
|
616
|
+
`behind: daemon v${observed} → installed v${installedVersion}`,
|
|
617
|
+
);
|
|
618
|
+
} else if (!recyclerPath) {
|
|
619
|
+
// Recycler script missing — happens during the transition release
|
|
620
|
+
// where the launcher upgraded but bin/lib/daemon-recycler.mjs hasn't
|
|
621
|
+
// synced yet. Surface so /healer can flag; §3 below will sync the
|
|
622
|
+
// recycler on this session and §2a covers it on the next.
|
|
623
|
+
emitWarning(
|
|
624
|
+
`daemon-behind recycle: bin/lib/daemon-recycler.mjs not resolvable — ` +
|
|
625
|
+
`daemon v${observed} stays alive this session, will recycle on the next`,
|
|
626
|
+
);
|
|
627
|
+
} else {
|
|
628
|
+
// No PID — lockfile is corrupt or malformed. Unlink it so a fresh
|
|
629
|
+
// daemon can start cleanly on the next worker request.
|
|
630
|
+
try { unlinkSync(lockFile); } catch { /* non-fatal */ }
|
|
631
|
+
emitMutation('cleared malformed daemon lock', `version field: ${observed}`);
|
|
632
|
+
}
|
|
633
|
+
}
|
|
634
|
+
}
|
|
635
|
+
} catch (err) {
|
|
636
|
+
emitWarning(`daemon-behind check failed: ${errMessage(err)}`);
|
|
637
|
+
}
|
|
638
|
+
|
|
517
639
|
// ── 3. Auto-sync scripts and helpers on version change ───────────────────────
|
|
518
640
|
// Controlled by `auto_update.enabled` in moflo.yaml (default: true).
|
|
519
641
|
// When moflo is upgraded (npm install), scripts and helpers may be stale.
|
|
@@ -1009,53 +1131,12 @@ try {
|
|
|
1009
1131
|
emitWarning(`upgrade section failed (${errMessage(err)})`);
|
|
1010
1132
|
}
|
|
1011
1133
|
|
|
1012
|
-
// ── 3a-pre.
|
|
1013
|
-
// The version
|
|
1014
|
-
//
|
|
1015
|
-
//
|
|
1016
|
-
//
|
|
1017
|
-
//
|
|
1018
|
-
// `[neural-tools] @moflo/embeddings not resolvable` spam (#639) is the
|
|
1019
|
-
// observable symptom of exactly this: a daemon running pre-#592 code that no
|
|
1020
|
-
// longer exists in source, calling a require helper that prints the warning
|
|
1021
|
-
// every time `neural_predict` / `neural_patterns` fires.
|
|
1022
|
-
//
|
|
1023
|
-
// Fix (epic #1054): compare the daemon-lock's reported moflo `version` against
|
|
1024
|
-
// the installed `node_modules/moflo/package.json` version. If they differ —
|
|
1025
|
-
// or the lock predates #1054 and has no `version` field at all — recycle the
|
|
1026
|
-
// daemon. This is exact (not a heuristic margin like the prior mtime-based
|
|
1027
|
-
// check) and named explicitly so the doctor's Daemon Version Skew check
|
|
1028
|
-
// (#1059) can share the diagnosis.
|
|
1029
|
-
//
|
|
1030
|
-
// Pre-#1054 daemons have no `version` in their lock payload — treated as a
|
|
1031
|
-
// mismatch by definition because by construction they were launched before
|
|
1032
|
-
// version publishing existed.
|
|
1033
|
-
try {
|
|
1034
|
-
const mofloPkgPathForRecycle = resolve(projectRoot, 'node_modules/moflo/package.json');
|
|
1035
|
-
const lockFile = resolve(projectRoot, '.moflo', 'daemon.lock');
|
|
1036
|
-
// Cheap stat first — if either file is gone, no skew check is possible.
|
|
1037
|
-
if (existsSync(mofloPkgPathForRecycle) && existsSync(lockFile)) {
|
|
1038
|
-
const installedVersion = JSON.parse(readFileSync(mofloPkgPathForRecycle, 'utf-8')).version;
|
|
1039
|
-
let daemonVersion;
|
|
1040
|
-
try {
|
|
1041
|
-
const lock = JSON.parse(readFileSync(lockFile, 'utf-8'));
|
|
1042
|
-
if (typeof lock?.version === 'string') daemonVersion = lock.version;
|
|
1043
|
-
} catch { /* corrupt lock — recycleDaemon will unlink it */ }
|
|
1044
|
-
if (daemonVersion !== installedVersion) {
|
|
1045
|
-
if (recycleDaemon(lockFile, 'daemon-version-skew')) {
|
|
1046
|
-
const observed = daemonVersion ?? '<pre-1054 / unknown>';
|
|
1047
|
-
emitMutation(
|
|
1048
|
-
'recycled stale daemon',
|
|
1049
|
-
`version skew: installed ${installedVersion}, daemon ${observed}`,
|
|
1050
|
-
);
|
|
1051
|
-
}
|
|
1052
|
-
}
|
|
1053
|
-
}
|
|
1054
|
-
} catch (err) {
|
|
1055
|
-
// Non-fatal; surface via emitWarning per feedback_no_layered_workarounds —
|
|
1056
|
-
// no silent catch on the upgrade path (#854).
|
|
1057
|
-
emitWarning(`daemon version-skew check failed: ${errMessage(err)}`);
|
|
1058
|
-
}
|
|
1134
|
+
// ── 3a-pre. (removed) Daemon-version-skew recycle moved to §2a. ─────────────
|
|
1135
|
+
// The previous version of this block ran AFTER §3's heavy file-sync work,
|
|
1136
|
+
// which routinely exceeded the 3000ms SessionStart hook timeout and was
|
|
1137
|
+
// killed before reaching this point. §2a now runs early and force-kills the
|
|
1138
|
+
// stale daemon before §3 can starve out. Don't restore §3a-pre — keep the
|
|
1139
|
+
// recycle in one place so the two paths can't drift.
|
|
1059
1140
|
|
|
1060
1141
|
// ── 3a. Auto-migrate settings.json (npx flo → node helpers, PATH setup) ────
|
|
1061
1142
|
// Existing users may have stale settings.json with `npx flo` hooks that break
|
|
@@ -470,33 +470,37 @@ export async function killBackgroundDaemon(projectRoot) {
|
|
|
470
470
|
return false;
|
|
471
471
|
}
|
|
472
472
|
try {
|
|
473
|
-
//
|
|
473
|
+
// Platform-split shutdown. On Linux/macOS we try SIGTERM first so the
|
|
474
|
+
// daemon's shutdown handlers (sql.js flush, lock release) can run; force-
|
|
475
|
+
// kill only if it doesn't exit within ~1s.
|
|
476
|
+
//
|
|
477
|
+
// On Windows there is no SIGTERM equivalent for our headless detached
|
|
478
|
+
// Node daemon — `taskkill /PID` (no /F) sends a window-close message
|
|
479
|
+
// that a non-GUI process can't receive, so it always fails with the
|
|
480
|
+
// visible error 'process can only be terminated forcefully'. The prior
|
|
481
|
+
// implementation invoked it anyway, ate the error in a bare catch, then
|
|
482
|
+
// slept 1s before escalating to /F. Skip the dead step: go straight to
|
|
483
|
+
// /F /T (tree-kill, in case a worker child outlived its parent) on Win.
|
|
474
484
|
if (process.platform === 'win32') {
|
|
475
|
-
// SIGTERM silently force-kills on Windows; use taskkill for clean shutdown
|
|
476
485
|
try {
|
|
477
|
-
execFileSync('taskkill', ['/PID', String(holderPid)], { windowsHide: true });
|
|
486
|
+
execFileSync('taskkill', ['/F', '/T', '/PID', String(holderPid)], { windowsHide: true });
|
|
478
487
|
}
|
|
479
488
|
catch {
|
|
480
|
-
//
|
|
489
|
+
// Already exiting / unreachable — process.kill(pid, 0) below verifies.
|
|
481
490
|
}
|
|
482
491
|
}
|
|
483
492
|
else {
|
|
484
493
|
process.kill(holderPid, 'SIGTERM');
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
// Still alive, force kill
|
|
491
|
-
if (process.platform === 'win32') {
|
|
492
|
-
execFileSync('taskkill', ['/F', '/PID', String(holderPid)], { windowsHide: true });
|
|
493
|
-
}
|
|
494
|
-
else {
|
|
494
|
+
// Wait briefly so SIGTERM has a chance to land before checking liveness.
|
|
495
|
+
await new Promise(resolve => setTimeout(resolve, 1000));
|
|
496
|
+
try {
|
|
497
|
+
process.kill(holderPid, 0);
|
|
498
|
+
// Still alive — force kill.
|
|
495
499
|
process.kill(holderPid, 'SIGKILL');
|
|
496
500
|
}
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
501
|
+
catch {
|
|
502
|
+
// Process terminated
|
|
503
|
+
}
|
|
500
504
|
}
|
|
501
505
|
// Release lock
|
|
502
506
|
releaseDaemonLock(projectRoot, holderPid, true);
|
|
@@ -94,7 +94,7 @@ export function getReferenceHookBlock() {
|
|
|
94
94
|
],
|
|
95
95
|
SessionStart: [
|
|
96
96
|
{
|
|
97
|
-
hooks: [scriptHook('session-start-launcher.mjs',
|
|
97
|
+
hooks: [scriptHook('session-start-launcher.mjs', 5000), autoMemory('import', 8000)],
|
|
98
98
|
},
|
|
99
99
|
],
|
|
100
100
|
Stop: [
|
package/dist/src/cli/version.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "moflo",
|
|
3
|
-
"version": "4.10.
|
|
3
|
+
"version": "4.10.5",
|
|
4
4
|
"description": "MoFlo — AI agent orchestration for Claude Code. A standalone, opinionated toolkit with semantic memory, learned routing, gates, spells, and the /flo issue-execution skill.",
|
|
5
5
|
"main": "dist/src/cli/index.js",
|
|
6
6
|
"type": "module",
|
|
@@ -95,7 +95,7 @@
|
|
|
95
95
|
"@typescript-eslint/eslint-plugin": "^7.18.0",
|
|
96
96
|
"@typescript-eslint/parser": "^7.18.0",
|
|
97
97
|
"eslint": "^8.0.0",
|
|
98
|
-
"moflo": "^4.10.
|
|
98
|
+
"moflo": "^4.10.4",
|
|
99
99
|
"tsx": "^4.21.0",
|
|
100
100
|
"typescript": "^5.9.3",
|
|
101
101
|
"vitest": "^4.0.0"
|