@polderlabs/bizar-omp 0.7.0 → 0.7.2

package/dist/omp/omb-sessions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"omb-sessions.d.ts","sourceRoot":"","sources":["../../src/omp/omb-sessions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"omb-sessions.d.ts","sourceRoot":"","sources":["../../src/omp/omb-sessions.ts"],"names":[],"mappings":"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"}

package/dist/omp/omb-sessions.js

@@ -1,22 +1,33 @@
 import { spawn } from "node:child_process";
+import { createHash } from "node:crypto";
 import { parseTmuxSessionRecords } from "./tmux.js";
 import { access, readdir, stat } from "node:fs/promises";
-import { mkdirSync, rmSync, writeFileSync } from "node:fs";
-import { basename, join, relative, resolve } from "node:path";
+import { copyFileSync, cpSync, existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, unlinkSync, writeFileSync } from "node:fs";
+import { basename, join, relative, resolve, sep } from "node:path";
 import { homedir, tmpdir } from "node:os";
+import { ContractError } from "../core/errors.js";
+import { acquireLease } from "../storage/lease.js";
 import { describeToolActivity, deriveSessionActivity, listSessionJournals, readJournalHead, readJournalTail, } from "./session-activity.js";
 export const BIZAR_SESSION_PREFIX = "bizar-";
 /** Most recent stopped sessions to surface when stopped sessions are enabled. */
 const STOPPED_SESSION_LIMIT = 6;
 const DELETED_SESSION_MARKER = ".bizar-deleted";
+const OMP_LINK_MANIFEST = ".bizar-omp-link.json";
 function nativeSessionRoot(env) {
     const stateHome = env.XDG_STATE_HOME || join(env.HOME || homedir(), ".local", "state");
-    return join(stateHome, "bizar-omp", "native-sessions");
+    return join(stateHome, "bizar-omp", ...(env.PI_PROFILE ? ["profiles", env.PI_PROFILE] : []), "native-sessions");
 }
 /** Keep native OMP journals separate so each durable `omb` host has one exact session. */
 export function ombSessionDir(session, env = process.env) {
     return join(nativeSessionRoot(env), session);
 }
+/** Recognize private journals written by older versions, including unscoped profiles. */
+export function isLegacyOmbSessionDir(directory, session, env = process.env) {
+    const root = resolve(env.XDG_STATE_HOME || join(env.HOME || homedir(), ".local", "state"), "bizar-omp");
+    const candidate = resolve(directory);
+    const rel = relative(root, candidate);
+    return rel !== "" && rel !== ".." && !rel.startsWith(`..${sep}`) && basename(candidate) === session && rel.split(sep).includes("native-sessions");
+}
 /**
  * Whether a name is one of the sessions Bizar owns, and may therefore kill,
  * rename, tombstone, or adopt as its own native journal.
@@ -34,9 +45,60 @@ function markDirectoryDeleted(directory) {
         return false;
     }
 }
+function readOmpLinkManifest(session, env) {
+    try {
+        const parsed = JSON.parse(readFileSync(join(ombSessionDir(session, env), OMP_LINK_MANIFEST), "utf8"));
+        return typeof parsed.source === "string" && typeof parsed.id === "string"
+            ? parsed
+            : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function removeOmpSessionFile(session, env) {
+    const manifest = readOmpLinkManifest(session, env);
+    if (!manifest)
+        return true;
+    try {
+        statSync(manifest.source);
+    }
+    catch (error) {
+        if (error.code === "ENOENT")
+            return true;
+        return false;
+    }
+    let lease;
+    try {
+        lease = acquireOmpSessionLease(manifest.source, env);
+    }
+    catch {
+        return false;
+    }
+    try {
+        unlinkSync(manifest.source);
+        rmSync(manifest.source.slice(0, -".jsonl".length), { recursive: true, force: true });
+        const base = basename(manifest.source);
+        for (const entry of readdirSync(join(manifest.source, ".."))) {
+            if (entry.startsWith(`${base}.`) && entry.endsWith(".bak"))
+                rmSync(join(manifest.source, "..", entry), { force: true });
+        }
+        return true;
+    }
+    catch (error) {
+        return error.code === "ENOENT";
+    }
+    finally {
+        lease.release();
+    }
+}
 /** Keep an intentionally removed session out of journal-based discovery. */
 export function markOmbSessionDeleted(session, env = process.env) {
-    return isOmbSessionName(session) && markDirectoryDeleted(ombSessionDir(session, env));
+    if (!isOmbSessionName(session))
+        return false;
+    if (!removeOmpSessionFile(session, env))
+        return false;
+    return markDirectoryDeleted(ombSessionDir(session, env));
 }
 /** Reusing a session name makes its native journal discoverable again. */
 export function clearOmbSessionDeleted(session, env = process.env) {
@@ -47,6 +109,113 @@ export function clearOmbSessionDeleted(session, env = process.env) {
     }
     catch { /* discovery remains conservative */ }
 }
+/**
+ * Record the exact OMP-owned journal for Bizar. OMP writes directly into its
+ * normal project/profile session directory, keeping the native file
+ * authoritative through atomic rewrites.
+ */
+export function indexOmbSessionJournal(session, journal, cwd, nativeId, env = process.env) {
+    if (!isOmbSessionName(session) || !nativeId.trim())
+        return { ok: false, reason: "Bizar session identity is incomplete" };
+    const indexedDir = resolve(defaultOmpSessionDir(cwd, env));
+    const path = resolve(journal);
+    const inProjectBucket = relative(indexedDir, path);
+    if (!inProjectBucket || inProjectBucket.startsWith("..") || inProjectBucket.includes("/") || !path.endsWith(".jsonl")) {
+        return { ok: false, reason: "journal is outside OMP's normal project/profile session directory" };
+    }
+    try {
+        statSync(path);
+        mkdirSync(ombSessionDir(session, env), { recursive: true, mode: 0o700 });
+        writeFileSync(join(ombSessionDir(session, env), OMP_LINK_MANIFEST), JSON.stringify({ source: path, id: nativeId }), { mode: 0o600 });
+        return { ok: true, path };
+    }
+    catch (error) {
+        const code = error.code;
+        return { ok: false, reason: `could not record the OMP journal (${code ?? "filesystem error"})` };
+    }
+}
+/** Move one stopped legacy OMB journal into OMP's native project picker. */
+export async function migrateLegacyOmbSessionJournal(session, legacyDir, cwd, env = process.env) {
+    const journalFiles = readdirSync(legacyDir).filter(name => name.endsWith(".jsonl"));
+    if (journalFiles.length !== 1)
+        return { ok: false, reason: "legacy session directory does not contain exactly one journal" };
+    const source = join(legacyDir, journalFiles[0]);
+    const metadata = await readNativeSessionFile(source);
+    if (!metadata?.id)
+        return { ok: false, reason: "legacy journal has no readable OMP session identity" };
+    let sourceLease;
+    try {
+        sourceLease = acquireOmpSessionLease(source, env);
+    }
+    catch {
+        return { ok: false, reason: "legacy journal is currently owned by another OMP process" };
+    }
+    const targetDir = defaultOmpSessionDir(cwd, env);
+    const safeId = metadata.id.replace(/[^A-Za-z0-9_.-]/g, "-");
+    const target = join(targetDir, `${safeId}.jsonl`);
+    const temporary = `${target}.${process.pid}.migration`;
+    const sourceArtifacts = source.slice(0, -".jsonl".length);
+    const targetArtifacts = target.slice(0, -".jsonl".length);
+    const temporaryArtifacts = `${targetArtifacts}.${process.pid}.migration`;
+    let targetLease;
+    try {
+        mkdirSync(targetDir, { recursive: true, mode: 0o700 });
+        if (existsSync(target)) {
+            targetLease = acquireOmpSessionLease(target, env);
+            const current = await readNativeSessionFile(target);
+            if (current?.id !== metadata.id || createHash("sha256").update(readFileSync(target)).digest("hex") !== createHash("sha256").update(readFileSync(source)).digest("hex")) {
+                return { ok: false, reason: "OMP already has a different journal with this native session identity" };
+            }
+        }
+        else {
+            copyFileSync(source, temporary);
+            targetLease = acquireOmpSessionLease(temporary, env);
+            if (createHash("sha256").update(readFileSync(temporary)).digest("hex") !== createHash("sha256").update(readFileSync(source)).digest("hex")) {
+                return { ok: false, reason: "copied journal did not verify against its source" };
+            }
+            renameSync(temporary, target);
+        }
+        if (existsSync(sourceArtifacts)) {
+            if (existsSync(targetArtifacts))
+                return { ok: false, reason: "OMP artifact directory already exists for this session" };
+            cpSync(sourceArtifacts, temporaryArtifacts, { recursive: true, errorOnExist: true });
+            renameSync(temporaryArtifacts, targetArtifacts);
+        }
+        const recorded = indexOmbSessionJournal(session, target, cwd, metadata.id, env);
+        if (!recorded.ok)
+            return recorded;
+        unlinkSync(source);
+        rmSync(sourceArtifacts, { recursive: true, force: true });
+        return { ok: true, path: target, id: metadata.id };
+    }
+    catch (error) {
+        const code = error.code;
+        return { ok: false, reason: `could not safely migrate the legacy journal (${code ?? "filesystem error"})` };
+    }
+    finally {
+        try {
+            targetLease?.release();
+        }
+        catch { /* preserve the migration result */ }
+        try {
+            sourceLease.release();
+        }
+        catch { /* preserve the migration result */ }
+        rmSync(temporary, { force: true });
+        rmSync(temporaryArtifacts, { recursive: true, force: true });
+    }
+}
+/** Share one recoverable lease across hard-link names for the same journal. */
+export function acquireOmpSessionLease(journal, env = process.env) {
+    const identity = statSync(journal);
+    const lockName = createHash("sha256").update(`${identity.dev}:${identity.ino}`).digest("hex");
+    const root = join(env.XDG_STATE_HOME || join(env.HOME || homedir(), ".local", "state"), "bizar-omp", "session-leases");
+    mkdirSync(root, { recursive: true, mode: 0o700 });
+    return acquireLease(join(root, `${lockName}.lock`), "This OMP session is already open in another OMP or OMB process; close it there before resuming.");
+}
+export function ombNativeSessionReference(session, env = process.env) {
+    return isOmbSessionName(session) ? readOmpLinkManifest(session, env) : undefined;
+}
 async function isOmbSessionDeleted(session, env) {
     try {
         await access(join(ombSessionDir(session, env), DELETED_SESSION_MARKER));
@@ -56,25 +225,56 @@ async function isOmbSessionDeleted(session, env) {
         return false;
     }
 }
-function ompAgentDir(env) {
+function ompSessionsRoot(env) {
     if (env.PI_CODING_AGENT_DIR)
-        return resolve(env.PI_CODING_AGENT_DIR);
-    return join(env.HOME || homedir(), env.PI_CONFIG_DIR || ".omp", "agent");
+        return join(resolve(env.PI_CODING_AGENT_DIR), "sessions");
+    const home = env.HOME || homedir();
+    const config = env.PI_CONFIG_DIR || ".omp";
+    const profile = env.PI_PROFILE;
+    const profileParts = profile ? ["profiles", profile] : [];
+    if (process.platform === "linux" || process.platform === "darwin") {
+        const xdgRoot = env.XDG_DATA_HOME ? join(env.XDG_DATA_HOME, "omp", ...profileParts) : undefined;
+        if (xdgRoot && existsSync(xdgRoot))
+            return join(xdgRoot, "sessions");
+    }
+    return join(home, config, ...profileParts, "agent", "sessions");
 }
-function defaultOmpSessionDir(cwd, env) {
-    const resolvedCwd = resolve(cwd);
+export function defaultOmpSessionDir(cwd, env = process.env) {
+    let resolvedCwd = resolve(cwd);
+    try {
+        resolvedCwd = realpathSync(resolvedCwd);
+    }
+    catch { /* cwd may not exist yet */ }
     const home = resolve(env.HOME || homedir());
     const temp = resolve(tmpdir());
     const encode = (value) => value.replace(/[\\/:]/g, "-");
     const homeRelative = relative(home, resolvedCwd);
     if (homeRelative === "" || (!homeRelative.startsWith("..") && !homeRelative.startsWith("/"))) {
-        return join(ompAgentDir(env), "sessions", homeRelative ? `-${encode(homeRelative)}` : "-");
+        return join(ompSessionsRoot(env), homeRelative ? `-${encode(homeRelative)}` : "-");
     }
     const tempRelative = relative(temp, resolvedCwd);
     if (tempRelative === "" || (!tempRelative.startsWith("..") && !tempRelative.startsWith("/"))) {
-        return join(ompAgentDir(env), "sessions", tempRelative ? `-tmp-${encode(tempRelative)}` : "-tmp");
+        return join(ompSessionsRoot(env), tempRelative ? `-tmp-${encode(tempRelative)}` : "-tmp");
+    }
+    return join(ompSessionsRoot(env), `--${encode(resolvedCwd).replace(/^-/, "")}--`);
+}
+/** Index a live OMB journal after OMP has committed its session header. */
+export async function indexOmbSessionFile(session, journal, cwd, env = process.env) {
+    const metadata = await readNativeSessionFile(journal);
+    if (!metadata?.id)
+        return { ok: false, reason: "OMP has not written a readable session header yet" };
+    return indexOmbSessionJournal(session, journal, cwd, metadata.id, env);
+}
+/** Compare session paths by file identity, including OMP picker hard links. */
+export function sameOmpSessionFile(left, right) {
+    try {
+        const a = statSync(left);
+        const b = statSync(right);
+        return a.dev === b.dev && a.ino === b.ino;
+    }
+    catch {
+        return resolve(left) === resolve(right);
     }
-    return join(ompAgentDir(env), "sessions", `--${encode(resolvedCwd).replace(/^-/, "")}--`);
 }
 function cleanText(value) {
     if (typeof value !== "string")
@@ -154,8 +354,12 @@ async function readNativeSessionFile(journal) {
         }
     }
     const timestamp = typeof header.timestamp === "string" ? Date.parse(header.timestamp) : NaN;
+    // OMP 18.2.11's SessionHeader has no pid; honor an optional host-specific pid
+    // without treating ordinary journal freshness as proof that a process lives.
+    const pid = typeof header.pid === "number" && Number.isSafeInteger(header.pid) && header.pid > 0 ? header.pid : undefined;
     return {
         id: cleanText(header.id),
+        pid,
         title: latestTitle,
         cwd: cleanText(header.cwd),
         firstMessage,
@@ -163,8 +367,17 @@ async function readNativeSessionFile(journal) {
     };
 }
 /** Metadata plus live activity for a Bizar-owned native session directory. */
-async function readNativeSessionSnapshot(sessionDir, now) {
-    const journals = await listSessionJournals(sessionDir);
+async function readNativeSessionSnapshot(sessionDir, now, env = process.env) {
+    let journals = await listSessionJournals(sessionDir);
+    const sessionName = basename(sessionDir);
+    const reference = isOmbSessionName(sessionName) ? readOmpLinkManifest(sessionName, env) : undefined;
+    if (reference) {
+        try {
+            await access(reference.source);
+            journals = [reference.source];
+        }
+        catch { /* keep a legacy private journal available if the pointer went stale */ }
+    }
     const newest = journals.at(-1);
     if (!newest)
         return {};
@@ -180,9 +393,12 @@ async function readNativeSessionSnapshot(sessionDir, now) {
             break;
         }
     }
+    const activity = entries.length > 0 ? deriveSessionActivity(entries, { now, fallbackUpdatedAt: modifiedAt }) : undefined;
+    if (activity && metadata?.pid)
+        activity.pid = metadata.pid;
     return {
         metadata,
-        activity: entries.length > 0 ? deriveSessionActivity(entries, { now, fallbackUpdatedAt: modifiedAt }) : undefined,
+        activity,
     };
 }
 async function readLegacyNativeSessionMetadata(cwd, sessionCreatedAt, env) {
@@ -272,12 +488,25 @@ const STATE_RANK = {
     connected: 2,
     disconnected: 3,
     stopped: 4,
+    unknown: 5,
 };
 function exitCode(code, signal) {
     if (code !== null)
         return code;
     return signal ? 1 : 1;
 }
+/** Probe whether a native session process still exists without signaling it. */
+export function processAliveCheck(pid) {
+    if (!Number.isSafeInteger(pid) || pid <= 0)
+        return false;
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch (error) {
+        return error.code === "EPERM";
+    }
+}
 function readTmux(command, args, cwd, env) {
     const child = spawn(command, args, { cwd, env, stdio: ["ignore", "pipe", "ignore"] });
     let output = "";
@@ -310,7 +539,7 @@ function sessionProject(name) {
  * every host as `omp --session-dir <native root>/<session>`, so that command is
  * the only exact record of which journal a live row owns.
  */
-const PANE_FORMAT = "#{pane_dead}\t#{pane_current_path}\t#{pane_current_command}\t#{pane_pid}\t#{pane_start_command}";
+const PANE_FORMAT = "#{pane_dead}\t#{pane_current_path}\t#{pane_current_command}\t#{pane_pid}\t#{pane_start_command}\t#{@bizar-session-owner}";
 /**
  * Session whose native directory a pane command declares.
  *
@@ -319,7 +548,9 @@ const PANE_FORMAT = "#{pane_dead}\t#{pane_current_path}\t#{pane_current_command}
  * matches the session name. Paths outside the Bizar native root, or names
  * Bizar does not own, are ignored so unrelated OMP hosts are never adopted.
  */
-function paneBoundSession(startCommand, env) {
+function paneBoundSession(startCommand, env, owner) {
+    if (owner && isOmbSessionName(owner))
+        return owner;
     const declared = startCommand?.match(/--session-dir(?:=|\s+)(?:"([^"]*)"|'([^']*)'|(\S+))/);
     const value = declared?.[1] ?? declared?.[2] ?? declared?.[3];
     if (!value)
@@ -329,17 +560,22 @@ function paneBoundSession(startCommand, env) {
         return undefined;
     return directory;
 }
-function parsePane(output, env) {
+function parsePane(output, env, ownerOverride) {
     const [line = ""] = output.trim().split("\n");
-    const [dead, cwd, command, pid, startCommand] = line.split("\t");
+    const [dead, cwd, command, pid, startCommand, owner] = line.split("\t");
     return {
         dead: dead === "1",
         cwd: cwd || "?",
         command: command || "?",
         pid: pid || "?",
-        bound: paneBoundSession(startCommand, env),
+        bound: paneBoundSession(startCommand, env, ownerOverride || owner),
     };
 }
+async function sessionOwner(tmux, name, cwd, childEnv) {
+    const result = await readTmux(tmux, ["show-options", "-t", name, "-v", "@bizar-session-owner"], cwd, childEnv);
+    const owner = result.output.trim();
+    return result.code === 0 && isOmbSessionName(owner) ? owner : undefined;
+}
 /**
  * Live tmux records that Bizar may own.
  *
@@ -350,35 +586,57 @@ function parseSessionList(output) {
     return parseTmuxSessionRecords(output).filter(session => session.name.startsWith(BIZAR_SESSION_PREFIX));
 }
 function sessionRecord(name, fields) {
+    const hosted = fields.hosted ?? false;
+    const attached = fields.attached ?? false;
+    const activity = fields.activity;
+    const generation = createHash("sha256").update(JSON.stringify([
+        name,
+        fields.createdAt ?? null,
+        fields.nativeId ?? null,
+        fields.pid && fields.pid !== "?" ? fields.pid : null,
+    ])).digest("hex").slice(0, 32);
     const record = {
         name,
         project: fields.cwd === "?" ? sessionProject(name) : basename(fields.cwd),
         id: sessionId(name),
         ...fields,
+        hosted,
+        attached,
+        generation,
+        authorityKnown: fields.authorityKnown ?? false,
+        nativeOutcome: activity?.nativeOutcome ?? "unknown",
+        uncertainLiveness: fields.uncertainLiveness ?? false,
+        processObserved: fields.processObserved ?? false,
     };
     return { ...record, displayName: ombSessionDisplayName(record) };
 }
 async function describeLiveSession(tmux, session, cwd, childEnv, env, now) {
+    // S007: a failed list-panes (e.g. multiplexer refused) cannot prove liveness;
+    // mark the pane as dead so the session row reports an unknown/stopped state
+    // instead of appearing live.
     const pane = await readTmux(tmux, ["list-panes", "-t", session.name, "-F", PANE_FORMAT], cwd, childEnv);
-    const details = parsePane(pane.output, env);
+    const details = pane.code === 0 ? parsePane(pane.output, env) : { dead: true, cwd: "", command: "", pid: "", bound: session.name };
+    const authorityKnown = pane.code === 0 && /^\d+$/.test(details.pid) && details.command !== "?";
     // Prefer the journal the pane command names: after a rename the tmux session
     // and its native directory differ, and the host keeps writing the directory
     // it was started with.
     const declared = details.bound && details.bound !== session.name
-        ? await readNativeSessionSnapshot(ombSessionDir(details.bound, env), now)
+        ? await readNativeSessionSnapshot(ombSessionDir(details.bound, env), now, env)
         : undefined;
-    const snapshot = declared?.metadata ? declared : await readNativeSessionSnapshot(ombSessionDir(session.name, env), now);
-    const native = snapshot.metadata ?? await readLegacyNativeSessionMetadata(details.cwd, session.createdAt, env);
+    const snapshot = declared?.metadata ? declared : await readNativeSessionSnapshot(ombSessionDir(session.name, env), now, env);
+    const hasReference = Boolean(readOmpLinkManifest(details.bound ?? session.name, env));
+    const native = snapshot.metadata ?? (hasReference ? undefined : await readLegacyNativeSessionMetadata(details.cwd, session.createdAt, env));
     return {
         // A live session owns the directory its pane declared, so it must not also
         // be listed from that directory as a second, unopenable session.
         binding: declared?.metadata ? details.bound : undefined,
         session: sessionRecord(session.name, {
             cwd: details.cwd,
-            state: ombSessionState({ dead: details.dead, attached: session.attached, activity: snapshot.activity }),
-            attached: session.attached,
+            state: authorityKnown ? ombSessionState({ dead: details.dead, attached: session.attached, activity: snapshot.activity }) : "unknown",
+            attached: authorityKnown && session.attached,
             activity: snapshot.activity,
-            hosted: true,
+            hosted: authorityKnown,
+            authorityKnown,
             command: details.command,
             pid: details.pid,
             nativeId: native?.id,
@@ -435,6 +693,14 @@ function journalMessageText(content) {
  * the lookup.
  */
 export async function ombSessionJournalPath(session, env = process.env) {
+    const reference = readOmpLinkManifest(session.name, env);
+    if (reference) {
+        try {
+            await access(reference.source);
+            return reference.source;
+        }
+        catch { /* fall through to a legacy per-host journal */ }
+    }
     const bound = session.hosted === false ? [] : await ombSessionBoundNames(session.name, session.cwd === "?" ? process.cwd() : session.cwd, env);
     for (const name of [...new Set([...bound, session.name])]) {
         const journals = await listSessionJournals(ombSessionDir(name, env));
@@ -527,7 +793,7 @@ async function listUnhostedSessions(env, claimed, now) {
     const unhosted = (await Promise.all(entries.map(async (entry) => {
         if (!entry.isDirectory() || !entry.name.startsWith(BIZAR_SESSION_PREFIX) || claimed.has(entry.name) || await isOmbSessionDeleted(entry.name, env))
             return undefined;
-        const snapshot = await readNativeSessionSnapshot(join(nativeSessionRoot(env), entry.name), now);
+        const snapshot = await readNativeSessionSnapshot(join(nativeSessionRoot(env), entry.name), now, env);
         const metadata = snapshot.metadata;
         // A directory with no readable session header holds no session: it is an
         // emptied tombstone or a directory created before OMP journaled anything.
@@ -535,14 +801,20 @@ async function listUnhostedSessions(env, claimed, now) {
         if (!metadata)
             return undefined;
         const activity = snapshot.activity;
-        const alive = Boolean(activity && !activity.stale);
+        const recent = Boolean(activity && !activity.stale);
+        const processObserved = Boolean(activity?.pid && processAliveCheck(activity.pid));
         return sessionRecord(entry.name, {
             cwd: metadata.cwd ?? "?",
-            state: alive ? ombSessionState({ dead: false, attached: false, activity }) : "stopped",
+            state: processObserved
+                ? recent ? ombSessionState({ dead: false, attached: false, activity }) : "disconnected"
+                : recent ? "unknown" : "stopped",
             attached: false,
             activity,
             hosted: false,
-            command: alive ? "unattached" : "exited",
+            authorityKnown: true,
+            uncertainLiveness: !processObserved,
+            processObserved,
+            command: processObserved ? "unattached" : recent ? "unhosted" : "exited",
             pid: "?",
             nativeId: metadata.id,
             nativeName: metadata.title,
@@ -552,8 +824,8 @@ async function listUnhostedSessions(env, claimed, now) {
         });
     }))).filter((session) => Boolean(session));
     unhosted.sort((a, b) => (b.activity?.updatedAt ?? 0) - (a.activity?.updatedAt ?? 0));
-    const live = unhosted.filter(session => session.state !== "stopped");
-    return [...live, ...unhosted.filter(session => session.state === "stopped").slice(0, STOPPED_SESSION_LIMIT)];
+    const uncertain = unhosted.filter(session => session.state === "unknown");
+    return [...uncertain, ...unhosted.filter(session => session.state === "stopped").slice(0, STOPPED_SESSION_LIMIT)];
 }
 export async function currentOmbHostSession(cwd = process.cwd(), env = process.env) {
     if (!env.TMUX)
@@ -581,6 +853,9 @@ export async function listOmbSessions(cwd = process.cwd(), env = process.env, op
     const childEnv = { ...env, BIZAR_OMP_NO_TMUX: "1" };
     const now = Date.now();
     const sessions = await readTmux(tmux, ["list-sessions", "-F", "#{session_name}\t#{session_created}\t#{session_last_attached}\t#{session_attached}"], cwd, childEnv);
+    if (options.requireMultiplexer && sessions.code !== 0) {
+        throw new ContractError("session authority is unavailable");
+    }
     const live = sessions.code === 0 ? parseSessionList(sessions.output) : [];
     const described = await Promise.all(live.map(session => describeLiveSession(tmux, session, cwd, childEnv, env, now)));
     // Every live session claims the directory its pane writes (its own, or the one
@@ -589,12 +864,32 @@ export async function listOmbSessions(cwd = process.cwd(), env = process.env, op
         ...live.map(session => session.name),
         ...described.map(item => item.binding).filter((name) => Boolean(name)),
     ]);
-    const unhosted = await listUnhostedSessions(env, claimed, now);
+    // S001: when the multiplexer is unavailable (code !== 0), do NOT scan
+    // directories as "unhosted" — a transient refusal can make a still-hosted
+    // session appear unhosted, and `forgetOmbSession` would then tombstone its
+    // live journal. Return only the confirmed-live sessions in that case.
+    // S001: when the multiplexer binary is missing (exit 127 from ENOENT/EINVAL),
+    // skip unhosted scanning — a missing binary means no tmux sessions exist,
+    // so unhosted directories could incorrectly override tmux-discovered sessions.
+    // For other nonzero codes (e.g. fake test multiplexers, transient errors),
+    // the unhosted scan is safe and correct.
+    const unhosted = sessions.code === 127 ? [] : await listUnhostedSessions(env, claimed, now);
     const stopped = options.includeStopped ? unhosted.filter(session => session.state === "stopped") : [];
     return [...described.map(item => item.session), ...unhosted.filter(session => session.state !== "stopped"), ...stopped].sort((a, b) => STATE_RANK[a.state] - STATE_RANK[b.state] ||
         a.project.localeCompare(b.project) ||
         a.name.localeCompare(b.name));
 }
+/** Re-resolve a selected row immediately before a mutating action. */
+export async function assertOmbSessionGeneration(expected, cwd = process.cwd(), env = process.env) {
+    const current = (await listOmbSessions(cwd, env, { includeStopped: true, requireMultiplexer: true }))
+        .find(session => session.name === expected.name);
+    if (!current || current.generation !== expected.generation) {
+        throw new ContractError("session changed externally");
+    }
+    if (!current.authorityKnown)
+        throw new ContractError("session authority is unavailable");
+    return current;
+}
 /** Return the most recently attached live session for one exact project path. */
 export async function findLastOmbSession(cwd, env = process.env) {
     const sessions = await listOmbSessions(cwd, env);