swipium 1.3.0 → 1.5.0

package/dist/session/processRegistry.js

@@ -0,0 +1,164 @@
+// Cross-restart registry of the long-lived child processes Swipium spawns (Metro bundler,
+// managed WDA xcodebuild, screen recorders, emulators) in ~/.swipium/processes.json, so a
+// crashed server's orphans can be reaped on the next startup (P0 §2 "orphaned processes").
+//
+// Safety rules:
+//  - Every entry records the OWNING server pid. A child whose owner is still a live
+//    node/swipium process belongs to a concurrent server instance and is never touched.
+//  - Before signalling, the child's command line is re-checked via `ps` so a PID recycled
+//    by the OS to an unrelated process is never killed.
+//  - Emulators are ADOPTED, not killed — an orphaned emulator stays booted and remains
+//    usable via adb for the next run.
+import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { homedir } from 'node:os';
+import { spawnSync } from 'node:child_process';
+import { withFileLock } from '../lib/lockfile.js';
+import { log } from '../lib/logger.js';
+const REGISTRY_DIR = join(homedir(), '.swipium');
+const PROCESSES_FILE = join(REGISTRY_DIR, 'processes.json');
+const PROCESSES_LOCK = `${PROCESSES_FILE}.lock`;
+const MAX_ENTRIES = 100;
+/** What the child's `ps` command line must look like before we dare signal it. */
+const KIND_COMMAND_RE = {
+    metro: /metro|expo|react-native|npx|node/i,
+    wda: /xcodebuild/i,
+    recording: /screenrecord|recordvideo|simctl|adb/i,
+    emulator: /emulator|qemu/i,
+};
+function pidAlive(pid) {
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/** The live command line for `pid`, or null when it is gone / unreadable (POSIX `ps`). */
+function psCommand(pid) {
+    try {
+        const out = spawnSync('ps', ['-o', 'command=', '-p', String(pid)], { encoding: 'utf8' });
+        if (out.status !== 0 || !out.stdout?.trim())
+            return null;
+        return out.stdout.trim();
+    }
+    catch {
+        return null;
+    }
+}
+function readEntries() {
+    try {
+        if (!existsSync(PROCESSES_FILE))
+            return [];
+        const parsed = JSON.parse(readFileSync(PROCESSES_FILE, 'utf8'));
+        if (!Array.isArray(parsed))
+            return [];
+        return parsed.filter((e) => typeof e?.pid === 'number');
+    }
+    catch (e) {
+        log('warn', 'managed-process registry unreadable — starting fresh', { file: PROCESSES_FILE, err: String(e) });
+        return [];
+    }
+}
+function writeEntries(entries) {
+    const tmp = `${PROCESSES_FILE}.${process.pid}.tmp`;
+    writeFileSync(tmp, JSON.stringify(entries.slice(-MAX_ENTRIES), null, 2));
+    renameSync(tmp, PROCESSES_FILE); // atomic on the same filesystem
+}
+function mutateEntries(fn) {
+    try {
+        mkdirSync(REGISTRY_DIR, { recursive: true });
+        withFileLock(PROCESSES_LOCK, () => writeEntries(fn(readEntries())));
+    }
+    catch (e) {
+        log('error', 'failed to update managed-process registry — a crash may leave this child unreaped', {
+            file: PROCESSES_FILE,
+            err: String(e),
+        });
+    }
+}
+/** Record a long-lived child we spawned so a future server instance can reap it if we crash. */
+export function registerManagedProcess(pid, kind, sessionId) {
+    if (!pid || pid <= 0)
+        return;
+    mutateEntries((entries) => [
+        ...entries.filter((e) => e.pid !== pid),
+        { pid, kind, serverPid: process.pid, sessionId, startedAt: Date.now() },
+    ]);
+}
+/** Remove a child we stopped (or that finished) from the registry. */
+export function unregisterManagedProcess(pid) {
+    if (!pid || pid <= 0)
+        return;
+    mutateEntries((entries) => entries.filter((e) => e.pid !== pid));
+}
+/** SIGTERM the child's process group (detached children lead their own group), else the pid. */
+function killTree(pid) {
+    try {
+        process.kill(-pid, 'SIGTERM');
+        return true;
+    }
+    catch {
+        /* not a group leader, or group already gone — fall back to the pid itself */
+    }
+    try {
+        process.kill(pid, 'SIGTERM');
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/** True when `serverPid` is a live process that plausibly IS a Swipium/node server. The `ps`
+ *  check guards against an OS-recycled server pid making us "adopt" a real orphan forever. */
+function serverStillAlive(serverPid) {
+    if (serverPid === process.pid)
+        return false; // our pid at startup = a recycled dead server's
+    if (!pidAlive(serverPid))
+        return false;
+    const cmd = psCommand(serverPid);
+    return cmd != null && /node|swipium/i.test(cmd);
+}
+/** Is this child pid registered to a DIFFERENT, still-live server instance? (adopt, don't touch) */
+export function pidOwnedByLiveServer(pid) {
+    const entry = readEntries().find((e) => e.pid === pid);
+    return !!entry && serverStillAlive(entry.serverPid);
+}
+/** Verify (via `ps`) that `pid` still runs a command matching `kind`, then kill or adopt it.
+ *  Never signals a pid whose command no longer matches — that pid was recycled by the OS. */
+export function reclaimPid(pid, kind) {
+    if (!pidAlive(pid))
+        return 'gone';
+    const cmd = psCommand(pid);
+    if (!cmd || !KIND_COMMAND_RE[kind].test(cmd))
+        return 'recycled';
+    if (kind === 'emulator')
+        return 'adopted'; // still a real emulator — leave it booted (usable via adb)
+    return killTree(pid) ? 'killed' : 'gone';
+}
+/** Startup sweep (called once from startServer): reap children whose owning server died. */
+export function reapOrphanedProcesses() {
+    mutateEntries((entries) => {
+        const keep = [];
+        for (const e of entries) {
+            if (serverStillAlive(e.serverPid)) {
+                keep.push(e); // a live concurrent server owns it — not ours to touch
+                continue;
+            }
+            const outcome = reclaimPid(e.pid, e.kind);
+            if (outcome === 'killed') {
+                log('warn', 'reaped orphaned child process from a previous server run', { pid: e.pid, kind: e.kind, sessionId: e.sessionId });
+            }
+            else if (outcome === 'adopted') {
+                log('info', 'adopted orphaned emulator (left booted; reachable via adb)', { pid: e.pid, sessionId: e.sessionId });
+            }
+            else if (outcome === 'recycled') {
+                log('info', 'dropped orphan entry: PID was recycled by an unrelated process — not signalled', { pid: e.pid, kind: e.kind });
+            }
+            // In every non-live-owner case the entry is dropped: it has been handled.
+        }
+        return keep;
+    });
+}
+//# sourceMappingURL=processRegistry.js.map

package/dist/session/processRegistry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"processRegistry.js","sourceRoot":"","sources":["../../src/session/processRegistry.ts"],"names":[],"mappings":"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"}

package/dist/session/progress.js

@@ -51,6 +51,6 @@ export function progressLine(p) {
     if (!p)
         return undefined;
     const sec = Math.round((p.updatedAt - p.startedAt) / 1000);
-    return `${p.phase} (${sec}s)${p.userActionRequired ? ' ⚠ needs you' : ''}: ${p.statusText}` + (p.nextExpected ? ` → ${p.nextExpected}` : '');
+    return (`${p.phase} (${sec}s)${p.userActionRequired ? ' ⚠ needs you' : ''}: ${p.statusText}` + (p.nextExpected ? ` → ${p.nextExpected}` : ''));
 }
 //# sourceMappingURL=progress.js.map

package/dist/session/progress.js.map

@@ -1 +1 @@
-{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../src/session/progress.ts"],"names":[],"mappings":"AAAA,+FAA+F;AAC/F,gGAAgG;AAChG,gGAAgG;AAChG,gGAAgG;AAahG,MAAM,UAAU,aAAa,CAC3B,QAAsB,EACtB,OAAgB,EAChB,GAAc,EACd,KAAa,EACb,OAAuE,EAAE,UAAU,EAAE,KAAK,EAAE;IAE5F,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,MAAM,KAAK,GAAkB;QAC3B,KAAK;QACL,SAAS,EAAE,GAAG;QACd,SAAS,EAAE,GAAG;QACd,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,kBAAkB,EAAE,KAAK;KAC1B,CAAC;IACF,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,QAAQ,CAAC,kBAAkB,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,KAAK,CAAC,UAAU,EAAE,cAAc,EAAE,EAAE,GAAG,KAAK,EAAE,EAAE,CAAC,CAAC;IAC1G,CAAC,CAAC;IACF,KAAK,EAAE,CAAC;IACR,OAAO;QACL,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;QACnE,KAAK,CAAC,SAAS,EAAE,IAAI;YACnB,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;YAC5B,IAAI,IAAI,EAAE,UAAU;gBAAE,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;YACzD,IAAI,IAAI,EAAE,YAAY;gBAAE,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;YAC/D,KAAK,EAAE,CAAC;QACV,CAAC;QACD,MAAM,CAAC,MAAM;YACX,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;YACtB,KAAK,EAAE,CAAC;QACV,CAAC;QACD,SAAS,CAAC,UAAU;YAClB,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAChC,KAAK,CAAC,UAAU,GAAG,UAAU,CAAC;YAC9B,KAAK,EAAE,CAAC;QACV,CAAC;QACD,IAAI,CAAC,UAAU;YACb,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC;YACjC,IAAI,UAAU;gBAAE,KAAK,CAAC,UAAU,GAAG,UAAU,CAAC;YAC9C,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC;YAC/B,KAAK,EAAE,CAAC;QACV,CAAC;KACF,CAAC;AACJ,CAAC;AAED,uEAAuE;AACvE,MAAM,UAAU,YAAY,CAAC,CAA4B;IACvD,IAAI,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IACzB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC;IAC3D,OAAO,GAAG,CAAC,CAAC,KAAK,KAAK,GAAG,KAAK,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAC/I,CAAC"}
+{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../src/session/progress.ts"],"names":[],"mappings":"AAAA,+FAA+F;AAC/F,gGAAgG;AAChG,gGAAgG;AAChG,gGAAgG;AAahG,MAAM,UAAU,aAAa,CAC3B,QAAsB,EACtB,OAAgB,EAChB,GAAc,EACd,KAAa,EACb,OAAuE,EAAE,UAAU,EAAE,KAAK,EAAE;IAE5F,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,MAAM,KAAK,GAAkB;QAC3B,KAAK;QACL,SAAS,EAAE,GAAG;QACd,SAAS,EAAE,GAAG;QACd,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,kBAAkB,EAAE,KAAK;KAC1B,CAAC;IACF,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,QAAQ,CAAC,kBAAkB,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,KAAK,CAAC,UAAU,EAAE,cAAc,EAAE,EAAE,GAAG,KAAK,EAAE,EAAE,CAAC,CAAC;IAC1G,CAAC,CAAC;IACF,KAAK,EAAE,CAAC;IACR,OAAO;QACL,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;QACnE,KAAK,CAAC,SAAS,EAAE,IAAI;YACnB,KAAK,CAAC,SAAS,GAAG,SAAS,CAAC;YAC5B,IAAI,IAAI,EAAE,UAAU;gBAAE,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;YACzD,IAAI,IAAI,EAAE,YAAY;gBAAE,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;YAC/D,KAAK,EAAE,CAAC;QACV,CAAC;QACD,MAAM,CAAC,MAAM;YACX,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;YACtB,KAAK,EAAE,CAAC;QACV,CAAC;QACD,SAAS,CAAC,UAAU;YAClB,KAAK,CAAC,kBAAkB,GAAG,IAAI,CAAC;YAChC,KAAK,CAAC,UAAU,GAAG,UAAU,CAAC;YAC9B,KAAK,EAAE,CAAC;QACV,CAAC;QACD,IAAI,CAAC,UAAU;YACb,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC;YACjC,IAAI,UAAU;gBAAE,KAAK,CAAC,UAAU,GAAG,UAAU,CAAC;YAC9C,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC;YAC/B,KAAK,EAAE,CAAC;QACV,CAAC;KACF,CAAC;AACJ,CAAC;AAED,uEAAuE;AACvE,MAAM,UAAU,YAAY,CAAC,CAA4B;IACvD,IAAI,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IACzB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC;IAC3D,OAAO,CACL,GAAG,CAAC,CAAC,KAAK,KAAK,GAAG,KAAK,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CACtI,CAAC;AACJ,CAAC"}

package/dist/session/store.js

@@ -1,15 +1,20 @@
 // Session + job + artifact store with DISK PERSISTENCE (DESIGN §3, M6).
 // Live, non-serializable bits (driver, lastSnapshot, abort controllers) stay in memory;
-// a serializable subset is written to <sessionDir>/state.json on every mutation, and a
-// small registry under ~/.swipium/registry.json lets a fresh server instance reload
-// prior sessions so artifacts/reports/job-status survive a server restart. (A restart does
-// NOT resurrect a running child process — such jobs are marked failed on reload.)
+// a serializable subset is written to <sessionDir>/state.json on mutation (debounced;
+// synchronous for the mutation ledger + session creation + shutdown flush), and a small
+// registry under ~/.swipium/registry.json — lock-guarded, lazily loaded on first access —
+// lets a fresh server instance reload prior sessions so artifacts/reports/job-status survive
+// a server restart. (A restart does NOT resurrect a running child process — such jobs are
+// marked failed on reload, and orphaned Metro pids are verified via `ps` and reaped.)
 import { createHash, randomUUID } from 'node:crypto';
-import { mkdirSync, writeFileSync, readFileSync, existsSync } from 'node:fs';
+import { mkdirSync, writeFileSync, readFileSync, existsSync, renameSync } from 'node:fs';
 import { join, resolve } from 'node:path';
 import { homedir } from 'node:os';
 import { DEFAULT_RESPONSE_MODE } from '../lib/result.js';
 import { makeRedactor } from '../lib/redact.js';
+import { withFileLock } from '../lib/lockfile.js';
+import { log } from '../lib/logger.js';
+import { pidOwnedByLiveServer, reclaimPid } from './processRegistry.js';
 // Phase 2.2 P1.6: budget classes (minutes) keyed by workflow ambition.
 export const BUDGET_PROFILES = {
     guardrail: 8, // guardrail/setup validation
@@ -40,8 +45,10 @@ export function isTextArtifactMime(mime) {
 }
 export function artifactDirectoryName(kind) {
     switch (kind) {
-        case 'screenshot': return 'screenshots';
-        case 'recording': return 'videos';
+        case 'screenshot':
+            return 'screenshots';
+        case 'recording':
+            return 'videos';
         case 'logs':
         case 'logcat':
         case 'metro':
@@ -55,56 +62,152 @@ function defaultSessionDir(root, id) {
     const projectHash = createHash('sha256').update(resolve(root)).digest('hex').slice(0, 16);
     return join(REGISTRY_DIR, 'runs', projectHash, id);
 }
+/** Trailing debounce for state.json writes (P2 write amplification): every mutator used to
+ * rewrite the full file synchronously. Correctness-critical writes (session creation, the
+ * mutation ledger, shutdown) still flush synchronously via persistNow()/flushAll(). */
+const PERSIST_DEBOUNCE_MS = 150;
 export class SessionStore {
     sessions = new Map();
-    constructor() {
+    // Lazy prior-session loading (P2 startup cost): the registry of up to 200 prior sessions is
+    // read on first access (get/list/find/create), not in the constructor.
+    registryLoaded = false;
+    dirty = new Set();
+    flushTimer;
+    ensureRegistryLoaded() {
+        if (this.registryLoaded)
+            return;
+        this.registryLoaded = true;
         this.loadRegistry();
     }
     create(root, budget, opts) {
+        this.ensureRegistryLoaded();
         const id = randomUUID().slice(0, 8);
         const dir = opts?.sessionDir ?? defaultSessionDir(root, id);
         mkdirSync(dir, { recursive: true });
         const now = Date.now();
         const s = {
-            id, root, dir, createdAt: now, screenshotCount: 0,
+            id,
+            root,
+            dir,
+            createdAt: now,
+            screenshotCount: 0,
             mode: 'structured',
             responseMode: opts?.responseMode ?? DEFAULT_RESPONSE_MODE,
             sensitive: opts?.sensitive ?? false,
             budget: { ...DEFAULT_BUDGET, ...(budget ?? {}) },
             counters: { actions: 0, screenshots: 0, snapshotFailures: 0, noChangeActions: 0 },
-            envChanges: [], workarounds: [],
-            jobs: new Map(), artifacts: [], findings: [], notes: [], mutations: [], recordedActions: [],
-            fixtures: opts?.fixtures ?? [], auth: {}, milestones: { session_start: now }, budgetProfile: opts?.budgetProfile,
-            secrets: new Set(), inputs: [], generatedValues: [], inputValues: new Map(), aborts: new Map(),
+            envChanges: [],
+            workarounds: [],
+            jobs: new Map(),
+            artifacts: [],
+            findings: [],
+            notes: [],
+            mutations: [],
+            recordedActions: [],
+            fixtures: opts?.fixtures ?? [],
+            auth: {},
+            milestones: { session_start: now },
+            budgetProfile: opts?.budgetProfile,
+            secrets: new Set(),
+            inputs: [],
+            generatedValues: [],
+            inputValues: new Map(),
+            aborts: new Map(),
         };
         this.sessions.set(id, s);
         this.appendRegistry(id, dir);
-        this.persist(s);
+        this.persistNow(s); // synchronous: a concurrent instance / crash must see the new session
         return s;
     }
     get(id) {
+        this.ensureRegistryLoaded();
         return this.sessions.get(id);
     }
     list() {
+        this.ensureRegistryLoaded();
         return [...this.sessions.values()];
     }
+    /** Schedule a state.json write (trailing debounce). Mutators call this on every change;
+     * the actual write happens at most once per PERSIST_DEBOUNCE_MS per burst. Use
+     * persistNow()/flushAll() where a synchronous write is required for correctness. */
     persist(s) {
+        this.dirty.add(s);
+        if (this.flushTimer)
+            return;
+        this.flushTimer = setTimeout(() => this.flushDirty(), PERSIST_DEBOUNCE_MS);
+        this.flushTimer.unref?.(); // never keep the process alive just for a pending flush
+    }
+    /** Write this session's state.json immediately (and drop any pending debounce for it). */
+    persistNow(s) {
+        this.dirty.delete(s);
+        this.writeState(s);
+    }
+    /** Flush every dirty session synchronously. Called on shutdown / process exit so a graceful
+     * stop never loses debounced state. */
+    flushAll() {
+        if (this.flushTimer) {
+            clearTimeout(this.flushTimer);
+            this.flushTimer = undefined;
+        }
+        for (const s of [...this.dirty]) {
+            this.dirty.delete(s);
+            this.writeState(s);
+        }
+    }
+    flushDirty() {
+        this.flushTimer = undefined;
+        for (const s of [...this.dirty]) {
+            this.dirty.delete(s);
+            this.writeState(s);
+        }
+    }
+    writeState(s) {
         try {
             const state = {
-                id: s.id, root: s.root, dir: s.dir, createdAt: s.createdAt,
-                device: s.device, appId: s.appId, headless: s.headless, metroPid: s.metroPid, screenshotCount: s.screenshotCount,
-                network: s.network, envChanges: s.envChanges, workarounds: s.workarounds,
-                mode: s.mode, responseMode: s.responseMode, sensitive: s.sensitive, budget: s.budget, counters: s.counters,
-                jobs: [...s.jobs.values()], artifacts: s.artifacts, findings: s.findings, notes: s.notes, mutations: s.mutations, recordedActions: s.recordedActions,
-                fixtures: s.fixtures, auth: s.auth, milestones: s.milestones, budgetProfile: s.budgetProfile,
+                id: s.id,
+                root: s.root,
+                dir: s.dir,
+                createdAt: s.createdAt,
+                device: s.device,
+                appId: s.appId,
+                headless: s.headless,
+                metroPid: s.metroPid,
+                screenshotCount: s.screenshotCount,
+                network: s.network,
+                envChanges: s.envChanges,
+                workarounds: s.workarounds,
+                mode: s.mode,
+                responseMode: s.responseMode,
+                sensitive: s.sensitive,
+                budget: s.budget,
+                counters: s.counters,
+                jobs: [...s.jobs.values()],
+                artifacts: s.artifacts,
+                findings: s.findings,
+                notes: s.notes,
+                mutations: s.mutations,
+                recordedActions: s.recordedActions,
+                fixtures: s.fixtures,
+                auth: s.auth,
+                milestones: s.milestones,
+                budgetProfile: s.budgetProfile,
                 inputs: s.inputs, // METADATA only — never the values
                 generatedValues: serializeGeneratedValues(s.generatedValues), // secret raw values redacted before disk
                 exploration: s.exploration,
             };
-            writeFileSync(join(s.dir, 'state.json'), JSON.stringify(state, null, 2));
+            // Atomic write (tmp + rename) so a crash mid-write never leaves a truncated state.json.
+            const target = join(s.dir, 'state.json');
+            const tmp = `${target}.${process.pid}.tmp`;
+            writeFileSync(tmp, JSON.stringify(state, null, 2));
+            renameSync(tmp, target);
         }
-        catch {
-            /* best-effort */
+        catch (e) {
+            // A silent failure here means session state (jobs/artifacts/findings) is lost on restart.
+            log('error', 'failed to persist session state.json — this session will not survive a server restart', {
+                sessionId: s.id,
+                dir: s.dir,
+                err: String(e),
+            });
         }
     }
     // ---- jobs ----
@@ -191,10 +294,10 @@ export class SessionStore {
         s.mutations.push(rec);
         if (s.mutations.length > 500)
             s.mutations.splice(0, s.mutations.length - 500);
-        this.persist(s);
+        this.persistNow(s); // the mutation ledger is an audit trail — never leave it debounce-only
         return rec;
     }
-    /** Append an action-IR step (bounded) for qa_flow_generate. */
+    /** Append an action-IR step (bounded) for qa_generate target:"flow". */
     addRecordedAction(s, ra) {
         s.recordedActions.push(ra);
         if (s.recordedActions.length > 300)
@@ -255,15 +358,27 @@ export class SessionStore {
         mkdirSync(sub, { recursive: true });
         const path = join(sub, name);
         const redact = makeRedactor(s.secrets);
-        const storedData = typeof data === 'string' && isTextArtifactMime(mime) ? (redact(data) ?? '') : data;
+        const isRedactableText = typeof data === 'string' && isTextArtifactMime(mime);
+        const storedData = isRedactableText ? (redact(data) ?? '') : data;
         const storedLabel = label ? redact(label) : label;
         writeFileSync(path, storedData);
         const uri = `swipium://session/${s.id}/${kind}/${name}`;
-        s.artifacts.push({ uri, path, mime, kind, createdAt: Date.now(), label: storedLabel });
+        // Binary artifacts (screenshots/recordings) cannot be redacted — tag them explicitly so
+        // consumers (qa_get_artifact, reports) know pixels may show sensitive on-screen content.
+        s.artifacts.push({
+            uri,
+            path,
+            mime,
+            kind,
+            createdAt: Date.now(),
+            label: storedLabel,
+            redaction: isRedactableText ? 'applied' : 'not-applied',
+        });
         this.persist(s);
         return uri;
     }
     findArtifact(uri) {
+        this.ensureRegistryLoaded();
         for (const s of this.sessions.values()) {
             const rec = s.artifacts.find((a) => a.uri === uri);
             if (rec)
@@ -271,7 +386,7 @@ export class SessionStore {
         }
         return undefined;
     }
-    // ---- persistence reload ----
+    // ---- persistence reload (lazy — triggered by the first get/list/find/create) ----
     loadRegistry() {
         try {
             if (!existsSync(REGISTRY))
@@ -283,6 +398,9 @@ export class SessionStore {
                     continue;
                 try {
                     const st = JSON.parse(readFileSync(sp, 'utf8'));
+                    // Never clobber a LIVE session created by this process (lazy load can run after create()).
+                    if (typeof st.id === 'string' && this.sessions.has(st.id))
+                        continue;
                     const jobs = new Map((st.jobs ?? []).map((j) => [j.jobId, j]));
                     for (const j of jobs.values()) {
                         if (j.status === 'running') {
@@ -290,39 +408,94 @@ export class SessionStore {
                             j.error = 'server restarted while job was running (child process gone)';
                         }
                     }
+                    // Orphaned-process handling: a prior server persisted its Metro pid. If no live
+                    // server instance owns that pid, verify via `ps` that it still IS a bundler-ish
+                    // process and reap it; a recycled pid is never signalled. Either way the reloaded
+                    // session drops the pid — it is not ours to manage (or stop) anymore.
+                    if (typeof st.metroPid === 'number' && st.metroPid > 0) {
+                        if (!pidOwnedByLiveServer(st.metroPid)) {
+                            const outcome = reclaimPid(st.metroPid, 'metro');
+                            if (outcome === 'killed')
+                                log('warn', 'reaped orphaned Metro bundler from a previous server run', { pid: st.metroPid, sessionId: st.id });
+                        }
+                        st.metroPid = undefined; // reaped, gone, recycled, or another live server's — never ours
+                    }
                     const s = {
-                        id: st.id, root: st.root, dir: st.dir, createdAt: st.createdAt,
-                        device: st.device, appId: st.appId, headless: st.headless, metroPid: st.metroPid, screenshotCount: st.screenshotCount ?? 0,
-                        network: st.network, envChanges: st.envChanges ?? [], workarounds: st.workarounds ?? [],
+                        id: st.id,
+                        root: st.root,
+                        dir: st.dir,
+                        createdAt: st.createdAt,
+                        device: st.device,
+                        appId: st.appId,
+                        headless: st.headless,
+                        metroPid: st.metroPid,
+                        screenshotCount: st.screenshotCount ?? 0,
+                        network: st.network,
+                        envChanges: st.envChanges ?? [],
+                        workarounds: st.workarounds ?? [],
                         mode: st.mode ?? 'structured',
                         responseMode: st.responseMode ?? DEFAULT_RESPONSE_MODE,
                         sensitive: st.sensitive ?? false,
                         budget: { ...DEFAULT_BUDGET, ...(st.budget ?? {}) },
                         counters: { actions: 0, screenshots: 0, snapshotFailures: 0, noChangeActions: 0, ...(st.counters ?? {}) },
-                        jobs, artifacts: st.artifacts ?? [], findings: st.findings ?? [], notes: st.notes ?? [], mutations: st.mutations ?? [], recordedActions: st.recordedActions ?? [],
-                        fixtures: st.fixtures ?? [], auth: st.auth ?? {}, milestones: st.milestones ?? { session_start: st.createdAt }, budgetProfile: st.budgetProfile,
-                        secrets: new Set(), inputs: st.inputs ?? [], generatedValues: st.generatedValues ?? [], inputValues: new Map(), exploration: st.exploration, aborts: new Map(),
+                        jobs,
+                        artifacts: st.artifacts ?? [],
+                        findings: st.findings ?? [],
+                        notes: st.notes ?? [],
+                        mutations: st.mutations ?? [],
+                        recordedActions: st.recordedActions ?? [],
+                        fixtures: st.fixtures ?? [],
+                        auth: st.auth ?? {},
+                        milestones: st.milestones ?? { session_start: st.createdAt },
+                        budgetProfile: st.budgetProfile,
+                        secrets: new Set(),
+                        inputs: st.inputs ?? [],
+                        generatedValues: st.generatedValues ?? [],
+                        inputValues: new Map(),
+                        exploration: st.exploration,
+                        aborts: new Map(),
                     };
                     this.sessions.set(s.id, s);
                 }
-                catch {
-                    /* skip a corrupt session */
+                catch (e) {
+                    // Skip a corrupt session, but say so — otherwise prior artifacts/reports vanish silently.
+                    log('warn', 'skipping corrupt prior session state.json on reload', { dir, err: String(e) });
                 }
             }
         }
-        catch {
-            /* no registry */
+        catch (e) {
+            log('warn', 'session registry unreadable — prior sessions will not be reloaded', { registry: REGISTRY, err: String(e) });
         }
     }
+    /** Append this session to the shared ~/.swipium/registry.json. Guarded by an advisory
+     * lockfile + atomic rename so two concurrent server instances (common with multiple MCP
+     * clients) never clobber each other's read-modify-write. */
     appendRegistry(id, dir) {
         try {
             mkdirSync(REGISTRY_DIR, { recursive: true });
-            const reg = existsSync(REGISTRY) ? JSON.parse(readFileSync(REGISTRY, 'utf8')) : [];
-            reg.push({ id, dir });
-            writeFileSync(REGISTRY, JSON.stringify(reg.slice(-200), null, 2));
+            withFileLock(`${REGISTRY}.lock`, () => {
+                let reg = [];
+                if (existsSync(REGISTRY)) {
+                    try {
+                        const parsed = JSON.parse(readFileSync(REGISTRY, 'utf8'));
+                        if (Array.isArray(parsed))
+                            reg = parsed;
+                    }
+                    catch (e) {
+                        log('warn', 'registry.json corrupt — rebuilding it (prior sessions may need re-registration)', {
+                            registry: REGISTRY,
+                            err: String(e),
+                        });
+                    }
+                }
+                reg.push({ id, dir });
+                const tmp = `${REGISTRY}.${process.pid}.tmp`;
+                writeFileSync(tmp, JSON.stringify(reg.slice(-200), null, 2));
+                renameSync(tmp, REGISTRY); // atomic on the same filesystem
+            });
         }
-        catch {
-            /* best-effort */
+        catch (e) {
+            log('error', 'failed to append session to registry — it will not be reloadable after a restart', { id, dir, err: String(e) });
         }
     }
 }