@nuucognition/flint-cli 0.5.0-alpha.0 → 0.5.1

package/dist/index.js

@@ -34,6 +34,7 @@ import {
   getGitStatus,
   getIdentity,
   getInstalledShardsWithVersions,
+  getMigrationsForVersion,
   getPendingQuestion,
   getPlate,
   getPreset,
@@ -46,6 +47,7 @@ import {
   getStatus,
   getTinderboxStatus,
   getUnfulfilledCodebases,
+  getVersionSteps,
   hasConflictMarkers,
   hasUncommittedChanges,
   hasUnpushedCommits,
@@ -60,6 +62,7 @@ import {
   isOwnerRepo,
   isRebaseInProgress,
   isValidStatus,
+  isVersionStepSealed,
   listPlateTools,
   listPlates,
   listPresets,
@@ -89,6 +92,7 @@ import {
   runMigrations,
   runPlateTool,
   runShardScript,
+  runSingleMigration,
   scaffoldNewShard,
   scanTinderboxFlints,
   setCurrentRunResult,
@@ -107,7 +111,7 @@ import {
   updateSession,
   updateShards,
   updateSourceRepository
-} from "./chunk-HZD727IL.js";
+} from "./chunk-XWUP7WHQ.js";
 import {
   cleanRegistryFile,
   findFlintByName,
@@ -118,7 +122,7 @@ import {
   registerFlintByPath,
   unregisterFlint,
   upsertFlintEntry
-} from "./chunk-O7OVKLLV.js";
+} from "./chunk-C66KJDI7.js";
 import "./chunk-V7YA5RXL.js";
 import {
   generateSourceMeshExportMetadata,
@@ -126,14 +130,14 @@ import {
   removeSourceMeshExportMetadata,
   removeSourceRepoMetadata,
   resolveSource
-} from "./chunk-PONDZIXS.js";
+} from "./chunk-M3NSYVYR.js";
 import {
   buildExport,
   buildExportByName,
   cleanupStaleExports,
   scanExportEligible,
   scanExports
-} from "./chunk-ZP5A4PAH.js";
+} from "./chunk-VAJMJ47E.js";
 import {
   addExportToConfig,
   addLatticeDeclaration,
@@ -155,7 +159,6 @@ import {
   hasFlintJson,
   hasFlintToml,
   isLocalShard,
-  parse,
   readFlintToml,
   readLatticesState,
   removeExportFromConfig,
@@ -165,26 +168,853 @@ import {
   removeSourceRepository,
   removeWorkspaceRepository,
   resolveShardMode,
-  stringify,
   toKebabCase,
   writeFlintJson,
   writeFlintToml
-} from "./chunk-XCVQLFHY.js";
+} from "./chunk-CBGQBE6C.js";
 
 // src/index.ts
 import { Command as Command37 } from "commander";
-import { readFileSync as readFileSync5, existsSync as existsSync10, cpSync, mkdirSync as mkdirSync4, readdirSync as readdirSync4 } from "fs";
+import { readFileSync as readFileSync10, existsSync as existsSync13, cpSync, mkdirSync as mkdirSync5, readdirSync as readdirSync7 } from "fs";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { dirname as dirname4, join as join18 } from "path";
-import { homedir as homedir9 } from "os";
+import { homedir as homedir10 } from "os";
 import pc42 from "picocolors";
 
-// ../../node_modules/.pnpm/@nuucognition+cli-core@0.0.1-beta.5/node_modules/@nuucognition/cli-core/dist/index.js
+// ../../../main/packages/cli-core/dist/index.js
 import { homedir } from "os";
 import { join } from "path";
 import { mkdir, readFile as fsReadFile, writeFile as fsWriteFile } from "fs/promises";
 import { readFileSync as fsReadFileSync } from "fs";
 import { dirname } from "path";
+
+// ../../../main/node_modules/.pnpm/smol-toml@1.6.0/node_modules/smol-toml/dist/error.js
+function getLineColFromPtr(string, ptr) {
+  let lines = string.slice(0, ptr).split(/\r\n|\n|\r/g);
+  return [lines.length, lines.pop().length + 1];
+}
+function makeCodeBlock(string, line, column) {
+  let lines = string.split(/\r\n|\n|\r/g);
+  let codeblock = "";
+  let numberLen = (Math.log10(line + 1) | 0) + 1;
+  for (let i = line - 1; i <= line + 1; i++) {
+    let l = lines[i - 1];
+    if (!l)
+      continue;
+    codeblock += i.toString().padEnd(numberLen, " ");
+    codeblock += ":  ";
+    codeblock += l;
+    codeblock += "\n";
+    if (i === line) {
+      codeblock += " ".repeat(numberLen + column + 2);
+      codeblock += "^\n";
+    }
+  }
+  return codeblock;
+}
+var TomlError = class extends Error {
+  line;
+  column;
+  codeblock;
+  constructor(message, options) {
+    const [line, column] = getLineColFromPtr(options.toml, options.ptr);
+    const codeblock = makeCodeBlock(options.toml, line, column);
+    super(`Invalid TOML document: ${message}
+
+${codeblock}`, options);
+    this.line = line;
+    this.column = column;
+    this.codeblock = codeblock;
+  }
+};
+
+// ../../../main/node_modules/.pnpm/smol-toml@1.6.0/node_modules/smol-toml/dist/util.js
+function isEscaped(str, ptr) {
+  let i = 0;
+  while (str[ptr - ++i] === "\\")
+    ;
+  return --i && i % 2;
+}
+function indexOfNewline(str, start = 0, end = str.length) {
+  let idx = str.indexOf("\n", start);
+  if (str[idx - 1] === "\r")
+    idx--;
+  return idx <= end ? idx : -1;
+}
+function skipComment(str, ptr) {
+  for (let i = ptr; i < str.length; i++) {
+    let c = str[i];
+    if (c === "\n")
+      return i;
+    if (c === "\r" && str[i + 1] === "\n")
+      return i + 1;
+    if (c < " " && c !== "	" || c === "\x7F") {
+      throw new TomlError("control characters are not allowed in comments", {
+        toml: str,
+        ptr
+      });
+    }
+  }
+  return str.length;
+}
+function skipVoid(str, ptr, banNewLines, banComments) {
+  let c;
+  while ((c = str[ptr]) === " " || c === "	" || !banNewLines && (c === "\n" || c === "\r" && str[ptr + 1] === "\n"))
+    ptr++;
+  return banComments || c !== "#" ? ptr : skipVoid(str, skipComment(str, ptr), banNewLines);
+}
+function skipUntil(str, ptr, sep, end, banNewLines = false) {
+  if (!end) {
+    ptr = indexOfNewline(str, ptr);
+    return ptr < 0 ? str.length : ptr;
+  }
+  for (let i = ptr; i < str.length; i++) {
+    let c = str[i];
+    if (c === "#") {
+      i = indexOfNewline(str, i);
+    } else if (c === sep) {
+      return i + 1;
+    } else if (c === end || banNewLines && (c === "\n" || c === "\r" && str[i + 1] === "\n")) {
+      return i;
+    }
+  }
+  throw new TomlError("cannot find end of structure", {
+    toml: str,
+    ptr
+  });
+}
+function getStringEnd(str, seek) {
+  let first = str[seek];
+  let target = first === str[seek + 1] && str[seek + 1] === str[seek + 2] ? str.slice(seek, seek + 3) : first;
+  seek += target.length - 1;
+  do
+    seek = str.indexOf(target, ++seek);
+  while (seek > -1 && first !== "'" && isEscaped(str, seek));
+  if (seek > -1) {
+    seek += target.length;
+    if (target.length > 1) {
+      if (str[seek] === first)
+        seek++;
+      if (str[seek] === first)
+        seek++;
+    }
+  }
+  return seek;
+}
+
+// ../../../main/node_modules/.pnpm/smol-toml@1.6.0/node_modules/smol-toml/dist/date.js
+var DATE_TIME_RE = /^(\d{4}-\d{2}-\d{2})?[T ]?(?:(\d{2}):\d{2}(?::\d{2}(?:\.\d+)?)?)?(Z|[-+]\d{2}:\d{2})?$/i;
+var TomlDate = class _TomlDate extends Date {
+  #hasDate = false;
+  #hasTime = false;
+  #offset = null;
+  constructor(date) {
+    let hasDate = true;
+    let hasTime = true;
+    let offset = "Z";
+    if (typeof date === "string") {
+      let match = date.match(DATE_TIME_RE);
+      if (match) {
+        if (!match[1]) {
+          hasDate = false;
+          date = `0000-01-01T${date}`;
+        }
+        hasTime = !!match[2];
+        hasTime && date[10] === " " && (date = date.replace(" ", "T"));
+        if (match[2] && +match[2] > 23) {
+          date = "";
+        } else {
+          offset = match[3] || null;
+          date = date.toUpperCase();
+          if (!offset && hasTime)
+            date += "Z";
+        }
+      } else {
+        date = "";
+      }
+    }
+    super(date);
+    if (!isNaN(this.getTime())) {
+      this.#hasDate = hasDate;
+      this.#hasTime = hasTime;
+      this.#offset = offset;
+    }
+  }
+  isDateTime() {
+    return this.#hasDate && this.#hasTime;
+  }
+  isLocal() {
+    return !this.#hasDate || !this.#hasTime || !this.#offset;
+  }
+  isDate() {
+    return this.#hasDate && !this.#hasTime;
+  }
+  isTime() {
+    return this.#hasTime && !this.#hasDate;
+  }
+  isValid() {
+    return this.#hasDate || this.#hasTime;
+  }
+  toISOString() {
+    let iso = super.toISOString();
+    if (this.isDate())
+      return iso.slice(0, 10);
+    if (this.isTime())
+      return iso.slice(11, 23);
+    if (this.#offset === null)
+      return iso.slice(0, -1);
+    if (this.#offset === "Z")
+      return iso;
+    let offset = +this.#offset.slice(1, 3) * 60 + +this.#offset.slice(4, 6);
+    offset = this.#offset[0] === "-" ? offset : -offset;
+    let offsetDate = new Date(this.getTime() - offset * 6e4);
+    return offsetDate.toISOString().slice(0, -1) + this.#offset;
+  }
+  static wrapAsOffsetDateTime(jsDate, offset = "Z") {
+    let date = new _TomlDate(jsDate);
+    date.#offset = offset;
+    return date;
+  }
+  static wrapAsLocalDateTime(jsDate) {
+    let date = new _TomlDate(jsDate);
+    date.#offset = null;
+    return date;
+  }
+  static wrapAsLocalDate(jsDate) {
+    let date = new _TomlDate(jsDate);
+    date.#hasTime = false;
+    date.#offset = null;
+    return date;
+  }
+  static wrapAsLocalTime(jsDate) {
+    let date = new _TomlDate(jsDate);
+    date.#hasDate = false;
+    date.#offset = null;
+    return date;
+  }
+};
+
+// ../../../main/node_modules/.pnpm/smol-toml@1.6.0/node_modules/smol-toml/dist/primitive.js
+var INT_REGEX = /^((0x[0-9a-fA-F](_?[0-9a-fA-F])*)|(([+-]|0[ob])?\d(_?\d)*))$/;
+var FLOAT_REGEX = /^[+-]?\d(_?\d)*(\.\d(_?\d)*)?([eE][+-]?\d(_?\d)*)?$/;
+var LEADING_ZERO = /^[+-]?0[0-9_]/;
+var ESCAPE_REGEX = /^[0-9a-f]{2,8}$/i;
+var ESC_MAP = {
+  b: "\b",
+  t: "	",
+  n: "\n",
+  f: "\f",
+  r: "\r",
+  e: "\x1B",
+  '"': '"',
+  "\\": "\\"
+};
+function parseString(str, ptr = 0, endPtr = str.length) {
+  let isLiteral = str[ptr] === "'";
+  let isMultiline = str[ptr++] === str[ptr] && str[ptr] === str[ptr + 1];
+  if (isMultiline) {
+    endPtr -= 2;
+    if (str[ptr += 2] === "\r")
+      ptr++;
+    if (str[ptr] === "\n")
+      ptr++;
+  }
+  let tmp = 0;
+  let isEscape;
+  let parsed = "";
+  let sliceStart = ptr;
+  while (ptr < endPtr - 1) {
+    let c = str[ptr++];
+    if (c === "\n" || c === "\r" && str[ptr] === "\n") {
+      if (!isMultiline) {
+        throw new TomlError("newlines are not allowed in strings", {
+          toml: str,
+          ptr: ptr - 1
+        });
+      }
+    } else if (c < " " && c !== "	" || c === "\x7F") {
+      throw new TomlError("control characters are not allowed in strings", {
+        toml: str,
+        ptr: ptr - 1
+      });
+    }
+    if (isEscape) {
+      isEscape = false;
+      if (c === "x" || c === "u" || c === "U") {
+        let code = str.slice(ptr, ptr += c === "x" ? 2 : c === "u" ? 4 : 8);
+        if (!ESCAPE_REGEX.test(code)) {
+          throw new TomlError("invalid unicode escape", {
+            toml: str,
+            ptr: tmp
+          });
+        }
+        try {
+          parsed += String.fromCodePoint(parseInt(code, 16));
+        } catch {
+          throw new TomlError("invalid unicode escape", {
+            toml: str,
+            ptr: tmp
+          });
+        }
+      } else if (isMultiline && (c === "\n" || c === " " || c === "	" || c === "\r")) {
+        ptr = skipVoid(str, ptr - 1, true);
+        if (str[ptr] !== "\n" && str[ptr] !== "\r") {
+          throw new TomlError("invalid escape: only line-ending whitespace may be escaped", {
+            toml: str,
+            ptr: tmp
+          });
+        }
+        ptr = skipVoid(str, ptr);
+      } else if (c in ESC_MAP) {
+        parsed += ESC_MAP[c];
+      } else {
+        throw new TomlError("unrecognized escape sequence", {
+          toml: str,
+          ptr: tmp
+        });
+      }
+      sliceStart = ptr;
+    } else if (!isLiteral && c === "\\") {
+      tmp = ptr - 1;
+      isEscape = true;
+      parsed += str.slice(sliceStart, tmp);
+    }
+  }
+  return parsed + str.slice(sliceStart, endPtr - 1);
+}
+function parseValue(value, toml, ptr, integersAsBigInt) {
+  if (value === "true")
+    return true;
+  if (value === "false")
+    return false;
+  if (value === "-inf")
+    return -Infinity;
+  if (value === "inf" || value === "+inf")
+    return Infinity;
+  if (value === "nan" || value === "+nan" || value === "-nan")
+    return NaN;
+  if (value === "-0")
+    return integersAsBigInt ? 0n : 0;
+  let isInt = INT_REGEX.test(value);
+  if (isInt || FLOAT_REGEX.test(value)) {
+    if (LEADING_ZERO.test(value)) {
+      throw new TomlError("leading zeroes are not allowed", {
+        toml,
+        ptr
+      });
+    }
+    value = value.replace(/_/g, "");
+    let numeric = +value;
+    if (isNaN(numeric)) {
+      throw new TomlError("invalid number", {
+        toml,
+        ptr
+      });
+    }
+    if (isInt) {
+      if ((isInt = !Number.isSafeInteger(numeric)) && !integersAsBigInt) {
+        throw new TomlError("integer value cannot be represented losslessly", {
+          toml,
+          ptr
+        });
+      }
+      if (isInt || integersAsBigInt === true)
+        numeric = BigInt(value);
+    }
+    return numeric;
+  }
+  const date = new TomlDate(value);
+  if (!date.isValid()) {
+    throw new TomlError("invalid value", {
+      toml,
+      ptr
+    });
+  }
+  return date;
+}
+
+// ../../../main/node_modules/.pnpm/smol-toml@1.6.0/node_modules/smol-toml/dist/extract.js
+function sliceAndTrimEndOf(str, startPtr, endPtr) {
+  let value = str.slice(startPtr, endPtr);
+  let commentIdx = value.indexOf("#");
+  if (commentIdx > -1) {
+    skipComment(str, commentIdx);
+    value = value.slice(0, commentIdx);
+  }
+  return [value.trimEnd(), commentIdx];
+}
+function extractValue(str, ptr, end, depth, integersAsBigInt) {
+  if (depth === 0) {
+    throw new TomlError("document contains excessively nested structures. aborting.", {
+      toml: str,
+      ptr
+    });
+  }
+  let c = str[ptr];
+  if (c === "[" || c === "{") {
+    let [value, endPtr2] = c === "[" ? parseArray(str, ptr, depth, integersAsBigInt) : parseInlineTable(str, ptr, depth, integersAsBigInt);
+    if (end) {
+      endPtr2 = skipVoid(str, endPtr2);
+      if (str[endPtr2] === ",")
+        endPtr2++;
+      else if (str[endPtr2] !== end) {
+        throw new TomlError("expected comma or end of structure", {
+          toml: str,
+          ptr: endPtr2
+        });
+      }
+    }
+    return [value, endPtr2];
+  }
+  let endPtr;
+  if (c === '"' || c === "'") {
+    endPtr = getStringEnd(str, ptr);
+    let parsed = parseString(str, ptr, endPtr);
+    if (end) {
+      endPtr = skipVoid(str, endPtr);
+      if (str[endPtr] && str[endPtr] !== "," && str[endPtr] !== end && str[endPtr] !== "\n" && str[endPtr] !== "\r") {
+        throw new TomlError("unexpected character encountered", {
+          toml: str,
+          ptr: endPtr
+        });
+      }
+      endPtr += +(str[endPtr] === ",");
+    }
+    return [parsed, endPtr];
+  }
+  endPtr = skipUntil(str, ptr, ",", end);
+  let slice = sliceAndTrimEndOf(str, ptr, endPtr - +(str[endPtr - 1] === ","));
+  if (!slice[0]) {
+    throw new TomlError("incomplete key-value declaration: no value specified", {
+      toml: str,
+      ptr
+    });
+  }
+  if (end && slice[1] > -1) {
+    endPtr = skipVoid(str, ptr + slice[1]);
+    endPtr += +(str[endPtr] === ",");
+  }
+  return [
+    parseValue(slice[0], str, ptr, integersAsBigInt),
+    endPtr
+  ];
+}
+
+// ../../../main/node_modules/.pnpm/smol-toml@1.6.0/node_modules/smol-toml/dist/struct.js
+var KEY_PART_RE = /^[a-zA-Z0-9-_]+[ \t]*$/;
+function parseKey(str, ptr, end = "=") {
+  let dot = ptr - 1;
+  let parsed = [];
+  let endPtr = str.indexOf(end, ptr);
+  if (endPtr < 0) {
+    throw new TomlError("incomplete key-value: cannot find end of key", {
+      toml: str,
+      ptr
+    });
+  }
+  do {
+    let c = str[ptr = ++dot];
+    if (c !== " " && c !== "	") {
+      if (c === '"' || c === "'") {
+        if (c === str[ptr + 1] && c === str[ptr + 2]) {
+          throw new TomlError("multiline strings are not allowed in keys", {
+            toml: str,
+            ptr
+          });
+        }
+        let eos = getStringEnd(str, ptr);
+        if (eos < 0) {
+          throw new TomlError("unfinished string encountered", {
+            toml: str,
+            ptr
+          });
+        }
+        dot = str.indexOf(".", eos);
+        let strEnd = str.slice(eos, dot < 0 || dot > endPtr ? endPtr : dot);
+        let newLine = indexOfNewline(strEnd);
+        if (newLine > -1) {
+          throw new TomlError("newlines are not allowed in keys", {
+            toml: str,
+            ptr: ptr + dot + newLine
+          });
+        }
+        if (strEnd.trimStart()) {
+          throw new TomlError("found extra tokens after the string part", {
+            toml: str,
+            ptr: eos
+          });
+        }
+        if (endPtr < eos) {
+          endPtr = str.indexOf(end, eos);
+          if (endPtr < 0) {
+            throw new TomlError("incomplete key-value: cannot find end of key", {
+              toml: str,
+              ptr
+            });
+          }
+        }
+        parsed.push(parseString(str, ptr, eos));
+      } else {
+        dot = str.indexOf(".", ptr);
+        let part = str.slice(ptr, dot < 0 || dot > endPtr ? endPtr : dot);
+        if (!KEY_PART_RE.test(part)) {
+          throw new TomlError("only letter, numbers, dashes and underscores are allowed in keys", {
+            toml: str,
+            ptr
+          });
+        }
+        parsed.push(part.trimEnd());
+      }
+    }
+  } while (dot + 1 && dot < endPtr);
+  return [parsed, skipVoid(str, endPtr + 1, true, true)];
+}
+function parseInlineTable(str, ptr, depth, integersAsBigInt) {
+  let res = {};
+  let seen = /* @__PURE__ */ new Set();
+  let c;
+  ptr++;
+  while ((c = str[ptr++]) !== "}" && c) {
+    if (c === ",") {
+      throw new TomlError("expected value, found comma", {
+        toml: str,
+        ptr: ptr - 1
+      });
+    } else if (c === "#")
+      ptr = skipComment(str, ptr);
+    else if (c !== " " && c !== "	" && c !== "\n" && c !== "\r") {
+      let k;
+      let t = res;
+      let hasOwn = false;
+      let [key, keyEndPtr] = parseKey(str, ptr - 1);
+      for (let i = 0; i < key.length; i++) {
+        if (i)
+          t = hasOwn ? t[k] : t[k] = {};
+        k = key[i];
+        if ((hasOwn = Object.hasOwn(t, k)) && (typeof t[k] !== "object" || seen.has(t[k]))) {
+          throw new TomlError("trying to redefine an already defined value", {
+            toml: str,
+            ptr
+          });
+        }
+        if (!hasOwn && k === "__proto__") {
+          Object.defineProperty(t, k, { enumerable: true, configurable: true, writable: true });
+        }
+      }
+      if (hasOwn) {
+        throw new TomlError("trying to redefine an already defined value", {
+          toml: str,
+          ptr
+        });
+      }
+      let [value, valueEndPtr] = extractValue(str, keyEndPtr, "}", depth - 1, integersAsBigInt);
+      seen.add(value);
+      t[k] = value;
+      ptr = valueEndPtr;
+    }
+  }
+  if (!c) {
+    throw new TomlError("unfinished table encountered", {
+      toml: str,
+      ptr
+    });
+  }
+  return [res, ptr];
+}
+function parseArray(str, ptr, depth, integersAsBigInt) {
+  let res = [];
+  let c;
+  ptr++;
+  while ((c = str[ptr++]) !== "]" && c) {
+    if (c === ",") {
+      throw new TomlError("expected value, found comma", {
+        toml: str,
+        ptr: ptr - 1
+      });
+    } else if (c === "#")
+      ptr = skipComment(str, ptr);
+    else if (c !== " " && c !== "	" && c !== "\n" && c !== "\r") {
+      let e = extractValue(str, ptr - 1, "]", depth - 1, integersAsBigInt);
+      res.push(e[0]);
+      ptr = e[1];
+    }
+  }
+  if (!c) {
+    throw new TomlError("unfinished array encountered", {
+      toml: str,
+      ptr
+    });
+  }
+  return [res, ptr];
+}
+
+// ../../../main/node_modules/.pnpm/smol-toml@1.6.0/node_modules/smol-toml/dist/parse.js
+function peekTable(key, table, meta, type) {
+  let t = table;
+  let m = meta;
+  let k;
+  let hasOwn = false;
+  let state;
+  for (let i = 0; i < key.length; i++) {
+    if (i) {
+      t = hasOwn ? t[k] : t[k] = {};
+      m = (state = m[k]).c;
+      if (type === 0 && (state.t === 1 || state.t === 2)) {
+        return null;
+      }
+      if (state.t === 2) {
+        let l = t.length - 1;
+        t = t[l];
+        m = m[l].c;
+      }
+    }
+    k = key[i];
+    if ((hasOwn = Object.hasOwn(t, k)) && m[k]?.t === 0 && m[k]?.d) {
+      return null;
+    }
+    if (!hasOwn) {
+      if (k === "__proto__") {
+        Object.defineProperty(t, k, { enumerable: true, configurable: true, writable: true });
+        Object.defineProperty(m, k, { enumerable: true, configurable: true, writable: true });
+      }
+      m[k] = {
+        t: i < key.length - 1 && type === 2 ? 3 : type,
+        d: false,
+        i: 0,
+        c: {}
+      };
+    }
+  }
+  state = m[k];
+  if (state.t !== type && !(type === 1 && state.t === 3)) {
+    return null;
+  }
+  if (type === 2) {
+    if (!state.d) {
+      state.d = true;
+      t[k] = [];
+    }
+    t[k].push(t = {});
+    state.c[state.i++] = state = { t: 1, d: false, i: 0, c: {} };
+  }
+  if (state.d) {
+    return null;
+  }
+  state.d = true;
+  if (type === 1) {
+    t = hasOwn ? t[k] : t[k] = {};
+  } else if (type === 0 && hasOwn) {
+    return null;
+  }
+  return [k, t, state.c];
+}
+function parse(toml, { maxDepth = 1e3, integersAsBigInt } = {}) {
+  let res = {};
+  let meta = {};
+  let tbl = res;
+  let m = meta;
+  for (let ptr = skipVoid(toml, 0); ptr < toml.length; ) {
+    if (toml[ptr] === "[") {
+      let isTableArray = toml[++ptr] === "[";
+      let k = parseKey(toml, ptr += +isTableArray, "]");
+      if (isTableArray) {
+        if (toml[k[1] - 1] !== "]") {
+          throw new TomlError("expected end of table declaration", {
+            toml,
+            ptr: k[1] - 1
+          });
+        }
+        k[1]++;
+      }
+      let p = peekTable(
+        k[0],
+        res,
+        meta,
+        isTableArray ? 2 : 1
+        /* Type.EXPLICIT */
+      );
+      if (!p) {
+        throw new TomlError("trying to redefine an already defined table or value", {
+          toml,
+          ptr
+        });
+      }
+      m = p[2];
+      tbl = p[1];
+      ptr = k[1];
+    } else {
+      let k = parseKey(toml, ptr);
+      let p = peekTable(
+        k[0],
+        tbl,
+        m,
+        0
+        /* Type.DOTTED */
+      );
+      if (!p) {
+        throw new TomlError("trying to redefine an already defined table or value", {
+          toml,
+          ptr
+        });
+      }
+      let v = extractValue(toml, k[1], void 0, maxDepth, integersAsBigInt);
+      p[1][p[0]] = v[0];
+      ptr = v[1];
+    }
+    ptr = skipVoid(toml, ptr, true);
+    if (toml[ptr] && toml[ptr] !== "\n" && toml[ptr] !== "\r") {
+      throw new TomlError("each key-value declaration must be followed by an end-of-line", {
+        toml,
+        ptr
+      });
+    }
+    ptr = skipVoid(toml, ptr);
+  }
+  return res;
+}
+
+// ../../../main/node_modules/.pnpm/smol-toml@1.6.0/node_modules/smol-toml/dist/stringify.js
+var BARE_KEY = /^[a-z0-9-_]+$/i;
+function extendedTypeOf(obj) {
+  let type = typeof obj;
+  if (type === "object") {
+    if (Array.isArray(obj))
+      return "array";
+    if (obj instanceof Date)
+      return "date";
+  }
+  return type;
+}
+function isArrayOfTables(obj) {
+  for (let i = 0; i < obj.length; i++) {
+    if (extendedTypeOf(obj[i]) !== "object")
+      return false;
+  }
+  return obj.length != 0;
+}
+function formatString(s) {
+  return JSON.stringify(s).replace(/\x7f/g, "\\u007f");
+}
+function stringifyValue(val, type, depth, numberAsFloat) {
+  if (depth === 0) {
+    throw new Error("Could not stringify the object: maximum object depth exceeded");
+  }
+  if (type === "number") {
+    if (isNaN(val))
+      return "nan";
+    if (val === Infinity)
+      return "inf";
+    if (val === -Infinity)
+      return "-inf";
+    if (numberAsFloat && Number.isInteger(val))
+      return val.toFixed(1);
+    return val.toString();
+  }
+  if (type === "bigint" || type === "boolean") {
+    return val.toString();
+  }
+  if (type === "string") {
+    return formatString(val);
+  }
+  if (type === "date") {
+    if (isNaN(val.getTime())) {
+      throw new TypeError("cannot serialize invalid date");
+    }
+    return val.toISOString();
+  }
+  if (type === "object") {
+    return stringifyInlineTable(val, depth, numberAsFloat);
+  }
+  if (type === "array") {
+    return stringifyArray(val, depth, numberAsFloat);
+  }
+}
+function stringifyInlineTable(obj, depth, numberAsFloat) {
+  let keys = Object.keys(obj);
+  if (keys.length === 0)
+    return "{}";
+  let res = "{ ";
+  for (let i = 0; i < keys.length; i++) {
+    let k = keys[i];
+    if (i)
+      res += ", ";
+    res += BARE_KEY.test(k) ? k : formatString(k);
+    res += " = ";
+    res += stringifyValue(obj[k], extendedTypeOf(obj[k]), depth - 1, numberAsFloat);
+  }
+  return res + " }";
+}
+function stringifyArray(array, depth, numberAsFloat) {
+  if (array.length === 0)
+    return "[]";
+  let res = "[ ";
+  for (let i = 0; i < array.length; i++) {
+    if (i)
+      res += ", ";
+    if (array[i] === null || array[i] === void 0) {
+      throw new TypeError("arrays cannot contain null or undefined values");
+    }
+    res += stringifyValue(array[i], extendedTypeOf(array[i]), depth - 1, numberAsFloat);
+  }
+  return res + " ]";
+}
+function stringifyArrayTable(array, key, depth, numberAsFloat) {
+  if (depth === 0) {
+    throw new Error("Could not stringify the object: maximum object depth exceeded");
+  }
+  let res = "";
+  for (let i = 0; i < array.length; i++) {
+    res += `${res && "\n"}[[${key}]]
+`;
+    res += stringifyTable(0, array[i], key, depth, numberAsFloat);
+  }
+  return res;
+}
+function stringifyTable(tableKey, obj, prefix, depth, numberAsFloat) {
+  if (depth === 0) {
+    throw new Error("Could not stringify the object: maximum object depth exceeded");
+  }
+  let preamble = "";
+  let tables = "";
+  let keys = Object.keys(obj);
+  for (let i = 0; i < keys.length; i++) {
+    let k = keys[i];
+    if (obj[k] !== null && obj[k] !== void 0) {
+      let type = extendedTypeOf(obj[k]);
+      if (type === "symbol" || type === "function") {
+        throw new TypeError(`cannot serialize values of type '${type}'`);
+      }
+      let key = BARE_KEY.test(k) ? k : formatString(k);
+      if (type === "array" && isArrayOfTables(obj[k])) {
+        tables += (tables && "\n") + stringifyArrayTable(obj[k], prefix ? `${prefix}.${key}` : key, depth - 1, numberAsFloat);
+      } else if (type === "object") {
+        let tblKey = prefix ? `${prefix}.${key}` : key;
+        tables += (tables && "\n") + stringifyTable(tblKey, obj[k], tblKey, depth - 1, numberAsFloat);
+      } else {
+        preamble += key;
+        preamble += " = ";
+        preamble += stringifyValue(obj[k], type, depth, numberAsFloat);
+        preamble += "\n";
+      }
+    }
+  }
+  if (tableKey && (preamble || !tables))
+    preamble = preamble ? `[${tableKey}]
+${preamble}` : `[${tableKey}]`;
+  return preamble && tables ? `${preamble}
+${tables}` : preamble || tables;
+}
+function stringify(obj, { maxDepth = 1e3, numbersAsFloat = false } = {}) {
+  if (extendedTypeOf(obj) !== "object") {
+    throw new TypeError("stringify can only be called with an object");
+  }
+  let str = stringifyTable(0, obj, "", maxDepth, numbersAsFloat);
+  if (str[str.length - 1] !== "\n")
+    return str + "\n";
+  return str;
+}
+
+// ../../../main/packages/cli-core/dist/index.js
 import { createHash, randomBytes } from "crypto";
 import { createServer } from "http";
 import { existsSync, mkdirSync as mkdirSync2, readFileSync } from "fs";
@@ -193,7 +1023,7 @@ import { homedir as homedir2 } from "os";
 import { join as join2 } from "path";
 import pc from "picocolors";
 
-// ../../node_modules/.pnpm/open@10.2.0/node_modules/open/index.js
+// ../../../main/node_modules/.pnpm/open@10.2.0/node_modules/open/index.js
 import process7 from "process";
 import { Buffer as Buffer2 } from "buffer";
 import path from "path";
@@ -202,19 +1032,19 @@ import { promisify as promisify5 } from "util";
 import childProcess from "child_process";
 import fs5, { constants as fsConstants2 } from "fs/promises";
 
-// ../../node_modules/.pnpm/wsl-utils@0.1.0/node_modules/wsl-utils/index.js
+// ../../../main/node_modules/.pnpm/wsl-utils@0.1.0/node_modules/wsl-utils/index.js
 import process3 from "process";
 import fs4, { constants as fsConstants } from "fs/promises";
 
-// ../../node_modules/.pnpm/is-wsl@3.1.1/node_modules/is-wsl/index.js
+// ../../../main/node_modules/.pnpm/is-wsl@3.1.0/node_modules/is-wsl/index.js
 import process2 from "process";
 import os from "os";
 import fs3 from "fs";
 
-// ../../node_modules/.pnpm/is-inside-container@1.0.0/node_modules/is-inside-container/index.js
+// ../../../main/node_modules/.pnpm/is-inside-container@1.0.0/node_modules/is-inside-container/index.js
 import fs2 from "fs";
 
-// ../../node_modules/.pnpm/is-docker@3.0.0/node_modules/is-docker/index.js
+// ../../../main/node_modules/.pnpm/is-docker@3.0.0/node_modules/is-docker/index.js
 import fs from "fs";
 var isDockerCached;
 function hasDockerEnv() {
@@ -239,7 +1069,7 @@ function isDocker() {
   return isDockerCached;
 }
 
-// ../../node_modules/.pnpm/is-inside-container@1.0.0/node_modules/is-inside-container/index.js
+// ../../../main/node_modules/.pnpm/is-inside-container@1.0.0/node_modules/is-inside-container/index.js
 var cachedResult;
 var hasContainerEnv = () => {
   try {
@@ -256,7 +1086,7 @@ function isInsideContainer() {
   return cachedResult;
 }
 
-// ../../node_modules/.pnpm/is-wsl@3.1.1/node_modules/is-wsl/index.js
+// ../../../main/node_modules/.pnpm/is-wsl@3.1.0/node_modules/is-wsl/index.js
 var isWsl = () => {
   if (process2.platform !== "linux") {
     return false;
@@ -268,19 +1098,14 @@ var isWsl = () => {
     return true;
   }
   try {
-    if (fs3.readFileSync("/proc/version", "utf8").toLowerCase().includes("microsoft")) {
-      return !isInsideContainer();
-    }
+    return fs3.readFileSync("/proc/version", "utf8").toLowerCase().includes("microsoft") ? !isInsideContainer() : false;
   } catch {
+    return false;
   }
-  if (fs3.existsSync("/proc/sys/fs/binfmt_misc/WSLInterop") || fs3.existsSync("/run/WSL")) {
-    return !isInsideContainer();
-  }
-  return false;
 };
 var is_wsl_default = process2.env.__IS_WSL_TEST__ ? isWsl : isWsl();
 
-// ../../node_modules/.pnpm/wsl-utils@0.1.0/node_modules/wsl-utils/index.js
+// ../../../main/node_modules/.pnpm/wsl-utils@0.1.0/node_modules/wsl-utils/index.js
 var wslDrivesMountPoint = /* @__PURE__ */ (() => {
   const defaultMountPoint = "/mnt/";
   let mountPoint;
@@ -319,7 +1144,7 @@ var powerShellPath = async () => {
   return `${process3.env.SYSTEMROOT || process3.env.windir || String.raw`C:\Windows`}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`;
 };
 
-// ../../node_modules/.pnpm/define-lazy-prop@3.0.0/node_modules/define-lazy-prop/index.js
+// ../../../main/node_modules/.pnpm/define-lazy-prop@3.0.0/node_modules/define-lazy-prop/index.js
 function defineLazyProperty(object, propertyName, valueGetter) {
   const define = (value) => Object.defineProperty(object, propertyName, { value, enumerable: true, writable: true });
   Object.defineProperty(object, propertyName, {
@@ -337,12 +1162,12 @@ function defineLazyProperty(object, propertyName, valueGetter) {
   return object;
 }
 
-// ../../node_modules/.pnpm/default-browser@5.5.0/node_modules/default-browser/index.js
+// ../../../main/node_modules/.pnpm/default-browser@5.4.0/node_modules/default-browser/index.js
 import { promisify as promisify4 } from "util";
 import process6 from "process";
 import { execFile as execFile4 } from "child_process";
 
-// ../../node_modules/.pnpm/default-browser-id@5.0.1/node_modules/default-browser-id/index.js
+// ../../../main/node_modules/.pnpm/default-browser-id@5.0.1/node_modules/default-browser-id/index.js
 import { promisify } from "util";
 import process4 from "process";
 import { execFile } from "child_process";
@@ -360,7 +1185,7 @@ async function defaultBrowserId() {
   return browserId;
 }
 
-// ../../node_modules/.pnpm/run-applescript@7.1.0/node_modules/run-applescript/index.js
+// ../../../main/node_modules/.pnpm/run-applescript@7.1.0/node_modules/run-applescript/index.js
 import process5 from "process";
 import { promisify as promisify2 } from "util";
 import { execFile as execFile2, execFileSync } from "child_process";
@@ -378,13 +1203,13 @@ async function runAppleScript(script, { humanReadableOutput = true, signal } = {
   return stdout.trim();
 }
 
-// ../../node_modules/.pnpm/bundle-name@4.1.0/node_modules/bundle-name/index.js
+// ../../../main/node_modules/.pnpm/bundle-name@4.1.0/node_modules/bundle-name/index.js
 async function bundleName(bundleId) {
   return runAppleScript(`tell application "Finder" to set app_path to application file id "${bundleId}" as string
 tell application "System Events" to get value of property list item "CFBundleName" of property list file (app_path & ":Contents:Info.plist")`);
 }
 
-// ../../node_modules/.pnpm/default-browser@5.5.0/node_modules/default-browser/windows.js
+// ../../../main/node_modules/.pnpm/default-browser@5.4.0/node_modules/default-browser/windows.js
 import { promisify as promisify3 } from "util";
 import { execFile as execFile3 } from "child_process";
 var execFileAsync3 = promisify3(execFile3);
@@ -422,14 +1247,14 @@ async function defaultBrowser(_execFileAsync = execFileAsync3) {
     throw new UnknownBrowserError(`Cannot find Windows browser in stdout: ${JSON.stringify(stdout)}`);
   }
   const { id } = match.groups;
-  const dotIndex = id.lastIndexOf(".");
-  const hyphenIndex = id.lastIndexOf("-");
-  const baseIdByDot = dotIndex === -1 ? void 0 : id.slice(0, dotIndex);
-  const baseIdByHyphen = hyphenIndex === -1 ? void 0 : id.slice(0, hyphenIndex);
-  return windowsBrowserProgIds[id] ?? windowsBrowserProgIds[baseIdByDot] ?? windowsBrowserProgIds[baseIdByHyphen] ?? { name: id, id };
+  const browser = windowsBrowserProgIds[id];
+  if (!browser) {
+    throw new UnknownBrowserError(`Unknown browser ID: ${id}`);
+  }
+  return browser;
 }
 
-// ../../node_modules/.pnpm/default-browser@5.5.0/node_modules/default-browser/index.js
+// ../../../main/node_modules/.pnpm/default-browser@5.4.0/node_modules/default-browser/index.js
 var execFileAsync4 = promisify4(execFile4);
 var titleize = (string) => string.toLowerCase().replaceAll(/(?:^|\s|-)\S/g, (x) => x.toUpperCase());
 async function defaultBrowser2() {
@@ -450,7 +1275,7 @@ async function defaultBrowser2() {
   throw new Error("Only macOS, Linux, and Windows are supported");
 }
 
-// ../../node_modules/.pnpm/open@10.2.0/node_modules/open/index.js
+// ../../../main/node_modules/.pnpm/open@10.2.0/node_modules/open/index.js
 var execFile5 = promisify5(childProcess.execFile);
 var __dirname = path.dirname(fileURLToPath(import.meta.url));
 var localXdgOpenPath = path.join(__dirname, "xdg-open");
@@ -707,7 +1532,7 @@ defineLazyProperty(apps, "browser", () => "browser");
 defineLazyProperty(apps, "browserPrivate", () => "browserPrivate");
 var open_default = open;
 
-// ../../node_modules/.pnpm/@nuucognition+cli-core@0.0.1-beta.5/node_modules/@nuucognition/cli-core/dist/index.js
+// ../../../main/packages/cli-core/dist/index.js
 import { Command } from "commander";
 import cfonts from "cfonts";
 import pc3 from "picocolors";
@@ -729,9 +1554,9 @@ function normalizeRuntimeMode(input) {
 function authEnvForMode(mode) {
   return mode === "dev" ? "dev" : "prod";
 }
-async function readConfigFile(path4) {
+async function readConfigFile(path5) {
   try {
-    const content = await fsReadFile(path4, "utf-8");
+    const content = await fsReadFile(path5, "utf-8");
     return parse(content);
   } catch (error22) {
     if (error22.code === "ENOENT") {
@@ -740,9 +1565,9 @@ async function readConfigFile(path4) {
     throw error22;
   }
 }
-function readConfigFileSync(path4) {
+function readConfigFileSync(path5) {
   try {
-    const content = fsReadFileSync(path4, "utf-8");
+    const content = fsReadFileSync(path5, "utf-8");
     return parse(content);
   } catch (error22) {
     if (error22.code === "ENOENT") {
@@ -751,25 +1576,25 @@ function readConfigFileSync(path4) {
     throw error22;
   }
 }
-async function writeConfigFile(path4, data) {
-  await mkdir(dirname(path4), { recursive: true });
-  await fsWriteFile(path4, `${stringify(data)}
+async function writeConfigFile(path5, data) {
+  await mkdir(dirname(path5), { recursive: true });
+  await fsWriteFile(path5, `${stringify(data)}
 `, "utf-8");
 }
-async function setConfigField(path4, key, value) {
-  const existing = await readConfigFile(path4) ?? {};
+async function setConfigField(path5, key, value) {
+  const existing = await readConfigFile(path5) ?? {};
   existing[key] = value;
-  await writeConfigFile(path4, existing);
+  await writeConfigFile(path5, existing);
 }
-async function setFeatureOverride(path4, featureId, enabled) {
-  const existing = await readConfigFile(path4) ?? {};
+async function setFeatureOverride(path5, featureId, enabled) {
+  const existing = await readConfigFile(path5) ?? {};
   const features = existing.features && typeof existing.features === "object" && !Array.isArray(existing.features) ? { ...existing.features } : {};
   features[featureId] = enabled;
   existing.features = features;
-  await writeConfigFile(path4, existing);
+  await writeConfigFile(path5, existing);
 }
-async function removeFeatureOverride(path4, featureId) {
-  const existing = await readConfigFile(path4);
+async function removeFeatureOverride(path5, featureId) {
+  const existing = await readConfigFile(path5);
   if (!existing) return;
   const features = existing.features;
   if (!features || typeof features !== "object" || Array.isArray(features)) {
@@ -782,7 +1607,7 @@ async function removeFeatureOverride(path4, featureId) {
   } else {
     existing.features = next;
   }
-  await writeConfigFile(path4, existing);
+  await writeConfigFile(path5, existing);
 }
 var CONFIG_FILENAME = "config.toml";
 function getConfigDir(cliname) {
@@ -991,9 +1816,9 @@ async function loadAuth(env = "prod") {
 function loadAuthSync(env = "prod") {
   try {
     ensureNuuDirSync();
-    const path4 = authPath(env);
-    if (!existsSync(path4)) return null;
-    return normalizeCredentials(JSON.parse(readFileSync(path4, "utf-8")));
+    const path5 = authPath(env);
+    if (!existsSync(path5)) return null;
+    return normalizeCredentials(JSON.parse(readFileSync(path5, "utf-8")));
   } catch {
     return null;
   }
@@ -1480,7 +2305,7 @@ var FEATURES = createFeatureRegistry([
   { id: "agent", tier: "prod", type: "command", description: "Headless agent management", requiresAuth: false },
   { id: "tinderbox", tier: "prod", type: "command", description: "Orchestrate operations across multiple Flints", requiresAuth: false },
   { id: "code", tier: "prod", type: "command", description: "Launch AI coding agents", requiresAuth: false },
-  { id: "orb", tier: "prod", type: "command", description: "OrbH meta-harness agent management", requiresAuth: false },
+  { id: "orb", tier: "prod", type: "command", description: "Orbh meta-harness agent management", requiresAuth: false },
   { id: "server", tier: "prod", type: "command", description: "Flint runtime server", requiresAuth: false },
   { id: "runtime", tier: "dev", type: "command", description: "Flint runtime management", requiresAuth: false },
   { id: "obsidian.push", tier: "dev", type: "function", description: "Push obsidian config changes to remote", requiresAuth: false },
@@ -1558,25 +2383,25 @@ function createProgressDisplay(label, total) {
 import { homedir as homedir3 } from "os";
 import { access } from "fs/promises";
 import { createInterface } from "readline";
-function abbreviatePath(path4) {
+function abbreviatePath(path5) {
   const home = homedir3();
-  if (path4.startsWith(home)) {
-    return path4.replace(home, "~");
+  if (path5.startsWith(home)) {
+    return path5.replace(home, "~");
   }
-  return path4;
+  return path5;
 }
-function expandPath(path4) {
-  if (path4.startsWith("~/")) {
-    return path4.replace("~", homedir3());
+function expandPath(path5) {
+  if (path5.startsWith("~/")) {
+    return path5.replace("~", homedir3());
   }
-  return path4;
+  return path5;
 }
 function padEnd(str, length) {
   return str.padEnd(length);
 }
-async function checkPathExists(path4) {
+async function checkPathExists(path5) {
   try {
-    await access(path4);
+    await access(path5);
     return true;
   } catch {
     return false;
@@ -1827,12 +2652,12 @@ function resolvePath(flint, fullPath) {
 }
 function printFlint(flint, opts) {
   const { nameColWidth, showStatus, fullPath, indent = "  " } = opts;
-  const path4 = resolvePath(flint, fullPath);
+  const path5 = resolvePath(flint, fullPath);
   const isBroken = showStatus && !flint.valid;
   const tags = formatTags(flint.tags);
   const nameCell = tags ? `${pc7.bold(flint.name)}  ${tags}` : pc7.bold(flint.name);
   const status = showStatus ? statusBadge(flint) + " " : "";
-  const pathColor = isBroken ? pc7.red(path4) : pc7.dim(path4);
+  const pathColor = isBroken ? pc7.red(path5) : pc7.dim(path5);
   console.log(`${indent}${pad(nameCell, nameColWidth)}${status}${pathColor}`);
   if (flint.description) {
     console.log(`${indent}  ${pc7.dim(truncate(flint.description, 65))}`);
@@ -1840,10 +2665,10 @@ function printFlint(flint, opts) {
 }
 function printGroupRow(flint, opts) {
   const { nameColWidth, showStatus, fullPath } = opts;
-  const path4 = resolvePath(flint, fullPath);
+  const path5 = resolvePath(flint, fullPath);
   const isBroken = showStatus && !flint.valid;
   const status = showStatus ? statusBadge(flint) + " " : "";
-  const pathColor = isBroken ? pc7.red(path4) : pc7.dim(path4);
+  const pathColor = isBroken ? pc7.red(path5) : pc7.dim(path5);
   console.log(`    ${pad(flint.name, nameColWidth)}${status}${pathColor}`);
 }
 function measureNameCol(flints) {
@@ -3637,9 +4462,23 @@ var syncCommand = new Command6("sync").description("Sync shards from flint.toml"
     if (result.migrations.pending.length > 0) {
       console.log(pc9.bold("Migrations:"));
       console.log(pc9.yellow(`  ${result.migrations.pending.length} migration(s) available:`));
+      const migrationsByVersion = /* @__PURE__ */ new Map();
       for (const m of result.migrations.pending) {
-        console.log(`  ${pc9.yellow("\u2192")} ${m.name} ${pc9.dim(`(${m.from} \u2192 ${m.to})`)}`);
-        console.log(`    ${pc9.dim(m.description)}`);
+        const existing = migrationsByVersion.get(m.to) || [];
+        existing.push(m);
+        migrationsByVersion.set(m.to, existing);
+      }
+      for (const [version, items] of migrationsByVersion) {
+        const sealed = isVersionStepSealed(version);
+        if (!sealed) {
+          console.log(`  ${pc9.yellow("\u2192")} ${pc9.bold(version)} ${pc9.yellow("(unsealed \u2014 version will not advance)")}`);
+        } else {
+          console.log(`  ${pc9.yellow("\u2192")} ${pc9.bold(version)}`);
+        }
+        for (const m of items) {
+          console.log(`    ${m.name} ${pc9.dim(`(${m.from} \u2192 ${m.to})`)}`);
+          console.log(`      ${pc9.dim(m.description)}`);
+        }
       }
       console.log(pc9.dim(`
   Run \`flint migrate\` to apply.
@@ -4120,9 +4959,9 @@ var REQUIRED_DIRS = [
   "Workspace/Bench",
   ".flint"
 ];
-async function exists(path4) {
+async function exists(path5) {
   try {
-    await access2(path4);
+    await access2(path5);
     return true;
   } catch {
     return false;
@@ -4347,9 +5186,9 @@ import pc12 from "picocolors";
 import { readFile as readFile4, stat } from "fs/promises";
 import { join as join7, basename as basename2 } from "path";
 import { createInterface as createInterface2 } from "readline";
-async function exists2(path4) {
+async function exists2(path5) {
   try {
-    await stat(path4);
+    await stat(path5);
     return true;
   } catch {
     return false;
@@ -4643,17 +5482,17 @@ import { resolve as resolve2 } from "path";
 import { platform as platform3 } from "os";
 import pc13 from "picocolors";
 var execAsync2 = promisify7(exec2);
-async function openInObsidian(path4) {
+async function openInObsidian(path5) {
   const os2 = platform3();
   if (os2 === "darwin") {
-    await execAsync2(`open -a "Obsidian" "${path4}"`);
+    await execAsync2(`open -a "Obsidian" "${path5}"`);
   } else if (os2 === "win32") {
-    await execAsync2(`start "" "Obsidian" "${path4}"`);
+    await execAsync2(`start "" "Obsidian" "${path5}"`);
   } else {
     try {
-      await execAsync2(`obsidian "${path4}"`);
+      await execAsync2(`obsidian "${path5}"`);
     } catch {
-      await execAsync2(`xdg-open "${path4}"`);
+      await execAsync2(`xdg-open "${path5}"`);
     }
   }
 }
@@ -4745,7 +5584,7 @@ if (!configJson) {
 }
 
 const { sessionPath, flintPath, prompt, claudeArgs, sessionId, runId } = JSON.parse(configJson);
-const dashboardUrl = 'http://localhost:7433/agent#session-' + sessionId;
+const dashboardUrl = 'http://localhost:13040/agent#session-' + sessionId;
 
 function readSession() {
   try {
@@ -6100,7 +6939,7 @@ plateCommand.command("create").description("Scaffold a new Plate").argument("<na
     const flintPath = await resolveFlintPath2(options.path);
     const plate = await createPlate(flintPath, name, { shard: options.shard });
     console.log(pc22.green(`
-Created Plate ${pc22.bold(plate.manifest.display)}`));
+Created Plate ${pc22.bold(plate.manifest.title)}`));
     console.log(`  Name:  ${pc22.cyan(plate.manifest.name)}`);
     console.log(`  Path:  ${pc22.dim(plate.path)}`);
     if (plate.manifest.shard) {
@@ -6130,15 +6969,15 @@ plateCommand.command("list").description("List installed Plates").option("-p, --
       return;
     }
     const nameWidth = Math.max(4, ...plates.map((plate) => plate.manifest.name.length)) + 2;
-    const displayWidth = Math.max(7, ...plates.map((plate) => plate.manifest.display.length)) + 2;
+    const titleWidth = Math.max(5, ...plates.map((plate) => plate.manifest.title.length)) + 2;
     const shardWidth = Math.max(5, ...plates.map((plate) => (plate.manifest.shard ?? "\u2014").length)) + 2;
     console.log();
     console.log(
-      `  ${pad2(pc22.bold("Name"), nameWidth)}${pad2(pc22.bold("Display"), displayWidth)}${pad2(pc22.bold("Shard"), shardWidth)}${pc22.bold("Built")}`
+      `  ${pad2(pc22.bold("Name"), nameWidth)}${pad2(pc22.bold("Title"), titleWidth)}${pad2(pc22.bold("Shard"), shardWidth)}${pc22.bold("Built")}`
     );
     for (const plate of plates) {
       console.log(
-        `  ${pad2(plate.manifest.name, nameWidth)}${pad2(plate.manifest.display, displayWidth)}${pad2(plate.manifest.shard ?? "\u2014", shardWidth)}${plate.built ? pc22.green("yes") : pc22.yellow("no")}`
+        `  ${pad2(plate.manifest.name, nameWidth)}${pad2(plate.manifest.title, titleWidth)}${pad2(plate.manifest.shard ?? "\u2014", shardWidth)}${plate.built ? pc22.green("yes") : pc22.yellow("no")}`
       );
     }
     console.log();
@@ -6158,7 +6997,7 @@ repoCommand.command("add").description("Add a plate from a git repo").argument("
       getPlateDeclaration,
       nameFormats,
       updateGitignore: updateGitignore2
-    } = await import("./dist-UIVVEOGP.js");
+    } = await import("./dist-RGQKIZQW.js");
     const { proper, slug } = nameFormats(name);
     const existing = await getPlateDeclaration(flintPath, slug);
     if (existing) {
@@ -6170,7 +7009,7 @@ repoCommand.command("add").description("Add a plate from a git repo").argument("
 Cloning ${url}...`));
     await clonePlateFromRepo(flintPath, slug, url, platePath);
     await addPlateDeclaration(flintPath, slug, platePath, { title: proper });
-    const { setPlateRepo } = await import("./dist-UIVVEOGP.js");
+    const { setPlateRepo } = await import("./dist-RGQKIZQW.js");
     await setPlateRepo(flintPath, slug, url);
     await updateGitignore2(flintPath);
     console.log(pc22.green(`
@@ -6188,8 +7027,8 @@ Added plate: ${pc22.bold(proper)}`));
 repoCommand.command("remove").description("Remove a repo-sourced plate").argument("<name>", "Plate declaration name or slug").option("-p, --path <dir>", "Path to flint (default: auto-detect)").action(async (name, options) => {
   try {
     const flintPath = await resolveFlintPath2(options.path);
-    const { removePlateDeclaration, updateGitignore: updateGitignore2 } = await import("./dist-UIVVEOGP.js");
-    const { rm: rm5, stat: stat8 } = await import("fs/promises");
+    const { removePlateDeclaration, updateGitignore: updateGitignore2 } = await import("./dist-RGQKIZQW.js");
+    const { rm: rm5, stat: stat9 } = await import("fs/promises");
     const { join: join19 } = await import("path");
     const plate = await getPlate(flintPath, name);
     if (!plate) {
@@ -6197,14 +7036,14 @@ repoCommand.command("remove").description("Remove a repo-sourced plate").argumen
       process.exit(1);
     }
     try {
-      await stat8(plate.path);
+      await stat9(plate.path);
       await rm5(plate.path, { recursive: true, force: true });
     } catch {
     }
     await removePlateDeclaration(flintPath, plate.declarationName);
     await updateGitignore2(flintPath);
     console.log(pc22.green(`
-Removed plate: ${pc22.bold(plate.manifest.display)}
+Removed plate: ${pc22.bold(plate.manifest.title)}
 `));
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
@@ -6213,10 +7052,65 @@ Removed plate: ${pc22.bold(plate.manifest.display)}
   }
 });
 plateCommand.addCommand(repoCommand);
+plateCommand.command("install").description("Install a Plate from a git repo URL").argument("<url>", "Git repo URL to clone").option("-p, --path <dir>", "Path to flint (default: auto-detect)").action(async (url, options) => {
+  try {
+    const flintPath = await resolveFlintPath2(options.path);
+    const {
+      addPlateDeclaration,
+      clonePlateFromRepo,
+      readPlateManifest,
+      setPlateRepo,
+      updateGitignore: updateGitignore2
+    } = await import("./dist-RGQKIZQW.js");
+    const { join: join19 } = await import("path");
+    const { mkdtemp: mkdtemp2, rm: rm5, rename: rename2 } = await import("fs/promises");
+    const { tmpdir: tmpdir2 } = await import("os");
+    const tmpDir = await mkdtemp2(join19(tmpdir2(), "flint-plate-"));
+    console.log(pc22.dim(`
+Cloning ${url}...`));
+    try {
+      await clonePlateFromRepo(flintPath, "temp", url, tmpDir);
+    } catch {
+      const { execSync: execSync6 } = await import("child_process");
+      execSync6(`git clone --depth 1 "${url}" "${tmpDir}"`, { timeout: 6e4, stdio: "ignore" });
+      await rm5(join19(tmpDir, ".git"), { recursive: true, force: true }).catch(() => {
+      });
+    }
+    const manifest = await readPlateManifest(tmpDir);
+    const slug = manifest.name;
+    const title = manifest.title;
+    const existing = await getPlate(flintPath, slug);
+    if (existing) {
+      await rm5(tmpDir, { recursive: true, force: true });
+      console.error(pc22.red(`Error: Plate "${slug}" already exists.`));
+      process.exit(1);
+    }
+    const { mkdir: mkdir8 } = await import("fs/promises");
+    const platePath = `Plates/${title}`;
+    const absolutePlatePath = join19(flintPath, platePath);
+    await mkdir8(join19(flintPath, "Plates"), { recursive: true });
+    await rename2(tmpDir, absolutePlatePath);
+    await addPlateDeclaration(flintPath, slug, platePath, { title });
+    await setPlateRepo(flintPath, slug, url);
+    await updateGitignore2(flintPath);
+    console.log(pc22.green(`
+Installed plate: ${pc22.bold(title)}`));
+    console.log(`  Slug:  ${pc22.cyan(slug)}`);
+    console.log(`  Title: ${title}`);
+    console.log(`  Path:  ${pc22.dim(platePath)}`);
+    console.log(`  URL:   ${pc22.dim(url)}`);
+    console.log(pc22.dim("\nThe server will auto-build this plate on next startup."));
+    console.log();
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    console.error(pc22.red(`Error: ${message}`));
+    process.exit(1);
+  }
+});
 plateCommand.command("push").description("Initialize a plate as a git repo, set remote, and push").argument("<name>", "Plate name").argument("<url>", "Git remote URL").option("-p, --path <dir>", "Path to flint (default: auto-detect)").action(async (name, url, options) => {
   try {
     const flintPath = await resolveFlintPath2(options.path);
-    const { setPlateRepo } = await import("./dist-UIVVEOGP.js");
+    const { setPlateRepo } = await import("./dist-RGQKIZQW.js");
     console.log(pc22.dim(`
 Pushing plate "${name}"...`));
     const result = await initPlateRepo(flintPath, name, url);
@@ -6242,7 +7136,7 @@ Pushing plate "${name}"...`));
 plateCommand.command("sync").description("Sync plates that have a repo configured").option("-p, --path <dir>", "Path to flint (default: auto-detect)").action(async (options) => {
   try {
     const flintPath = await resolveFlintPath2(options.path);
-    const { getPlateDeclarations, syncPlateRepos } = await import("./dist-UIVVEOGP.js");
+    const { getPlateDeclarations, syncPlateRepos } = await import("./dist-RGQKIZQW.js");
     const declarations = await getPlateDeclarations(flintPath);
     const hasRepos = Object.values(declarations).some((d) => d.repo);
     if (!hasRepos) {
@@ -6261,6 +7155,8 @@ plateCommand.command("sync").description("Sync plates that have a repo configure
         console.log(`  ${pc22.green("+")} ${pr.name} ${pc22.dim("(cloned)")}`);
       } else if (pr.status === "updated") {
         console.log(`  ${pc22.green("\u2713")} ${pr.name} ${pc22.dim("(updated)")}`);
+      } else if (pr.status === "skipped") {
+        console.log(`  ${pc22.dim("\u25CB")} ${pr.name} ${pc22.dim("(exists, skipped)")}`);
       } else if (pr.status === "error") {
         console.log(`  ${pc22.red("\u2717")} ${pr.name} \u2014 ${pr.error}`);
       }
@@ -6281,7 +7177,7 @@ plateCommand.command("info").description("Show Plate details").argument("<name>"
     }
     console.log();
     console.log(`${pc22.bold("Name:")}        ${pc22.cyan(plate.manifest.name)}`);
-    console.log(`${pc22.bold("Display:")}     ${plate.manifest.display}`);
+    console.log(`${pc22.bold("Title:")}       ${plate.manifest.title}`);
     console.log(`${pc22.bold("Version:")}     ${plate.manifest.version ?? "0.1.0"}`);
     console.log(`${pc22.bold("Shard:")}       ${plate.manifest.shard ?? "\u2014"}`);
     console.log(`${pc22.bold("Entry:")}       ${plate.manifest.entry}`);
@@ -6316,7 +7212,7 @@ plateCommand.command("dev").description("Start a Plate dev server").argument("<n
     if (!plate) {
       throw new Error(`Plate not found: ${name}`);
     }
-    console.log(pc22.dim(`Starting dev server for ${plate.manifest.display}...
+    console.log(pc22.dim(`Starting dev server for ${plate.manifest.title}...
 `));
     const child = spawnPlateDevServer(flintPath, plate);
     child.on("exit", (code) => process.exit(code ?? 0));
@@ -6516,9 +7412,9 @@ repoCommand2.addCommand(
     }
   })
 );
-async function fileExists(path4) {
+async function fileExists(path5) {
   try {
-    await stat3(path4);
+    await stat3(path5);
     return true;
   } catch {
     return false;
@@ -7136,11 +8032,33 @@ var latticeCommand = new Command21("lattice").description("Manage lattice connec
 
 // src/commands/server.ts
 import { Command as Command22 } from "commander";
+import { createRequire } from "module";
+import path3 from "path";
+import { spawn as spawn4 } from "child_process";
+import { stat as stat4 } from "fs/promises";
 import pc25 from "picocolors";
+var SERVER_SHUTDOWN_TIMEOUT_MS = 5e3;
+var FLINT_SERVER_PACKAGE = "@nuucognition/flint-server";
+var SHUTDOWN_HEADER_NAME = "x-flint-shutdown";
+var SHUTDOWN_HEADER_VALUE = "true";
+async function importFlintServer() {
+  const require2 = createRequire(import.meta.url);
+  try {
+    const resolved = require2.resolve(FLINT_SERVER_PACKAGE);
+    return await import(resolved);
+  } catch (error3) {
+    if (error3 instanceof Error && (error3.code === "ERR_MODULE_NOT_FOUND" || error3.code === "MODULE_NOT_FOUND" || error3.message.includes(`Cannot find package '${FLINT_SERVER_PACKAGE}'`) || error3.message.includes(`Cannot find module '${FLINT_SERVER_PACKAGE}'`))) {
+      console.error(pc25.red(`Error: ${FLINT_SERVER_PACKAGE} is not installed.`));
+      console.log(pc25.dim("The server module is in development. Install it locally to use this command."));
+      process.exit(1);
+    }
+    throw error3;
+  }
+}
 var serverCommand = new Command22("server").description("Manage the local Flint server");
-serverCommand.command("start").description("Start the Flint server").option("-p, --port <port>", "Port to bind").option("--path <dir>", "Path to flint (default: auto-detect)").action(async (options) => {
+serverCommand.command("start").description("Start the Flint server").option("-p, --port <port>", "Port to bind").option("--path <dir>", "Path to flint (default: auto-detect)").option("--steel-url <url>", "Paired Steel host URL for cascading shutdown").action(async (options) => {
   const flintPath = options.path || await findFlintRoot(process.cwd());
-  let configPort = 7433;
+  let configPort = 13040;
   if (flintPath) {
     try {
       const config = await readFlintToml(flintPath);
@@ -7149,15 +8067,9 @@ serverCommand.command("start").description("Start the Flint server").option("-p,
     }
   }
   const port = options.port ? Number(options.port) : configPort;
-  let startFlintServer;
-  try {
-    ({ startFlintServer } = await import("@nuucognition/flint-server"));
-  } catch {
-    console.error(pc25.red("Error: @nuucognition/flint-server is not installed."));
-    console.log(pc25.dim("The server module is in development. Install it locally to use this command."));
-    process.exit(1);
-  }
-  const server = await startFlintServer({ port, flintPath });
+  const steelUrl = typeof options.steelUrl === "string" ? options.steelUrl.trim() : void 0;
+  const { startFlintServer } = await importFlintServer();
+  const server = await startFlintServer({ port, flintPath, steelUrl });
   console.log(`
 ${pc25.bold(pc25.blue("Flint Server"))}`);
   console.log(`  URL: ${pc25.cyan(server.address)}`);
@@ -7169,14 +8081,76 @@ ${pc25.bold(pc25.blue("Flint Server"))}`);
   console.log(`
 ${pc25.dim('Session endpoint: POST /sessions { "prompt": "..." }')}
 `);
-  const handleShutdown = async () => {
-    await server.close();
-    process.exit(0);
+  let shutdownPromise = null;
+  let shutdownTimer = null;
+  const handleShutdown = (signal) => {
+    if (shutdownPromise) {
+      console.error(pc25.red(`Received ${signal} during shutdown. Forcing Flint server exit.`));
+      process.exit(1);
+    }
+    console.log(pc25.dim(`Received ${signal}. Shutting down Flint server...`));
+    shutdownTimer = setTimeout(() => {
+      console.error(pc25.red(`Flint server did not shut down within ${SERVER_SHUTDOWN_TIMEOUT_MS}ms. Forcing exit.`));
+      process.exit(1);
+    }, SERVER_SHUTDOWN_TIMEOUT_MS);
+    shutdownTimer.unref?.();
+    shutdownPromise = (async () => {
+      try {
+        await server.close();
+        process.exit(0);
+      } catch (error3) {
+        const message = error3 instanceof Error ? error3.message : String(error3);
+        console.error(pc25.red(`Flint server shutdown failed: ${message}`));
+        process.exit(1);
+      } finally {
+        if (shutdownTimer) {
+          clearTimeout(shutdownTimer);
+          shutdownTimer = null;
+        }
+      }
+    })();
   };
-  process.on("SIGINT", handleShutdown);
-  process.on("SIGTERM", handleShutdown);
+  process.on("SIGINT", () => handleShutdown("SIGINT"));
+  process.on("SIGTERM", () => handleShutdown("SIGTERM"));
+});
+serverCommand.command("dev").description("Start the server in dev mode with auto-reload on source changes").option("-p, --port <port>", "Port to bind").option("--path <dir>", "Path to flint (default: auto-detect)").action(async (options) => {
+  const require2 = createRequire(import.meta.url);
+  let serverPkgDir;
+  try {
+    const serverPkgJson = require2.resolve(`${FLINT_SERVER_PACKAGE}/package.json`);
+    serverPkgDir = path3.dirname(serverPkgJson);
+  } catch {
+    console.error(pc25.red("Error: flint-server package not found."));
+    process.exit(1);
+  }
+  const devEntry = path3.join(serverPkgDir, "src", "dev.ts");
+  try {
+    await stat4(devEntry);
+  } catch {
+    console.error(pc25.red("Dev mode requires the server source directory."));
+    console.log(pc25.dim("This command only works from the monorepo development environment."));
+    process.exit(1);
+  }
+  const env = { ...process.env };
+  if (options.port) env.FLINT_SERVER_PORT = String(options.port);
+  if (options.path) {
+    env.FLINT_PATH = options.path;
+  } else {
+    const detected = await findFlintRoot(process.cwd());
+    if (detected) env.FLINT_PATH = detected;
+  }
+  console.log(`${pc25.bold(pc25.blue("Flint Server"))} ${pc25.dim("dev mode \u2014 watching for changes")}
+`);
+  const child = spawn4("tsx", ["watch", devEntry], {
+    env,
+    stdio: "inherit",
+    cwd: serverPkgDir
+  });
+  child.on("exit", (code) => process.exit(code ?? 0));
+  process.on("SIGTERM", () => child.kill("SIGTERM"));
+  process.on("SIGINT", () => child.kill("SIGINT"));
 });
-serverCommand.command("status").description("Check server status").option("--server <url>", "Server URL", "http://127.0.0.1:7433").action(async (options) => {
+serverCommand.command("status").description("Check server status").option("--server <url>", "Server URL", "http://127.0.0.1:13040").action(async (options) => {
   const serverUrl = options.server;
   try {
     const response = await fetch(`${serverUrl}/health`);
@@ -7223,10 +8197,15 @@ ${pc25.bold("Sessions")}`);
     console.log(pc25.yellow("Server not running. Start with: flint server start"));
   }
 });
-serverCommand.command("stop").description("Stop the Flint server").option("--server <url>", "Server URL", "http://127.0.0.1:7433").action(async (options) => {
+serverCommand.command("stop").description("Stop the Flint server").option("--server <url>", "Server URL", "http://127.0.0.1:13040").action(async (options) => {
   const serverUrl = options.server;
   try {
-    const response = await fetch(`${serverUrl}/shutdown`, { method: "POST" });
+    const response = await fetch(`${serverUrl}/shutdown`, {
+      method: "POST",
+      headers: {
+        [SHUTDOWN_HEADER_NAME]: SHUTDOWN_HEADER_VALUE
+      }
+    });
     if (!response.ok) {
       console.log(pc25.yellow("Server not running."));
       return;
@@ -7236,15 +8215,38 @@ serverCommand.command("stop").description("Stop the Flint server").option("--ser
     console.log(pc25.yellow("Server not running."));
   }
 });
+serverCommand.command("list").description("List all running Flint servers from the shared registry").action(async () => {
+  const { readAndValidateRegistry, getServerRegistryPath } = await importFlintServer();
+  const servers = await readAndValidateRegistry();
+  console.log(pc25.dim(`Registry: ${getServerRegistryPath()}
+`));
+  if (servers.length === 0) {
+    console.log(pc25.yellow("No running Flint servers found."));
+    return;
+  }
+  console.log(`${pc25.bold("Running Flint Servers")} (${servers.length})
+`);
+  for (const server of servers) {
+    console.log(`  ${pc25.bold(pc25.blue(server.name))}`);
+    console.log(`    URL:   ${pc25.cyan(server.url)}`);
+    console.log(`    Path:  ${pc25.dim(server.flintPath)}`);
+    console.log(`    PID:   ${server.pid}`);
+    console.log(`    Since: ${pc25.dim(server.started)}`);
+    if (server.flintId) {
+      console.log(`    ID:    ${pc25.dim(server.flintId)}`);
+    }
+    console.log();
+  }
+});
 
 // src/commands/runtime.ts
 import { Command as Command23 } from "commander";
 import pc26 from "picocolors";
-import path3 from "path";
+import path4 from "path";
 var runtimeCommand = new Command23("runtime").description("Manage Flint runtimes");
-runtimeCommand.command("start [flintPath]").description("Start runtime for a Flint").option("--server <url>", "Server URL", "http://127.0.0.1:7433").action(async (flintPath, options) => {
+runtimeCommand.command("start [flintPath]").description("Start runtime for a Flint").option("--server <url>", "Server URL", "http://127.0.0.1:13040").action(async (flintPath, options) => {
   const serverUrl = options.server;
-  const resolvedPath = flintPath ? path3.resolve(flintPath) : await findFlintRoot(process.cwd());
+  const resolvedPath = flintPath ? path4.resolve(flintPath) : await findFlintRoot(process.cwd());
   if (!resolvedPath) {
     console.error(pc26.red("Error: Not inside a Flint workspace. Provide a path or cd into one."));
     process.exit(1);
@@ -7271,12 +8273,12 @@ ${pc26.bold("Runtime Started")}`);
     process.exit(1);
   }
 });
-runtimeCommand.command("stop [runtimeId]").description("Stop a running runtime").option("--path <dir>", "Path to Flint").option("--server <url>", "Server URL", "http://127.0.0.1:7433").action(async (runtimeId, options) => {
+runtimeCommand.command("stop [runtimeId]").description("Stop a running runtime").option("--path <dir>", "Path to Flint").option("--server <url>", "Server URL", "http://127.0.0.1:13040").action(async (runtimeId, options) => {
   const serverUrl = options.server;
   let id = runtimeId;
   try {
     if (!id) {
-      const lookupPath = options.path ? path3.resolve(options.path) : await findFlintRoot(process.cwd());
+      const lookupPath = options.path ? path4.resolve(options.path) : await findFlintRoot(process.cwd());
       if (!lookupPath) {
         console.error(pc26.red("Error: Provide a runtime ID or Flint path."));
         process.exit(1);
@@ -7307,7 +8309,7 @@ runtimeCommand.command("stop [runtimeId]").description("Stop a running runtime")
     process.exit(1);
   }
 });
-runtimeCommand.command("list").description("List active runtimes").option("--server <url>", "Server URL", "http://127.0.0.1:7433").action(async (options) => {
+runtimeCommand.command("list").description("List active runtimes").option("--server <url>", "Server URL", "http://127.0.0.1:13040").action(async (options) => {
   const serverUrl = options.server;
   try {
     const response = await fetch(`${serverUrl}/runtimes`);
@@ -7337,34 +8339,38 @@ ${pc26.bold("Active Runtimes")}
 // src/commands/code.ts
 import { Command as Command24 } from "commander";
 import pc29 from "picocolors";
-import { spawn as spawn4, execSync as execSync3 } from "child_process";
+import { spawn as spawn5, execSync as execSync3 } from "child_process";
 import { createInterface as createInterface5 } from "readline";
-import { existsSync as existsSync6 } from "fs";
+import { existsSync as existsSync9, mkdirSync as mkdirSync3, readFileSync as readFileSync7, writeFileSync as writeFileSync2 } from "fs";
 import { randomUUID as randomUUID3 } from "crypto";
 import { join as join13 } from "path";
 
-// src/commands/export-session.ts
-import { writeFile as writeFile3, mkdir as mkdir5, stat as stat4, readFile as readFile6 } from "fs/promises";
-import { join as join11 } from "path";
-import { homedir as homedir6 } from "os";
-import pc27 from "picocolors";
-
 // ../../packages/orbh/dist/index.js
 import { randomUUID } from "crypto";
 import { mkdirSync, readdirSync, readFileSync as readFileSync2, renameSync, writeFileSync } from "fs";
 import { existsSync as existsSync5 } from "fs";
 import { join as join10 } from "path";
 import { randomUUID as randomUUID2 } from "crypto";
-import { closeSync, existsSync as existsSync22, openSync, readSync, statSync, unwatchFile, watch, watchFile } from "fs";
-import { existsSync as existsSync32 } from "fs";
+import { existsSync as existsSync22, readFileSync as readFileSync22 } from "fs";
+import { closeSync, existsSync as existsSync32, openSync, readSync, statSync, unwatchFile, watch, watchFile } from "fs";
+import { existsSync as existsSync42, readFileSync as readFileSync3, unwatchFile as unwatchFile2, watch as watch2, watchFile as watchFile2 } from "fs";
+import { existsSync as existsSync52 } from "fs";
 import { join as join22 } from "path";
 import { homedir as homedir5 } from "os";
 import { spawnSync as spawnSync3 } from "child_process";
-import { readdirSync as readdirSync2, readFileSync as readFileSync22 } from "fs";
-import { existsSync as existsSync42 } from "fs";
+import { readdirSync as readdirSync2, readFileSync as readFileSync4 } from "fs";
+import { existsSync as existsSync6 } from "fs";
 import { join as join32 } from "path";
 import { homedir as homedir22 } from "os";
 import { spawnSync as spawnSync22 } from "child_process";
+import { existsSync as existsSync7, readdirSync as readdirSync3, readFileSync as readFileSync5, statSync as statSync2 } from "fs";
+import { spawnSync as spawnSync32 } from "child_process";
+import { basename as basename4, join as join42 } from "path";
+import { homedir as homedir32 } from "os";
+import { existsSync as existsSync8, readdirSync as readdirSync4, readFileSync as readFileSync6, statSync as statSync3 } from "fs";
+import { spawnSync as spawnSync4 } from "child_process";
+import { homedir as homedir42 } from "os";
+import { basename as basename22, join as join52 } from "path";
 var RUN_TRANSITIONS = {
   running: ["completed", "failed", "cancelled", "suspended"],
   completed: [],
@@ -7424,26 +8430,84 @@ function addRequest(session, request) {
 function answerRequest(session, requestId, response) {
   const terminalRunStatuses = ["completed", "failed", "cancelled"];
   const currentRun = getCurrentRun2(session);
-  if (!currentRun) {
-    return void 0;
-  }
-  const request = currentRun.requests.find((r) => r.id === requestId);
-  if (!request) {
-    return void 0;
-  }
-  if (request.type !== "deferred" && terminalRunStatuses.includes(currentRun.status)) {
-    return void 0;
+  for (let i = session.runs.length - 1; i >= 0; i--) {
+    const run = session.runs[i];
+    if (!run) {
+      continue;
+    }
+    const request = run.requests.find((entry) => entry.id === requestId);
+    if (!request) {
+      continue;
+    }
+    if (request.type !== "deferred") {
+      if (run !== currentRun || terminalRunStatuses.includes(run.status)) {
+        return void 0;
+      }
+    }
+    request.response = response ?? null;
+    request.answered = (/* @__PURE__ */ new Date()).toISOString();
+    return request;
   }
-  request.response = response ?? null;
-  request.answered = (/* @__PURE__ */ new Date()).toISOString();
-  return request;
+  return void 0;
 }
 function getPendingRequest(session) {
+  for (let i = session.runs.length - 1; i >= 0; i--) {
+    const run = session.runs[i];
+    if (!run) {
+      continue;
+    }
+    for (let j = run.requests.length - 1; j >= 0; j--) {
+      const request = run.requests[j];
+      if (request && request.answered === null) {
+        return request;
+      }
+    }
+  }
+  return void 0;
+}
+var TERMINAL_SESSION_STATUSES = ["finished", "failed", "cancelled"];
+function isTerminalSessionStatus(status) {
+  return TERMINAL_SESSION_STATUSES.includes(status);
+}
+function isProcessAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function healSession(session) {
+  if (isTerminalSessionStatus(session.status)) return false;
   const currentRun = getCurrentRun2(session);
   if (!currentRun) {
-    return void 0;
+    session.status = "failed";
+    return true;
+  }
+  if (currentRun.status !== "running") return false;
+  const alive = currentRun.pid ? isProcessAlive(currentRun.pid) : false;
+  if (alive) return false;
+  const hasResult = currentRun.result !== null;
+  updateCurrentRun2(session, {
+    status: hasResult ? "completed" : "suspended",
+    ended: currentRun.ended ?? (/* @__PURE__ */ new Date()).toISOString()
+  });
+  const pending = getPendingRequest(session);
+  if (pending?.type === "deferred") {
+    session.status = "deferred";
+  } else {
+    session.status = "finished";
   }
-  return currentRun.requests.find((r) => r.answered === null);
+  return true;
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function normalizeSession(session) {
+  return {
+    ...session,
+    metadata: isRecord(session.metadata) ? session.metadata : {}
+  };
 }
 function ensureSessionsDir(sessionsDir) {
   if (!existsSync5(sessionsDir)) {
@@ -7463,6 +8527,7 @@ function createSession2(sessionsDir, runtime2, prompt6, options) {
     prompt: prompt6,
     title: options?.title ?? "",
     description: options?.description ?? "",
+    metadata: options?.metadata ?? {},
     continues: options?.continues ?? null,
     started: timestamp,
     updated: timestamp,
@@ -7478,7 +8543,7 @@ function readSession2(sessionsDir, sessionId) {
     return null;
   }
   try {
-    return JSON.parse(readFileSync2(sessionPath, "utf-8"));
+    return normalizeSession(JSON.parse(readFileSync2(sessionPath, "utf-8")));
   } catch {
     return null;
   }
@@ -7486,7 +8551,7 @@ function readSession2(sessionsDir, sessionId) {
 function writeSession(sessionsDir, session) {
   ensureSessionsDir(sessionsDir);
   const nextSession = {
-    ...session,
+    ...normalizeSession(session),
     updated: (/* @__PURE__ */ new Date()).toISOString()
   };
   const sessionPath = getSessionPath2(sessionsDir, nextSession.id);
@@ -7501,12 +8566,12 @@ function updateSession2(sessionsDir, sessionId, update) {
     return null;
   }
   const { id: _ignoredId, started: _ignoredStarted, ...safeUpdate } = update;
-  const nextSession = {
+  const nextSession = normalizeSession({
     ...session,
     ...safeUpdate,
     id: session.id,
     started: session.started
-  };
+  });
   writeSession(sessionsDir, nextSession);
   return nextSession;
 }
@@ -7751,7 +8816,7 @@ function formatSubagent(agentId, agentType, prompt6, transcript, opts, depth) {
 function formatTurnContent(content, opts, depth) {
   switch (content.type) {
     case "text":
-      return [content.text, ""];
+      return ["````", content.text, "````", ""];
     case "thinking": {
       if (!opts.includeThinking) return [];
       if (content.encrypted) {
@@ -7831,11 +8896,11 @@ function createClaudeMapperContext(toolIdMap = /* @__PURE__ */ new Map()) {
     activeSubagents: /* @__PURE__ */ new Map()
   };
 }
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isClaudeContentBlockArray(value) {
-  return Array.isArray(value) && value.every((item) => isRecord(item));
+  return Array.isArray(value) && value.every((item) => isRecord2(item));
 }
 function stringifyContent(value) {
   if (typeof value === "string") {
@@ -7844,7 +8909,7 @@ function stringifyContent(value) {
   if (Array.isArray(value)) {
     return value.map((item) => stringifyContent(item)).join("\n");
   }
-  if (isRecord(value)) {
+  if (isRecord2(value)) {
     return JSON.stringify(value);
   }
   if (value === null || value === void 0) {
@@ -7856,7 +8921,7 @@ function toTimestamp(entry) {
   return typeof entry.timestamp === "string" ? entry.timestamp : (/* @__PURE__ */ new Date(0)).toISOString();
 }
 function mapUserEntry(entry, context) {
-  const message = isRecord(entry.message) ? entry.message : null;
+  const message = isRecord2(entry.message) ? entry.message : null;
   if (!message) {
     return [];
   }
@@ -7917,7 +8982,7 @@ function mapUserEntry(entry, context) {
   return mappedEntries;
 }
 function mapAssistantEntry(entry, context) {
-  const message = isRecord(entry.message) ? entry.message : null;
+  const message = isRecord2(entry.message) ? entry.message : null;
   if (!message || !isClaudeContentBlockArray(message.content)) {
     return [];
   }
@@ -7947,12 +9012,12 @@ function mapAssistantEntry(entry, context) {
         type: "tool-call",
         id: block.id,
         tool: block.name,
-        input: isRecord(block.input) ? block.input : {},
+        input: isRecord2(block.input) ? block.input : {},
         timestamp
       });
     }
   }
-  const usage = isRecord(message.usage) ? message.usage : null;
+  const usage = isRecord2(message.usage) ? message.usage : null;
   if (usage) {
     const usageEntry = {
       type: "usage",
@@ -7968,7 +9033,7 @@ function mapAssistantEntry(entry, context) {
   return mappedEntries;
 }
 function mapAgentProgressEntry(entry, context) {
-  const data = isRecord(entry.data) ? entry.data : null;
+  const data = isRecord2(entry.data) ? entry.data : null;
   if (!data || typeof data.agentId !== "string") {
     return [];
   }
@@ -7977,7 +9042,7 @@ function mapAgentProgressEntry(entry, context) {
   const parentToolCallId = typeof entry.parentToolUseID === "string" ? entry.parentToolUseID : "";
   const prompt6 = typeof data.prompt === "string" ? data.prompt : void 0;
   const agentType = typeof data.agentType === "string" ? data.agentType : void 0;
-  const nestedMessage = isRecord(data.message) ? data.message : null;
+  const nestedMessage = isRecord2(data.message) ? data.message : null;
   const mappedEntries = [];
   if (!context.activeSubagents.has(agentId)) {
     context.activeSubagents.set(agentId, {
@@ -8010,7 +9075,7 @@ function mapAgentProgressEntry(entry, context) {
   return mappedEntries;
 }
 function mapProgressEntry(entry, context) {
-  const data = isRecord(entry.data) ? entry.data : null;
+  const data = isRecord2(entry.data) ? entry.data : null;
   if (!data || typeof data.type !== "string") {
     return [];
   }
@@ -8057,7 +9122,7 @@ function buildClaudeToolIdMap(entries) {
     if (entry.type !== "assistant") {
       continue;
     }
-    const message = isRecord(entry.message) ? entry.message : null;
+    const message = isRecord2(entry.message) ? entry.message : null;
     if (!message || !isClaudeContentBlockArray(message.content)) {
       continue;
     }
@@ -8100,17 +9165,17 @@ function createCodexMapperContext(toolIdMap = /* @__PURE__ */ new Map()) {
     activeSubagents: /* @__PURE__ */ new Map()
   };
 }
-function isRecord2(value) {
+function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function stringifyValue(value) {
+function stringifyValue2(value) {
   if (typeof value === "string") {
     return value;
   }
   if (Array.isArray(value)) {
-    return value.map((item) => stringifyValue(item)).join("\n");
+    return value.map((item) => stringifyValue2(item)).join("\n");
   }
-  if (isRecord2(value)) {
+  if (isRecord3(value)) {
     return JSON.stringify(value);
   }
   if (value === null || value === void 0) {
@@ -8119,13 +9184,13 @@ function stringifyValue(value) {
   return String(value);
 }
 function parseObjectInput(value) {
-  if (isRecord2(value)) {
+  if (isRecord3(value)) {
     return value;
   }
   if (typeof value === "string") {
     try {
       const parsed = JSON.parse(value);
-      return isRecord2(parsed) ? parsed : {};
+      return isRecord3(parsed) ? parsed : {};
     } catch {
       return {};
     }
@@ -8137,7 +9202,7 @@ function extractTextContent(content) {
     return "";
   }
   return content.map((block) => {
-    if (!isRecord2(block)) {
+    if (!isRecord3(block)) {
       return "";
     }
     const text = block.text;
@@ -8149,7 +9214,7 @@ function extractReasoningSummary(summary) {
     return "";
   }
   return summary.map((item) => {
-    if (!isRecord2(item)) {
+    if (!isRecord3(item)) {
       return "";
     }
     const text = item.text;
@@ -8157,14 +9222,14 @@ function extractReasoningSummary(summary) {
   }).filter((text) => text.length > 0).join("\n");
 }
 function inferToolResultError(output) {
-  if (isRecord2(output)) {
-    const metadata = isRecord2(output.metadata) ? output.metadata : null;
+  if (isRecord3(output)) {
+    const metadata = isRecord3(output.metadata) ? output.metadata : null;
     return metadata?.exit_code !== void 0 && typeof metadata.exit_code === "number" && metadata.exit_code !== 0;
   }
   if (typeof output === "string") {
     try {
       const parsed = JSON.parse(output);
-      if (isRecord2(parsed)) {
+      if (isRecord3(parsed)) {
         return inferToolResultError(parsed);
       }
     } catch {
@@ -8222,14 +9287,14 @@ function mapFunctionCallOutputPayload(payload, timestamp, context) {
       type: "tool-result",
       id: payload.call_id,
       tool: context.toolIdMap.get(payload.call_id) ?? "unknown",
-      output: stringifyValue(output),
+      output: stringifyValue2(output),
       error: inferToolResultError(output),
       timestamp
     }
   ];
 }
 function mapWebSearchCallPayload(payload, timestamp) {
-  const action = isRecord2(payload.action) ? payload.action : null;
+  const action = isRecord3(payload.action) ? payload.action : null;
   const query = typeof action?.query === "string" ? action.query : "web_search";
   return [
     {
@@ -8253,8 +9318,8 @@ function getSubagentId(payload) {
     }
   }
   const nestedIds = [
-    isRecord2(payload.new_thread_id) ? payload.new_thread_id.id : void 0,
-    isRecord2(payload.receiver_thread_id) ? payload.receiver_thread_id.id : void 0
+    isRecord3(payload.new_thread_id) ? payload.new_thread_id.id : void 0,
+    isRecord3(payload.receiver_thread_id) ? payload.receiver_thread_id.id : void 0
   ];
   for (const nestedId of nestedIds) {
     if (typeof nestedId === "string" && nestedId.length > 0) {
@@ -8266,8 +9331,8 @@ function getSubagentId(payload) {
 function mapEventPayload(payload, timestamp, context) {
   switch (payload.type) {
     case "token_count": {
-      const info = isRecord2(payload.info) ? payload.info : null;
-      const usage = isRecord2(info?.total_token_usage) ? info?.total_token_usage : isRecord2(info?.last_token_usage) ? info?.last_token_usage : null;
+      const info = isRecord3(payload.info) ? payload.info : null;
+      const usage = isRecord3(info?.total_token_usage) ? info?.total_token_usage : isRecord3(info?.last_token_usage) ? info?.last_token_usage : null;
       if (!usage) {
         return [];
       }
@@ -8309,7 +9374,7 @@ function mapEventPayload(payload, timestamp, context) {
       if (!agentId) {
         return [];
       }
-      const nestedText = typeof payload.prompt === "string" && payload.prompt.length > 0 ? payload.prompt : stringifyValue(payload.status);
+      const nestedText = typeof payload.prompt === "string" && payload.prompt.length > 0 ? payload.prompt : stringifyValue2(payload.status);
       return [
         {
           type: "subagent-entry",
@@ -8367,7 +9432,7 @@ function buildCodexToolIdMap(entries) {
     if (entry.type !== "response_item") {
       continue;
     }
-    const payload = isRecord2(entry.payload) ? entry.payload : null;
+    const payload = isRecord3(entry.payload) ? entry.payload : null;
     if (!payload) {
       continue;
     }
@@ -8380,7 +9445,7 @@ function buildCodexToolIdMap(entries) {
 function mapCodexEntry(entry, context) {
   const timestamp = typeof entry.timestamp === "string" ? entry.timestamp : (/* @__PURE__ */ new Date(0)).toISOString();
   if (entry.type === "turn_context") {
-    const payload2 = isRecord2(entry.payload) ? entry.payload : null;
+    const payload2 = isRecord3(entry.payload) ? entry.payload : null;
     context.currentModel = typeof payload2?.model === "string" ? payload2.model : context.currentModel;
     return [];
   }
@@ -8388,7 +9453,7 @@ function mapCodexEntry(entry, context) {
     return [];
   }
   if (entry.type === "compacted") {
-    const payload2 = isRecord2(entry.payload) ? entry.payload : null;
+    const payload2 = isRecord3(entry.payload) ? entry.payload : null;
     return [
       {
         type: "compaction",
@@ -8397,7 +9462,7 @@ function mapCodexEntry(entry, context) {
       }
     ];
   }
-  const payload = isRecord2(entry.payload) ? entry.payload : null;
+  const payload = isRecord3(entry.payload) ? entry.payload : null;
   if (!payload || typeof payload.type !== "string") {
     return [];
   }
@@ -8437,129 +9502,750 @@ function parseCodexTranscript(content) {
   const context = createCodexMapperContext(buildCodexToolIdMap(rawEntries));
   return rawEntries.flatMap((entry) => mapCodexEntry(entry, context));
 }
-var JsonlTranscriptWatcher = class {
-  constructor(transcriptPath, mapper, options) {
-    this.transcriptPath = transcriptPath;
-    this.mapper = mapper;
-    this.mapperState = mapper.createState();
-    this.options = {
-      debounceMs: options?.debounceMs ?? 100,
-      pollIntervalMs: options?.pollIntervalMs ?? 500
-    };
+function createDroidMapperContext(options) {
+  return {
+    toolIdMap: options?.toolIdMap ?? /* @__PURE__ */ new Map(),
+    transcriptPath: options?.transcriptPath
+  };
+}
+function isRecord4(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isDroidContentBlockArray(value) {
+  return Array.isArray(value) && value.every((item) => isRecord4(item));
+}
+function stringifyContent2(value) {
+  if (typeof value === "string") {
+    return value;
   }
-  handlers = /* @__PURE__ */ new Set();
-  entries = [];
-  mapperState;
-  options;
-  byteOffset = 0;
-  buffer = "";
-  watcher = null;
-  debounceTimer = null;
-  started = false;
-  usingPolling = false;
-  onEntries(handler) {
-    this.handlers.add(handler);
+  if (Array.isArray(value)) {
+    return value.map((item) => stringifyContent2(item)).join("\n");
   }
-  start() {
-    if (this.started) {
-      return;
-    }
-    this.started = true;
-    if (existsSync22(this.transcriptPath)) {
-      this.readNewContent();
-    }
-    this.installWatcher();
+  if (isRecord4(value)) {
+    return JSON.stringify(value);
   }
-  stop() {
-    this.started = false;
-    if (this.debounceTimer) {
-      clearTimeout(this.debounceTimer);
-      this.debounceTimer = null;
+  if (value === null || value === void 0) {
+    return "";
+  }
+  return String(value);
+}
+function toTimestamp2(entry) {
+  return typeof entry.timestamp === "string" ? entry.timestamp : (/* @__PURE__ */ new Date(0)).toISOString();
+}
+function buildDroidToolIdMap(entries) {
+  const toolIdMap = /* @__PURE__ */ new Map();
+  for (const entry of entries) {
+    if (entry.type !== "message") {
+      continue;
     }
-    if (this.watcher) {
-      this.watcher.close();
-      this.watcher = null;
+    const message = isRecord4(entry.message) ? entry.message : null;
+    if (message?.role !== "assistant" || !isDroidContentBlockArray(message.content)) {
+      continue;
     }
-    if (this.usingPolling) {
-      unwatchFile(this.transcriptPath);
-      this.usingPolling = false;
+    for (const block of message.content) {
+      if (block.type === "tool_use" && typeof block.id === "string" && typeof block.name === "string") {
+        toolIdMap.set(block.id, block.name);
+      }
     }
   }
-  getEntries() {
-    return [...this.entries];
+  return toolIdMap;
+}
+function resolveUsageSettingsPath(transcriptPath) {
+  if (!transcriptPath || !transcriptPath.endsWith(".jsonl")) {
+    return null;
   }
-  installWatcher() {
-    try {
-      this.watcher = watch(this.transcriptPath, { persistent: false }, () => this.scheduleRead());
-      this.watcher.on("error", () => this.installPollingWatcher());
-    } catch {
-      this.installPollingWatcher();
-    }
+  return transcriptPath.slice(0, -".jsonl".length) + ".settings.json";
+}
+function readUsageSnapshot(transcriptPath) {
+  const settingsPath = resolveUsageSettingsPath(transcriptPath);
+  if (!settingsPath || !existsSync22(settingsPath)) {
+    return null;
   }
-  installPollingWatcher() {
-    if (this.usingPolling) {
-      return;
+  try {
+    const parsed = JSON.parse(readFileSync22(settingsPath, "utf-8"));
+    if (!isRecord4(parsed)) {
+      return null;
     }
-    this.usingPolling = true;
-    watchFile(this.transcriptPath, { interval: this.options.pollIntervalMs, persistent: false }, () => {
-      this.scheduleRead();
-    });
-  }
-  scheduleRead() {
-    if (!this.started) {
-      return;
+    const tokenUsage = isRecord4(parsed.tokenUsage) ? parsed.tokenUsage : null;
+    if (!tokenUsage) {
+      return null;
     }
-    if (this.debounceTimer) {
-      clearTimeout(this.debounceTimer);
+    return {
+      inputTokens: typeof tokenUsage.inputTokens === "number" ? tokenUsage.inputTokens : 0,
+      outputTokens: typeof tokenUsage.outputTokens === "number" ? tokenUsage.outputTokens : 0,
+      cacheCreationTokens: typeof tokenUsage.cacheCreationTokens === "number" ? tokenUsage.cacheCreationTokens : 0,
+      cacheReadTokens: typeof tokenUsage.cacheReadTokens === "number" ? tokenUsage.cacheReadTokens : 0,
+      thinkingTokens: typeof tokenUsage.thinkingTokens === "number" ? tokenUsage.thinkingTokens : 0,
+      model: typeof parsed.model === "string" ? parsed.model : void 0
+    };
+  } catch {
+    return null;
+  }
+}
+function diffUsageSnapshot(current, previous) {
+  const inputTokens = Math.max(0, current.inputTokens - (previous?.inputTokens ?? 0));
+  const outputTokens = Math.max(0, current.outputTokens - (previous?.outputTokens ?? 0));
+  const cacheCreationTokens = Math.max(0, current.cacheCreationTokens - (previous?.cacheCreationTokens ?? 0));
+  const cacheReadTokens = Math.max(0, current.cacheReadTokens - (previous?.cacheReadTokens ?? 0));
+  const reasoningTokens = Math.max(0, current.thinkingTokens - (previous?.thinkingTokens ?? 0));
+  if (inputTokens === 0 && outputTokens === 0 && cacheCreationTokens === 0 && cacheReadTokens === 0 && reasoningTokens === 0) {
+    return null;
+  }
+  return {
+    inputTokens,
+    outputTokens,
+    cacheCreationTokens: cacheCreationTokens || void 0,
+    cacheReadTokens: cacheReadTokens || void 0,
+    reasoningTokens: reasoningTokens || void 0
+  };
+}
+function maybeEmitUsage(context, timestamp) {
+  const snapshot = readUsageSnapshot(context.transcriptPath);
+  if (!snapshot) {
+    return [];
+  }
+  const usageDelta = diffUsageSnapshot(snapshot, context.lastUsageSnapshot);
+  context.lastUsageSnapshot = snapshot;
+  if (!usageDelta) {
+    return [];
+  }
+  return [
+    {
+      type: "usage",
+      model: snapshot.model,
+      timestamp,
+      ...usageDelta
     }
-    this.debounceTimer = setTimeout(() => {
-      this.readNewContent();
-    }, this.options.debounceMs);
+  ];
+}
+function mapDroidUserMessage(entry, context) {
+  const message = isRecord4(entry.message) ? entry.message : null;
+  if (!message) {
+    return [];
   }
-  readNewContent() {
-    if (!this.started || !existsSync22(this.transcriptPath)) {
-      return;
+  const content = message.content;
+  const timestamp = toTimestamp2(entry);
+  if (typeof content === "string") {
+    return [
+      {
+        type: "message",
+        role: "human",
+        text: content,
+        timestamp
+      },
+      ...maybeEmitUsage(context, timestamp)
+    ];
+  }
+  if (!isDroidContentBlockArray(content)) {
+    return maybeEmitUsage(context, timestamp);
+  }
+  const mappedEntries = [];
+  for (const block of content) {
+    if (block.type === "text" && typeof block.text === "string") {
+      mappedEntries.push({
+        type: "message",
+        role: "human",
+        text: block.text,
+        timestamp
+      });
+      continue;
     }
-    let fileSize = 0;
-    try {
-      fileSize = statSync(this.transcriptPath).size;
-    } catch {
-      return;
+    if (block.type === "tool_result" && typeof block.tool_use_id === "string") {
+      const toolId = block.tool_use_id;
+      mappedEntries.push({
+        type: "tool-result",
+        id: toolId,
+        tool: context.toolIdMap.get(toolId) ?? "unknown",
+        output: stringifyContent2(block.content),
+        error: block.is_error === true,
+        timestamp
+      });
     }
-    if (fileSize < this.byteOffset) {
-      this.byteOffset = 0;
-      this.buffer = "";
+  }
+  mappedEntries.push(...maybeEmitUsage(context, timestamp));
+  return mappedEntries;
+}
+function mapDroidAssistantMessage(entry, context) {
+  const message = isRecord4(entry.message) ? entry.message : null;
+  if (!message || !isDroidContentBlockArray(message.content)) {
+    return maybeEmitUsage(context, toTimestamp2(entry));
+  }
+  const mappedEntries = [];
+  const timestamp = toTimestamp2(entry);
+  for (const block of message.content) {
+    if (block.type === "text" && typeof block.text === "string") {
+      mappedEntries.push({
+        type: "message",
+        role: "agent",
+        text: block.text,
+        timestamp
+      });
+      continue;
     }
-    if (fileSize === this.byteOffset) {
-      return;
+    if (block.type === "tool_use" && typeof block.id === "string" && typeof block.name === "string") {
+      context.toolIdMap.set(block.id, block.name);
+      mappedEntries.push({
+        type: "tool-call",
+        id: block.id,
+        tool: block.name,
+        input: isRecord4(block.input) ? block.input : {},
+        timestamp
+      });
     }
-    const bytesToRead = fileSize - this.byteOffset;
-    const buffer = Buffer.alloc(bytesToRead);
-    const fileDescriptor = openSync(this.transcriptPath, "r");
+  }
+  mappedEntries.push(...maybeEmitUsage(context, timestamp));
+  return mappedEntries;
+}
+function mapDroidMessageEntry(entry, context) {
+  const message = isRecord4(entry.message) ? entry.message : null;
+  const role = typeof message?.role === "string" ? message.role : null;
+  if (role === "assistant") {
+    return mapDroidAssistantMessage(entry, context);
+  }
+  if (role === "user" || role === "developer") {
+    return mapDroidUserMessage(entry, context);
+  }
+  return maybeEmitUsage(context, toTimestamp2(entry));
+}
+function mapSessionStart(entry, context) {
+  context.session = {
+    sessionId: typeof entry.id === "string" ? entry.id : void 0,
+    title: typeof entry.title === "string" ? entry.title : void 0,
+    sessionTitle: typeof entry.sessionTitle === "string" ? entry.sessionTitle : void 0,
+    owner: typeof entry.owner === "string" ? entry.owner : void 0,
+    cwd: typeof entry.cwd === "string" ? entry.cwd : void 0,
+    version: typeof entry.version === "number" ? entry.version : void 0
+  };
+  return maybeEmitUsage(context, toTimestamp2(entry));
+}
+function mapCompactionState(entry, context) {
+  const timestamp = toTimestamp2(entry);
+  const anchorMessage = isRecord4(entry.anchorMessage) ? entry.anchorMessage : null;
+  const compactionEntry = {
+    type: "compaction",
+    timestamp,
+    summary: typeof entry.summaryText === "string" ? entry.summaryText : void 0,
+    summaryTokens: typeof entry.summaryTokens === "number" ? entry.summaryTokens : void 0,
+    summaryKind: typeof entry.summaryKind === "string" ? entry.summaryKind : void 0,
+    anchorMessageId: typeof anchorMessage?.id === "string" ? anchorMessage.id : void 0,
+    removedCount: typeof entry.removedCount === "number" ? entry.removedCount : void 0
+  };
+  return [compactionEntry, ...maybeEmitUsage(context, timestamp)];
+}
+function mapDroidEntry(entry, context) {
+  switch (entry.type) {
+    case "session_start":
+      return mapSessionStart(entry, context);
+    case "message":
+      return mapDroidMessageEntry(entry, context);
+    case "compaction_state":
+      return mapCompactionState(entry, context);
+    case "todo_state":
+      return [];
+    default:
+      return [];
+  }
+}
+function parseDroidTranscript(content, options) {
+  const rawEntries = content.split("\n").map((line) => line.trim()).filter((line) => line.length > 0).map((line) => {
     try {
-      readSync(fileDescriptor, buffer, 0, bytesToRead, this.byteOffset);
-    } finally {
-      closeSync(fileDescriptor);
+      return JSON.parse(line);
+    } catch {
+      return null;
     }
-    this.byteOffset = fileSize;
-    const pendingText = `${this.buffer}${buffer.toString("utf-8")}`;
-    const lines = pendingText.split("\n");
-    this.buffer = lines.pop() ?? "";
-    const newEntries = [];
-    for (const line of lines) {
-      const trimmed = line.trim();
-      if (trimmed.length === 0) {
+  }).filter((entry) => entry !== null);
+  const context = createDroidMapperContext({
+    toolIdMap: buildDroidToolIdMap(rawEntries),
+    transcriptPath: options?.transcriptPath
+  });
+  return rawEntries.flatMap((entry) => mapDroidEntry(entry, context));
+}
+function createGeminiMapperContext(toolIdMap = /* @__PURE__ */ new Map()) {
+  return { toolIdMap };
+}
+function isRecord5(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function stringifyValue22(value) {
+  if (typeof value === "string") {
+    return value;
+  }
+  if (Array.isArray(value)) {
+    return value.map((item) => stringifyValue22(item)).filter((item) => item.length > 0).join("\n");
+  }
+  if (isRecord5(value)) {
+    return JSON.stringify(value);
+  }
+  if (value === null || value === void 0) {
+    return "";
+  }
+  return String(value);
+}
+function normalizeTimestamp(value) {
+  return typeof value === "string" ? value : (/* @__PURE__ */ new Date(0)).toISOString();
+}
+function extractUserText(content) {
+  if (typeof content === "string") {
+    return content;
+  }
+  if (!Array.isArray(content)) {
+    return "";
+  }
+  return content.map((item) => {
+    if (!isRecord5(item)) {
+      return "";
+    }
+    if (typeof item.text === "string") {
+      return item.text;
+    }
+    return stringifyValue22(item);
+  }).filter((item) => item.length > 0).join("\n");
+}
+function mapUserMessage(message) {
+  const text = extractUserText(message.content);
+  if (text.length === 0) {
+    return [];
+  }
+  return [
+    {
+      type: "message",
+      role: "human",
+      text,
+      timestamp: normalizeTimestamp(message.timestamp)
+    }
+  ];
+}
+function mapGeminiThoughts(message) {
+  if (!Array.isArray(message.thoughts)) {
+    return [];
+  }
+  const entries = [];
+  for (const thought of message.thoughts) {
+    if (!isRecord5(thought)) {
+      continue;
+    }
+    const parts = [
+      typeof thought.subject === "string" && thought.subject.length > 0 ? thought.subject : "",
+      typeof thought.description === "string" ? thought.description : ""
+    ].filter((part) => part.length > 0);
+    if (parts.length === 0) {
+      continue;
+    }
+    entries.push({
+      type: "thinking",
+      text: parts.join("\n\n"),
+      timestamp: normalizeTimestamp(thought.timestamp ?? message.timestamp)
+    });
+  }
+  return entries;
+}
+function mapGeminiToolCalls(message, context) {
+  if (!Array.isArray(message.toolCalls)) {
+    return [];
+  }
+  const entries = [];
+  for (const toolCall of message.toolCalls) {
+    if (!isRecord5(toolCall) || typeof toolCall.id !== "string") {
+      continue;
+    }
+    const toolName = typeof toolCall.name === "string" ? toolCall.name : "unknown";
+    const timestamp = normalizeTimestamp(toolCall.timestamp ?? message.timestamp);
+    context.toolIdMap.set(toolCall.id, toolName);
+    entries.push({
+      type: "tool-call",
+      id: toolCall.id,
+      tool: toolName,
+      input: isRecord5(toolCall.args) ? toolCall.args : {},
+      timestamp
+    });
+    if (!Array.isArray(toolCall.result)) {
+      continue;
+    }
+    for (const result of toolCall.result) {
+      if (!isRecord5(result)) {
+        continue;
+      }
+      const functionResponse = isRecord5(result.functionResponse) ? result.functionResponse : null;
+      const response = isRecord5(functionResponse?.response) ? functionResponse?.response : null;
+      if (!response) {
+        continue;
+      }
+      const output = typeof response.output === "string" ? response.output : typeof response.error === "string" ? response.error : stringifyValue22(response);
+      entries.push({
+        type: "tool-result",
+        id: typeof functionResponse?.id === "string" ? functionResponse.id : toolCall.id,
+        tool: typeof functionResponse?.name === "string" ? functionResponse.name : context.toolIdMap.get(toolCall.id) ?? toolName,
+        output,
+        error: toolCall.status === "error" || typeof response.error === "string",
+        timestamp
+      });
+    }
+  }
+  return entries;
+}
+function mapGeminiUsage(message) {
+  const tokens = isRecord5(message.tokens) ? message.tokens : null;
+  if (!tokens) {
+    return [];
+  }
+  const entry = {
+    type: "usage",
+    inputTokens: typeof tokens.input === "number" ? tokens.input : 0,
+    outputTokens: typeof tokens.output === "number" ? tokens.output : 0,
+    cacheReadTokens: typeof tokens.cached === "number" ? tokens.cached : void 0,
+    reasoningTokens: typeof tokens.thoughts === "number" ? tokens.thoughts : void 0,
+    model: typeof message.model === "string" ? message.model : void 0,
+    timestamp: normalizeTimestamp(message.timestamp)
+  };
+  return [entry];
+}
+function mapGeminiMessage(message, context) {
+  const timestamp = normalizeTimestamp(message.timestamp);
+  const entries = [];
+  entries.push(...mapGeminiThoughts(message));
+  if (typeof message.content === "string" && message.content.length > 0) {
+    entries.push({
+      type: "message",
+      role: "agent",
+      text: message.content,
+      timestamp
+    });
+  }
+  entries.push(...mapGeminiToolCalls(message, context));
+  entries.push(...mapGeminiUsage(message));
+  return entries;
+}
+function mapInfoMessage(message) {
+  if (typeof message.content !== "string" || message.content.length === 0) {
+    return [];
+  }
+  return [
+    {
+      type: "message",
+      role: "agent",
+      text: message.content,
+      timestamp: normalizeTimestamp(message.timestamp),
+      isMeta: true
+    }
+  ];
+}
+function mapGeminiMessageEntry(message, context) {
+  switch (message.type) {
+    case "user":
+      return mapUserMessage(message);
+    case "gemini":
+      return mapGeminiMessage(message, context);
+    case "info":
+      return mapInfoMessage(message);
+    default:
+      return [];
+  }
+}
+function buildGeminiToolIdMap(messages) {
+  const toolIdMap = /* @__PURE__ */ new Map();
+  for (const message of messages) {
+    if (message.type !== "gemini" || !Array.isArray(message.toolCalls)) {
+      continue;
+    }
+    for (const toolCall of message.toolCalls) {
+      if (!isRecord5(toolCall) || typeof toolCall.id !== "string" || typeof toolCall.name !== "string") {
+        continue;
+      }
+      toolIdMap.set(toolCall.id, toolCall.name);
+    }
+  }
+  return toolIdMap;
+}
+function parseGeminiTranscript(content) {
+  let parsed;
+  try {
+    parsed = JSON.parse(content);
+  } catch {
+    return [];
+  }
+  const messages = Array.isArray(parsed.messages) ? parsed.messages.filter((message) => isRecord5(message)) : [];
+  const context = createGeminiMapperContext(buildGeminiToolIdMap(messages));
+  return messages.flatMap((message) => mapGeminiMessageEntry(message, context));
+}
+var JsonlTranscriptWatcher = class {
+  constructor(transcriptPath, mapper, options) {
+    this.transcriptPath = transcriptPath;
+    this.mapper = mapper;
+    this.mapperState = mapper.createState();
+    this.options = {
+      debounceMs: options?.debounceMs ?? 100,
+      pollIntervalMs: options?.pollIntervalMs ?? 500
+    };
+  }
+  handlers = /* @__PURE__ */ new Set();
+  errorHandlers = /* @__PURE__ */ new Set();
+  entries = [];
+  mapperState;
+  options;
+  byteOffset = 0;
+  buffer = "";
+  watcher = null;
+  debounceTimer = null;
+  started = false;
+  usingPolling = false;
+  onEntries(handler) {
+    this.handlers.add(handler);
+  }
+  onError(handler) {
+    this.errorHandlers.add(handler);
+  }
+  start() {
+    if (this.started) {
+      return;
+    }
+    this.started = true;
+    if (existsSync32(this.transcriptPath)) {
+      this.readNewContent();
+    }
+    this.installWatcher();
+  }
+  stop() {
+    this.started = false;
+    if (this.debounceTimer) {
+      clearTimeout(this.debounceTimer);
+      this.debounceTimer = null;
+    }
+    if (this.watcher) {
+      this.watcher.close();
+      this.watcher = null;
+    }
+    if (this.usingPolling) {
+      unwatchFile(this.transcriptPath);
+      this.usingPolling = false;
+    }
+  }
+  getEntries() {
+    return [...this.entries];
+  }
+  installWatcher() {
+    try {
+      this.watcher = watch(this.transcriptPath, { persistent: false }, () => this.scheduleRead());
+      this.watcher.on("error", (error3) => {
+        this.reportError(error3, "fs.watch failed");
+        this.watcher?.close();
+        this.watcher = null;
+        this.installPollingWatcher();
+      });
+    } catch (error3) {
+      this.reportError(error3, "Failed to install fs.watch");
+      this.installPollingWatcher();
+    }
+  }
+  installPollingWatcher() {
+    if (this.usingPolling) {
+      return;
+    }
+    this.usingPolling = true;
+    watchFile(this.transcriptPath, { interval: this.options.pollIntervalMs, persistent: false }, () => {
+      this.scheduleRead();
+    });
+  }
+  scheduleRead() {
+    if (!this.started) {
+      return;
+    }
+    if (this.debounceTimer) {
+      clearTimeout(this.debounceTimer);
+    }
+    this.debounceTimer = setTimeout(() => {
+      this.readNewContent();
+    }, this.options.debounceMs);
+  }
+  readNewContent() {
+    if (!this.started || !existsSync32(this.transcriptPath)) {
+      return;
+    }
+    let fileSize = 0;
+    try {
+      fileSize = statSync(this.transcriptPath).size;
+    } catch {
+      return;
+    }
+    if (fileSize < this.byteOffset) {
+      this.byteOffset = 0;
+      this.buffer = "";
+    }
+    if (fileSize === this.byteOffset) {
+      return;
+    }
+    const bytesToRead = fileSize - this.byteOffset;
+    const buffer = Buffer.alloc(bytesToRead);
+    const fileDescriptor = openSync(this.transcriptPath, "r");
+    try {
+      readSync(fileDescriptor, buffer, 0, bytesToRead, this.byteOffset);
+    } finally {
+      closeSync(fileDescriptor);
+    }
+    this.byteOffset = fileSize;
+    const pendingText = `${this.buffer}${buffer.toString("utf-8")}`;
+    const lines = pendingText.split("\n");
+    this.buffer = lines.pop() ?? "";
+    const newEntries = [];
+    for (const line of lines) {
+      const trimmed = line.trim();
+      if (trimmed.length === 0) {
         continue;
       }
       try {
-        const parsed = JSON.parse(trimmed);
-        newEntries.push(...this.mapper.map(parsed, this.mapperState));
-      } catch {
-        this.buffer = `${trimmed}
-${this.buffer}`;
-        break;
+        const parsed = JSON.parse(trimmed);
+        newEntries.push(...this.mapper.map(parsed, this.mapperState));
+      } catch {
+        this.buffer = `${trimmed}
+${this.buffer}`;
+        break;
+      }
+    }
+    if (newEntries.length === 0) {
+      return;
+    }
+    this.entries.push(...newEntries);
+    const allEntries = [...this.entries];
+    for (const handler of this.handlers) {
+      handler(newEntries, allEntries);
+    }
+  }
+  reportError(error3, fallbackMessage) {
+    const resolved = error3 instanceof Error ? error3 : new Error(typeof error3 === "string" ? error3 : fallbackMessage);
+    for (const handler of this.errorHandlers) {
+      handler(resolved);
+    }
+  }
+};
+function createJsonlTranscriptWatcher(transcriptPath, mapper, options) {
+  return new JsonlTranscriptWatcher(transcriptPath, mapper, options);
+}
+var JsonSessionWatcher = class {
+  constructor(transcriptPath, mapper, options) {
+    this.transcriptPath = transcriptPath;
+    this.mapper = mapper;
+    this.mapperState = mapper.createState();
+    this.options = {
+      debounceMs: options?.debounceMs ?? 100,
+      pollIntervalMs: options?.pollIntervalMs ?? 500
+    };
+  }
+  handlers = /* @__PURE__ */ new Set();
+  errorHandlers = /* @__PURE__ */ new Set();
+  options;
+  entries = [];
+  mapperState;
+  messageCount = 0;
+  watcher = null;
+  debounceTimer = null;
+  started = false;
+  usingPolling = false;
+  onEntries(handler) {
+    this.handlers.add(handler);
+  }
+  onError(handler) {
+    this.errorHandlers.add(handler);
+  }
+  start() {
+    if (this.started) {
+      return;
+    }
+    this.started = true;
+    if (existsSync42(this.transcriptPath)) {
+      this.readSession();
+    }
+    this.installWatcher();
+  }
+  stop() {
+    this.started = false;
+    if (this.debounceTimer) {
+      clearTimeout(this.debounceTimer);
+      this.debounceTimer = null;
+    }
+    if (this.watcher) {
+      this.watcher.close();
+      this.watcher = null;
+    }
+    if (this.usingPolling) {
+      unwatchFile2(this.transcriptPath);
+      this.usingPolling = false;
+    }
+  }
+  getEntries() {
+    return [...this.entries];
+  }
+  installWatcher() {
+    try {
+      this.watcher = watch2(this.transcriptPath, { persistent: false }, () => this.scheduleRead());
+      this.watcher.on("error", (error3) => {
+        this.reportError(error3, "fs.watch failed");
+        this.watcher?.close();
+        this.watcher = null;
+        this.installPollingWatcher();
+      });
+    } catch (error3) {
+      this.reportError(error3, "Failed to install fs.watch");
+      this.installPollingWatcher();
+    }
+  }
+  installPollingWatcher() {
+    if (this.usingPolling) {
+      return;
+    }
+    this.usingPolling = true;
+    watchFile2(this.transcriptPath, { interval: this.options.pollIntervalMs, persistent: false }, () => {
+      this.scheduleRead();
+    });
+  }
+  scheduleRead() {
+    if (!this.started) {
+      return;
+    }
+    if (this.debounceTimer) {
+      clearTimeout(this.debounceTimer);
+    }
+    this.debounceTimer = setTimeout(() => {
+      this.readSession();
+    }, this.options.debounceMs);
+  }
+  resetState() {
+    this.entries = [];
+    this.mapperState = this.mapper.createState();
+    this.messageCount = 0;
+  }
+  readSession() {
+    if (!this.started || !existsSync42(this.transcriptPath)) {
+      return;
+    }
+    let parsed;
+    try {
+      parsed = JSON.parse(readFileSync3(this.transcriptPath, "utf-8"));
+    } catch (error3) {
+      this.reportError(error3, "Failed to parse JSON session");
+      return;
+    }
+    let messages;
+    try {
+      messages = this.mapper.getMessages(parsed);
+    } catch (error3) {
+      this.reportError(error3, "Failed to read session messages");
+      return;
+    }
+    if (messages.length < this.messageCount) {
+      this.resetState();
+    }
+    const newMessages = messages.slice(this.messageCount);
+    if (newMessages.length === 0) {
+      return;
+    }
+    const newEntries = [];
+    for (const message of newMessages) {
+      try {
+        newEntries.push(...this.mapper.map(message, this.mapperState));
+      } catch (error3) {
+        this.reportError(error3, "Failed to map JSON session entry");
       }
     }
+    this.messageCount = messages.length;
     if (newEntries.length === 0) {
       return;
     }
@@ -8569,9 +10255,15 @@ ${this.buffer}`;
       handler(newEntries, allEntries);
     }
   }
+  reportError(error3, fallbackMessage) {
+    const resolved = error3 instanceof Error ? error3 : new Error(typeof error3 === "string" ? error3 : fallbackMessage);
+    for (const handler of this.errorHandlers) {
+      handler(resolved);
+    }
+  }
 };
-function createJsonlTranscriptWatcher(transcriptPath, mapper, options) {
-  return new JsonlTranscriptWatcher(transcriptPath, mapper, options);
+function createJsonSessionWatcher(transcriptPath, mapper, options) {
+  return new JsonSessionWatcher(transcriptPath, mapper, options);
 }
 function buildTranscriptPath(cwd, nativeSessionId) {
   const sanitized = cwd.replace(/[^a-zA-Z0-9\-_]/g, "-");
@@ -8623,7 +10315,7 @@ function createClaudeHarness() {
     },
     resolveTranscriptPath(nativeSessionId, cwd) {
       const candidate = buildTranscriptPath(cwd, nativeSessionId);
-      if (existsSync32(candidate)) {
+      if (existsSync52(candidate)) {
         return candidate;
       }
       return null;
@@ -8643,7 +10335,7 @@ function createClaudeHarness() {
   };
 }
 function listDateDirectories(root) {
-  if (!existsSync42(root)) {
+  if (!existsSync6(root)) {
     return [];
   }
   const directories = [];
@@ -8668,10 +10360,10 @@ function listDateDirectories(root) {
 }
 function resolveCodexSessionIndex(root, nativeSessionId) {
   const indexPath = join32(root, "session_index.jsonl");
-  if (!existsSync42(indexPath)) {
+  if (!existsSync6(indexPath)) {
     return null;
   }
-  const lines = readFileSync22(indexPath, "utf-8").split("\n");
+  const lines = readFileSync4(indexPath, "utf-8").split("\n");
   for (const line of lines) {
     const trimmed = line.trim();
     if (trimmed.length === 0) {
@@ -8698,56 +10390,406 @@ function createCodexHarness() {
       maxTurns: false,
       budgetLimit: false,
       toolHooks: false,
-      subagentVisibility: true,
+      subagentVisibility: true,
+      structuredOutput: true,
+      permissionBypass: true
+    },
+    buildSpawnArgs(config) {
+      const args = ["exec", config.prompt, "--json", "--dangerously-bypass-approvals-and-sandbox"];
+      if (config.model) {
+        args.push("--model", config.model);
+      }
+      if (config.extraArgs) {
+        args.push(...config.extraArgs);
+      }
+      return args;
+    },
+    buildResumeArgs(nativeSessionId, config) {
+      const args = ["exec", "resume", nativeSessionId, "--json", "--dangerously-bypass-approvals-and-sandbox"];
+      if (config.prompt) {
+        args.push(config.prompt);
+      }
+      if (config.extraArgs) {
+        args.push(...config.extraArgs);
+      }
+      return args;
+    },
+    resolveTranscriptPath(nativeSessionId) {
+      const sessionsRoot = join32(homedir22(), ".codex", "sessions");
+      const indexedPath = resolveCodexSessionIndex(sessionsRoot, nativeSessionId);
+      if (indexedPath) {
+        return indexedPath;
+      }
+      for (const directory of listDateDirectories(sessionsRoot)) {
+        for (const entry of readdirSync2(directory)) {
+          if (entry.includes(nativeSessionId) && entry.endsWith(".jsonl")) {
+            return join32(directory, entry);
+          }
+        }
+      }
+      return null;
+    },
+    createWatcher(transcriptPath) {
+      return createJsonlTranscriptWatcher(transcriptPath, {
+        createState: () => createCodexMapperContext(),
+        map: (entry, state) => mapCodexEntry(entry, state)
+      });
+    },
+    parseTranscript(content) {
+      return parseCodexTranscript(content);
+    },
+    async isAvailable() {
+      return spawnSync22("which", ["codex"], { stdio: "ignore" }).status === 0;
+    }
+  };
+}
+var TRANSCRIPT_DISCOVERY_PADDING_MS = 5 * 6e4;
+var DEFAULT_MAX_DISCOVERY_CANDIDATES = 40;
+function sanitizeFactoryCwd(cwd) {
+  return cwd.replace(/[\\/]/g, "-");
+}
+function buildScopedTranscriptPath(cwd, nativeSessionId) {
+  return join42(homedir32(), ".factory", "sessions", sanitizeFactoryCwd(cwd), `${nativeSessionId}.jsonl`);
+}
+function buildLegacyTranscriptPath(nativeSessionId) {
+  return join42(homedir32(), ".factory", "sessions", `${nativeSessionId}.jsonl`);
+}
+function getDroidSessionsRoot() {
+  return join42(homedir32(), ".factory", "sessions");
+}
+function parseStartedAtMs(startedAt) {
+  if (typeof startedAt === "number" && Number.isFinite(startedAt)) {
+    return startedAt;
+  }
+  if (typeof startedAt === "string") {
+    const parsed = new Date(startedAt).getTime();
+    return Number.isFinite(parsed) ? parsed : null;
+  }
+  return null;
+}
+function isTranscriptRecentEnough(transcriptPath, startedAt) {
+  const startedAtMs = parseStartedAtMs(startedAt);
+  if (startedAtMs == null) {
+    return true;
+  }
+  try {
+    return statSync2(transcriptPath).mtimeMs >= startedAtMs - TRANSCRIPT_DISCOVERY_PADDING_MS;
+  } catch {
+    return true;
+  }
+}
+function readDroidSessionId(transcriptPath) {
+  try {
+    const firstLine = readFileSync5(transcriptPath, "utf-8").split(/\r?\n/, 1)[0]?.trim();
+    if (!firstLine) {
+      return basename4(transcriptPath, ".jsonl");
+    }
+    const parsed = JSON.parse(firstLine);
+    if (typeof parsed.id === "string" && parsed.id.length > 0) {
+      return parsed.id;
+    }
+  } catch {
+  }
+  return basename4(transcriptPath, ".jsonl");
+}
+function listDroidTranscriptPaths(cwd) {
+  const candidateDirs = [join42(getDroidSessionsRoot(), sanitizeFactoryCwd(cwd)), getDroidSessionsRoot()];
+  const transcriptPaths = /* @__PURE__ */ new Map();
+  for (const directory of candidateDirs) {
+    if (!existsSync7(directory)) {
+      continue;
+    }
+    try {
+      for (const entry of readdirSync3(directory, { withFileTypes: true })) {
+        if (!entry.isFile() || !entry.name.endsWith(".jsonl")) {
+          continue;
+        }
+        const transcriptPath = join42(directory, entry.name);
+        transcriptPaths.set(transcriptPath, statSync2(transcriptPath).mtimeMs);
+      }
+    } catch {
+      continue;
+    }
+  }
+  return Array.from(transcriptPaths.entries()).sort((left, right) => right[1] - left[1]).map(([transcriptPath]) => transcriptPath);
+}
+function discoverDroidNativeSessionByOrbhSessionId(cwd, orbhSessionId, options) {
+  const transcriptPaths = listDroidTranscriptPaths(cwd).slice(0, options?.maxCandidates ?? DEFAULT_MAX_DISCOVERY_CANDIDATES);
+  for (const transcriptPath of transcriptPaths) {
+    if (!isTranscriptRecentEnough(transcriptPath, options?.startedAt)) {
+      continue;
+    }
+    try {
+      const content = readFileSync5(transcriptPath, "utf-8");
+      if (!content.includes(orbhSessionId)) {
+        continue;
+      }
+      const nativeSessionId = readDroidSessionId(transcriptPath);
+      if (!nativeSessionId) {
+        continue;
+      }
+      return {
+        nativeSessionId,
+        transcriptPath
+      };
+    } catch {
+      continue;
+    }
+  }
+  return null;
+}
+function createDroidHarness() {
+  return {
+    name: "droid",
+    capabilities: {
+      headless: true,
+      interactive: true,
+      preassignSessionId: true,
+      maxTurns: false,
+      budgetLimit: false,
+      toolHooks: false,
+      subagentVisibility: false,
+      structuredOutput: true,
+      permissionBypass: true
+    },
+    buildSpawnArgs(config) {
+      const args = ["exec", config.prompt, "--output-format", "stream-json"];
+      if (config.sessionId) {
+        args.push("--session-id", config.sessionId);
+      }
+      args.push("--skip-permissions-unsafe", "--cwd", config.cwd);
+      if (config.model) {
+        args.push("--model", config.model);
+      }
+      if (config.extraArgs) {
+        args.push(...config.extraArgs);
+      }
+      return args;
+    },
+    buildResumeArgs(nativeSessionId, config) {
+      const args = [
+        "exec",
+        config.prompt ?? "Continue working",
+        "--session-id",
+        nativeSessionId,
+        "--output-format",
+        "stream-json",
+        "--skip-permissions-unsafe"
+      ];
+      if (config.extraArgs) {
+        args.push(...config.extraArgs);
+      }
+      return args;
+    },
+    resolveTranscriptPath(nativeSessionId, cwd) {
+      const scopedPath = buildScopedTranscriptPath(cwd, nativeSessionId);
+      if (existsSync7(scopedPath)) {
+        return scopedPath;
+      }
+      const legacyPath = buildLegacyTranscriptPath(nativeSessionId);
+      if (existsSync7(legacyPath)) {
+        return legacyPath;
+      }
+      return scopedPath;
+    },
+    createWatcher(transcriptPath) {
+      return createJsonlTranscriptWatcher(transcriptPath, {
+        createState: () => createDroidMapperContext({ transcriptPath }),
+        map: (entry, state) => mapDroidEntry(entry, state)
+      });
+    },
+    parseTranscript(content, options) {
+      return parseDroidTranscript(content, { transcriptPath: options?.transcriptPath });
+    },
+    async isAvailable() {
+      return spawnSync32("which", ["droid"], { stdio: "ignore" }).status === 0;
+    }
+  };
+}
+var TRANSCRIPT_DISCOVERY_PADDING_MS2 = 5 * 6e4;
+var DEFAULT_MAX_DISCOVERY_CANDIDATES2 = 20;
+var DEFAULT_GEMINI_MODEL = "gemini-3.1-pro-preview";
+function slugifyProjectName(name) {
+  return name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+}
+function getGeminiTmpRoot() {
+  return join52(homedir42(), ".gemini", "tmp");
+}
+function getProjectSlug(cwd) {
+  return slugifyProjectName(basename22(cwd));
+}
+function getGeminiChatsDir(cwd) {
+  return join52(getGeminiTmpRoot(), getProjectSlug(cwd), "chats");
+}
+function listGeminiTranscriptPaths(cwd) {
+  const chatsDir = getGeminiChatsDir(cwd);
+  if (!existsSync8(chatsDir)) {
+    return [];
+  }
+  return readdirSync4(chatsDir).filter((entry) => entry.startsWith("session-") && entry.endsWith(".json")).map((entry) => join52(chatsDir, entry)).sort((left, right) => right.localeCompare(left));
+}
+function readGeminiSessionId(transcriptPath) {
+  try {
+    const parsed = JSON.parse(readFileSync6(transcriptPath, "utf-8"));
+    return typeof parsed.sessionId === "string" ? parsed.sessionId : null;
+  } catch {
+    return null;
+  }
+}
+function parseGeminiSessionList(output) {
+  const mapping = /* @__PURE__ */ new Map();
+  for (const line of output.split("\n")) {
+    const match = line.match(/^\s*(\d+)\.\s+.*\[(.+?)\]\s*$/);
+    if (!match) {
+      continue;
+    }
+    const index = match[1];
+    const sessionId = match[2];
+    if (index && sessionId) {
+      mapping.set(sessionId, index);
+    }
+  }
+  return mapping;
+}
+function parseStartedAtMs2(startedAt) {
+  if (typeof startedAt === "number" && Number.isFinite(startedAt)) {
+    return startedAt;
+  }
+  if (typeof startedAt === "string") {
+    const parsed = new Date(startedAt).getTime();
+    return Number.isFinite(parsed) ? parsed : null;
+  }
+  return null;
+}
+function isTranscriptRecentEnough2(transcriptPath, startedAt) {
+  const startedAtMs = parseStartedAtMs2(startedAt);
+  if (startedAtMs == null) {
+    return true;
+  }
+  try {
+    return statSync3(transcriptPath).mtimeMs >= startedAtMs - TRANSCRIPT_DISCOVERY_PADDING_MS2;
+  } catch {
+    return true;
+  }
+}
+function resolveGeminiResumeTarget(nativeSessionId, cwd) {
+  if (nativeSessionId === "latest" || /^\d+$/.test(nativeSessionId)) {
+    return nativeSessionId;
+  }
+  const result = spawnSync4("gemini", ["--list-sessions"], {
+    cwd,
+    encoding: "utf-8",
+    stdio: ["ignore", "pipe", "pipe"]
+  });
+  if (result.status !== 0) {
+    return nativeSessionId;
+  }
+  const sessionIndex = parseGeminiSessionList(result.stdout).get(nativeSessionId);
+  return sessionIndex ?? nativeSessionId;
+}
+function discoverGeminiNativeSession(cwd, options) {
+  const excludedPaths = options?.excludeTranscriptPaths;
+  for (const transcriptPath of listGeminiTranscriptPaths(cwd)) {
+    if (excludedPaths?.has(transcriptPath)) {
+      continue;
+    }
+    const nativeSessionId = readGeminiSessionId(transcriptPath);
+    if (!nativeSessionId) {
+      continue;
+    }
+    return { nativeSessionId, transcriptPath };
+  }
+  return null;
+}
+function discoverGeminiNativeSessionByOrbhSessionId(cwd, orbhSessionId, options) {
+  const transcriptPaths = listGeminiTranscriptPaths(cwd).slice(0, options?.maxCandidates ?? DEFAULT_MAX_DISCOVERY_CANDIDATES2);
+  for (const transcriptPath of transcriptPaths) {
+    if (!isTranscriptRecentEnough2(transcriptPath, options?.startedAt)) {
+      continue;
+    }
+    try {
+      const content = readFileSync6(transcriptPath, "utf-8");
+      if (!content.includes(orbhSessionId)) {
+        continue;
+      }
+      const parsed = JSON.parse(content);
+      if (typeof parsed.sessionId !== "string") {
+        continue;
+      }
+      return {
+        nativeSessionId: parsed.sessionId,
+        transcriptPath
+      };
+    } catch {
+      continue;
+    }
+  }
+  return null;
+}
+async function waitForGeminiNativeSession(cwd, timeoutMs, pollMs, options) {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() <= deadline) {
+    const discovered = discoverGeminiNativeSession(cwd, options);
+    if (discovered) {
+      return discovered;
+    }
+    await new Promise((resolve11) => setTimeout(resolve11, pollMs));
+  }
+  return null;
+}
+function createGeminiHarness() {
+  return {
+    name: "gemini",
+    capabilities: {
+      headless: true,
+      interactive: true,
+      preassignSessionId: false,
+      maxTurns: false,
+      budgetLimit: false,
+      toolHooks: false,
+      subagentVisibility: false,
       structuredOutput: true,
       permissionBypass: true
     },
     buildSpawnArgs(config) {
-      const args = ["exec", config.prompt, "--json", "--dangerously-bypass-approvals-and-sandbox"];
-      if (config.model) {
-        args.push("--model", config.model);
-      }
+      const args = ["-p", config.prompt, "--yolo", "-o", "stream-json"];
+      args.push("--model", config.model || DEFAULT_GEMINI_MODEL);
       if (config.extraArgs) {
         args.push(...config.extraArgs);
       }
       return args;
     },
     buildResumeArgs(nativeSessionId, config) {
-      const args = ["exec", "resume", nativeSessionId];
-      if (config.prompt) {
-        args.push(config.prompt);
-      }
+      const args = ["-p", config.prompt ?? "Continue working", "--yolo", "-o", "stream-json", "--model", DEFAULT_GEMINI_MODEL, "--resume", resolveGeminiResumeTarget(nativeSessionId, config.cwd)];
       if (config.extraArgs) {
         args.push(...config.extraArgs);
       }
       return args;
     },
-    resolveTranscriptPath(nativeSessionId) {
-      const sessionsRoot = join32(homedir22(), ".codex", "sessions");
-      const indexedPath = resolveCodexSessionIndex(sessionsRoot, nativeSessionId);
-      if (indexedPath) {
-        return indexedPath;
-      }
-      for (const directory of listDateDirectories(sessionsRoot)) {
-        for (const entry of readdirSync2(directory)) {
-          if (entry.includes(nativeSessionId) && entry.endsWith(".jsonl")) {
-            return join32(directory, entry);
-          }
+    resolveTranscriptPath(nativeSessionId, cwd) {
+      const prefix = nativeSessionId.slice(0, 8);
+      for (const transcriptPath of listGeminiTranscriptPaths(cwd)) {
+        if (basename22(transcriptPath).includes(prefix)) {
+          return transcriptPath;
+        }
+        if (readGeminiSessionId(transcriptPath) === nativeSessionId) {
+          return transcriptPath;
         }
       }
       return null;
     },
     createWatcher(transcriptPath) {
-      return createJsonlTranscriptWatcher(transcriptPath, {
-        createState: () => createCodexMapperContext(),
-        map: (entry, state) => mapCodexEntry(entry, state)
+      return createJsonSessionWatcher(transcriptPath, {
+        createState: () => createGeminiMapperContext(),
+        getMessages: (payload) => Array.isArray(payload.messages) ? payload.messages.filter((message) => typeof message === "object" && message !== null && !Array.isArray(message)) : [],
+        map: (message, state) => mapGeminiMessageEntry(message, state)
       });
     },
     parseTranscript(content) {
-      return parseCodexTranscript(content);
+      return parseGeminiTranscript(content);
     },
     async isAvailable() {
-      return spawnSync22("which", ["codex"], { stdio: "ignore" }).status === 0;
+      return spawnSync4("which", ["gemini"], { stdio: "ignore" }).status === 0;
     }
   };
 }
@@ -8763,8 +10805,14 @@ function listHarnesses() {
 }
 registerHarness(createClaudeHarness());
 registerHarness(createCodexHarness());
+registerHarness(createDroidHarness());
+registerHarness(createGeminiHarness());
 
 // src/commands/export-session.ts
+import { writeFile as writeFile3, mkdir as mkdir5, stat as stat5, readFile as readFile6 } from "fs/promises";
+import { join as join11 } from "path";
+import { homedir as homedir6 } from "os";
+import pc27 from "picocolors";
 function resolveProjectDir(cwd) {
   return join11(homedir6(), ".claude", "projects", cwd.replace(/[^a-zA-Z0-9\-_]/g, "-"));
 }
@@ -8785,12 +10833,22 @@ function buildFrontmatter(sessionId) {
   return lines.join("\n");
 }
 async function exportSession(flintPath, sessionId) {
+  const existingPath = join11(flintPath, "Mesh", "Agents", "Claude Code", `${sessionId}.md`);
+  try {
+    const existingContent = await readFile6(existingPath, "utf-8");
+    const frontmatterMatch = existingContent.match(/^---\n([\s\S]*?)\n---/);
+    if (frontmatterMatch && !frontmatterMatch[1].includes("live: true")) {
+      console.log(pc27.dim("Session already exported by server, skipping CLI export."));
+      return;
+    }
+  } catch {
+  }
   const projectDir = resolveProjectDir(flintPath);
   let transcriptPath = null;
   for (const name of [`${sessionId}.jsonl`, `transcript-${sessionId}.jsonl`]) {
     const filePath = join11(projectDir, name);
     try {
-      await stat4(filePath);
+      await stat5(filePath);
       transcriptPath = filePath;
       break;
     } catch {
@@ -8817,7 +10875,7 @@ async function exportSession(flintPath, sessionId) {
 }
 
 // src/commands/export-codex-session.ts
-import { writeFile as writeFile4, mkdir as mkdir6, readFile as readFile7, readdir as readdir2, stat as stat5 } from "fs/promises";
+import { writeFile as writeFile4, mkdir as mkdir6, readFile as readFile7, readdir as readdir2, stat as stat6 } from "fs/promises";
 import { join as join12 } from "path";
 import { homedir as homedir7 } from "os";
 import pc28 from "picocolors";
@@ -8838,7 +10896,7 @@ async function findCodexTranscript(sessionId, startedAfter) {
             if (!file.endsWith(".jsonl")) continue;
             if (file.includes(sessionId)) {
               const filePath = join12(dayDir, file);
-              const s = await stat5(filePath);
+              const s = await stat6(filePath);
               if (s.mtimeMs >= startedAfter) {
                 return filePath;
               }
@@ -8868,6 +10926,16 @@ function buildFrontmatter2(sessionId) {
   return lines.join("\n");
 }
 async function exportCodexSession(flintPath, sessionId, startedAt) {
+  const existingPath = join12(flintPath, "Mesh", "Agents", "Codex", `${sessionId}.md`);
+  try {
+    const existingContent = await readFile7(existingPath, "utf-8");
+    const frontmatterMatch = existingContent.match(/^---\n([\s\S]*?)\n---/);
+    if (frontmatterMatch && !frontmatterMatch[1].includes("live: true")) {
+      console.log(pc28.dim("Session already exported by server, skipping CLI export."));
+      return;
+    }
+  } catch {
+  }
   const transcriptPath = await findCodexTranscript(sessionId, startedAt);
   if (!transcriptPath) {
     console.log(pc28.dim("No Codex session transcript found to export."));
@@ -8907,6 +10975,62 @@ function askYesNo(question) {
     });
   });
 }
+function getSessionsDir(flintPath) {
+  return join13(flintPath, ".flint", "sessions");
+}
+function buildSessionFrontmatter(sessionId, runtime2) {
+  const now = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
+  const runtimeTag = runtime2 === "claude" ? "claude-code" : runtime2;
+  const runtimeTitle = runtime2 === "claude" ? "Claude Code" : runtime2.charAt(0).toUpperCase() + runtime2.slice(1);
+  return [
+    "---",
+    `id: ${sessionId}`,
+    "tags:",
+    '  - "#agent/session"',
+    `  - "#agent/${runtimeTag}"`,
+    `date: ${now}`,
+    "---",
+    "",
+    `# ${runtimeTitle} Session`,
+    ""
+  ].join("\n");
+}
+function exportOrbhSessionTranscript(session, flintPath) {
+  const harness = getHarness(session.runtime);
+  if (!harness) {
+    return;
+  }
+  const run = getCurrentRun2(session);
+  const nativeId = run?.nativeSessionId ?? session.id;
+  const transcriptPath = harness.resolveTranscriptPath(nativeId, flintPath);
+  if (!transcriptPath) {
+    console.log(pc29.dim("No transcript found to export."));
+    return;
+  }
+  let content;
+  try {
+    content = readFileSync7(transcriptPath, "utf-8");
+  } catch {
+    console.log(pc29.dim("Could not read transcript file."));
+    return;
+  }
+  const entries = harness.parseTranscript(content);
+  if (entries.length === 0) {
+    console.log(pc29.dim("Transcript is empty, skipping export."));
+    return;
+  }
+  const body = formatTranscriptMarkdown(entries);
+  const markdown = buildSessionFrontmatter(nativeId, session.runtime) + body;
+  const runtimeDir = session.runtime === "claude" ? "Claude Code" : session.runtime.charAt(0).toUpperCase() + session.runtime.slice(1);
+  const outputDir = join13(flintPath, "Mesh", "Agents", runtimeDir);
+  mkdirSync3(outputDir, { recursive: true });
+  const outputPath = join13(outputDir, `${nativeId}.md`);
+  writeFileSync2(outputPath, markdown, "utf-8");
+  console.log(pc29.green(`Session exported \u2192 Mesh/Agents/${runtimeDir}/${nativeId}.md`));
+}
+function buildGeminiInitPrompt(sessionId) {
+  return `init, you are a gemini session, your session id is ${sessionId}, please read init-f.md and (System) Flint Init.md`;
+}
 var CLIENT_INFO = {
   name: "flint_code",
   title: "Flint Code",
@@ -8914,7 +11038,7 @@ var CLIENT_INFO = {
 };
 async function bootstrapCodexSession(cwd, initPrompt) {
   return new Promise((resolve11, reject) => {
-    const proc = spawn4("codex", ["app-server"], {
+    const proc = spawn5("codex", ["app-server"], {
       stdio: ["pipe", "pipe", "pipe"],
       cwd
     });
@@ -8934,7 +11058,7 @@ async function bootstrapCodexSession(cwd, initPrompt) {
     let pollInterval = null;
     const startPolling = () => {
       pollInterval = setInterval(() => {
-        if (sessionPath && existsSync6(sessionPath)) {
+        if (sessionPath && existsSync9(sessionPath)) {
           if (pollInterval) clearInterval(pollInterval);
           send({ method: "turn/interrupt", id: 4, params: { threadId } });
           setTimeout(() => {
@@ -8999,7 +11123,7 @@ codeCommand.command("claude").description("Open Claude Code TUI").option("-p, --
       sessionId = randomUUID3();
       args.push("--session-id", sessionId, await buildClaudeInitPrompt(sessionId));
     }
-    const child = spawn4("claude", args, {
+    const child = spawn5("claude", args, {
       cwd: flintPath,
       stdio: "inherit"
     });
@@ -9068,7 +11192,7 @@ codeCommand.command("codex").description("Open Codex TUI with session tracking")
     console.log(pc29.green(`Session ID: ${threadId}`));
     console.log("");
     const resumePrompt = options.continue ? `continuing session ${threadId}` : `your session id is ${threadId}`;
-    const child = spawn4("codex", [
+    const child = spawn5("codex", [
       "resume",
       threadId,
       "--dangerously-bypass-approvals-and-sandbox",
@@ -9102,7 +11226,7 @@ codeCommand.command("codex").description("Open Codex TUI with session tracking")
     process.exit(1);
   }
 });
-codeCommand.command("gemini").description("Open Gemini CLI with session tracking").option("-p, --path <dir>", "Path to flint (default: auto-detect)").option("-r, --resume <id>", "Resume a previous Gemini session").action(async (options) => {
+codeCommand.command("gemini").description("Open Gemini CLI with Orbh session tracking").option("-p, --path <dir>", "Path to flint (default: auto-detect)").option("-r, --resume <id>", "Resume a previous Gemini or Orbh session").action(async (options) => {
   try {
     const flintPath = options.path || await findFlintRoot(process.cwd());
     if (!flintPath) {
@@ -9111,15 +11235,75 @@ codeCommand.command("gemini").description("Open Gemini CLI with session tracking
       );
       process.exit(1);
     }
-    const args = ["--yolo"];
+    const sessionsDir = getSessionsDir(flintPath);
+    let session;
+    let args;
+    let nativeDiscovery = null;
     if (options.resume) {
-      args.push("--resume", options.resume);
+      const existing = resolveSession2(sessionsDir, options.resume);
+      if (existing) {
+        if (existing.runtime !== "gemini") {
+          console.error(pc29.red(`Error: Session ${options.resume} is a ${existing.runtime} session, not gemini.`));
+          process.exit(1);
+        }
+        session = existing;
+        const lastRun = getCurrentRun2(session);
+        const nativeResumeTarget = resolveGeminiResumeTarget(lastRun?.nativeSessionId ?? "latest", flintPath);
+        addRun2(session, {
+          nativeSessionId: lastRun?.nativeSessionId ?? null,
+          continuesRunId: lastRun?.id ?? null
+        });
+        session.status = "in-progress";
+        writeSession(sessionsDir, session);
+        args = ["--yolo", "--resume", nativeResumeTarget];
+      } else {
+        session = createSession2(sessionsDir, "gemini", "", {
+          title: "(Interactive) Gemini Session",
+          description: "Interactive Gemini CLI session from flint code gemini"
+        });
+        addRun2(session, { nativeSessionId: options.resume });
+        session.status = "in-progress";
+        writeSession(sessionsDir, session);
+        args = ["--yolo", "--resume", options.resume];
+      }
+    } else {
+      session = createSession2(sessionsDir, "gemini", "", {
+        title: "(Interactive) Gemini Session",
+        description: "Interactive Gemini CLI session from flint code gemini"
+      });
+      addRun2(session, { nativeSessionId: null });
+      session.status = "in-progress";
+      writeSession(sessionsDir, session);
+      const knownTranscriptPaths = new Set(listGeminiTranscriptPaths(flintPath));
+      args = ["--yolo", "--prompt-interactive", buildGeminiInitPrompt(session.id)];
+      nativeDiscovery = waitForGeminiNativeSession(flintPath, 3e4, 250, {
+        excludeTranscriptPaths: knownTranscriptPaths
+      }).then((discovered) => {
+        if (!discovered) {
+          return;
+        }
+        const fresh = readSession2(sessionsDir, session.id);
+        if (!fresh) {
+          return;
+        }
+        updateCurrentRun2(fresh, { nativeSessionId: discovered.nativeSessionId });
+        writeSession(sessionsDir, fresh);
+      });
     }
-    const child = spawn4("gemini", args, {
+    const child = spawn5("gemini", args, {
       cwd: flintPath,
-      stdio: "inherit"
+      stdio: "inherit",
+      env: { ...process.env, ORBH_SESSION_ID: session.id }
     });
+    if (child.pid) {
+      updateCurrentRun2(session, { pid: child.pid });
+      session.status = "in-progress";
+      writeSession(sessionsDir, session);
+    }
     child.on("error", (err) => {
+      updateCurrentRun2(session, { status: "failed", ended: (/* @__PURE__ */ new Date()).toISOString() });
+      session.status = "failed";
+      writeSession(sessionsDir, session);
       if (err.code === "ENOENT") {
         console.error(pc29.red("Error: Gemini CLI is not installed."));
         console.log("");
@@ -9130,7 +11314,34 @@ codeCommand.command("gemini").description("Open Gemini CLI with session tracking
       console.error(pc29.red(`Error: ${err.message}`));
       process.exit(1);
     });
-    child.on("exit", (code) => {
+    child.on("exit", async (code) => {
+      if (nativeDiscovery) {
+        await Promise.race([
+          nativeDiscovery,
+          new Promise((resolve11) => setTimeout(resolve11, 500))
+        ]);
+      }
+      const fresh = readSession2(sessionsDir, session.id) ?? session;
+      updateCurrentRun2(fresh, {
+        ended: (/* @__PURE__ */ new Date()).toISOString(),
+        exitCode: code ?? null,
+        status: code === 0 ? "completed" : "failed"
+      });
+      fresh.status = code === 0 ? "finished" : "failed";
+      writeSession(sessionsDir, fresh);
+      try {
+        const nativeId = getCurrentRun2(fresh)?.nativeSessionId ?? fresh.id;
+        if (sessionReferencedInMesh(flintPath, fresh.id) || sessionReferencedInMesh(flintPath, nativeId)) {
+          exportOrbhSessionTranscript(fresh, flintPath);
+        } else {
+          const save = await askYesNo(pc29.dim("Save session transcript? (y/N) "));
+          if (save) {
+            exportOrbhSessionTranscript(fresh, flintPath);
+          }
+        }
+      } catch (err) {
+        console.error(pc29.dim(`Session export failed: ${err instanceof Error ? err.message : err}`));
+      }
       process.exit(code || 0);
     });
   } catch (err) {
@@ -9143,8 +11354,8 @@ codeCommand.command("gemini").description("Open Gemini CLI with session tracking
 // src/commands/helper.ts
 import { Command as Command25 } from "commander";
 import pc30 from "picocolors";
-import { readdirSync as readdirSync3, existsSync as existsSync7, statSync as statSync2 } from "fs";
-import { join as join14, basename as basename4 } from "path";
+import { readdirSync as readdirSync5, existsSync as existsSync10, statSync as statSync4 } from "fs";
+import { join as join14, basename as basename5 } from "path";
 function extractNumberFromFile(filename, typeName) {
   const regex = new RegExp(`^\\(${typeName}\\)\\s+(\\d+)`, "i");
   const match = filename.match(regex);
@@ -9152,18 +11363,18 @@ function extractNumberFromFile(filename, typeName) {
 }
 function collectFilesRecursively(dirPath) {
   const files = [];
-  if (!existsSync7(dirPath)) {
+  if (!existsSync10(dirPath)) {
     return files;
   }
-  const entries = readdirSync3(dirPath);
+  const entries = readdirSync5(dirPath);
   for (const entry of entries) {
     const fullPath = join14(dirPath, entry);
     try {
-      const stat8 = statSync2(fullPath);
-      if (stat8.isDirectory()) {
+      const stat9 = statSync4(fullPath);
+      if (stat9.isDirectory()) {
         files.push(...collectFilesRecursively(fullPath));
-      } else if (stat8.isFile()) {
-        files.push(basename4(fullPath));
+      } else if (stat9.isFile()) {
+        files.push(basename5(fullPath));
       }
     } catch {
       continue;
@@ -9173,7 +11384,7 @@ function collectFilesRecursively(dirPath) {
 }
 function getNextNumber(flintPath, typeName) {
   const meshDir = join14(flintPath, "Mesh");
-  if (!existsSync7(meshDir)) {
+  if (!existsSync10(meshDir)) {
     return 1;
   }
   const allFiles = collectFilesRecursively(meshDir);
@@ -9340,7 +11551,7 @@ var resolveCommand = new Command27("resolve").description("Resolve a reference t
 // src/commands/fulfill.ts
 import { Command as Command28 } from "commander";
 import pc33 from "picocolors";
-import { stat as stat6 } from "fs/promises";
+import { stat as stat7 } from "fs/promises";
 import { resolve as resolve8 } from "path";
 import { homedir as homedir8 } from "os";
 function expandPath3(p) {
@@ -9349,7 +11560,7 @@ function expandPath3(p) {
 }
 async function pathExists(p) {
   try {
-    await stat6(p);
+    await stat7(p);
     return true;
   } catch {
     return false;
@@ -9456,7 +11667,7 @@ function prompt5(message) {
 // src/commands/update.ts
 import { Command as Command29 } from "commander";
 import pc34 from "picocolors";
-import { readFileSync as readFileSync3, existsSync as existsSync8 } from "fs";
+import { readFileSync as readFileSync8, existsSync as existsSync11 } from "fs";
 import { dirname as dirname3, join as join15 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { execSync as execSync4 } from "child_process";
@@ -9465,8 +11676,8 @@ var __dirname2 = dirname3(fileURLToPath2(import.meta.url));
 function readPkgVersion() {
   for (const rel of ["../..", ".."]) {
     const p = join15(__dirname2, rel, "package.json");
-    if (existsSync8(p)) {
-      return JSON.parse(readFileSync3(p, "utf-8")).version;
+    if (existsSync11(p)) {
+      return JSON.parse(readFileSync8(p, "utf-8")).version;
     }
   }
   throw new Error("Could not determine current version");
@@ -9541,11 +11752,11 @@ var updateCommand = new Command29("update").description("Update flint-cli to the
 import { Command as Command30 } from "commander";
 import pc35 from "picocolors";
 import { randomUUID as randomUUID4 } from "crypto";
-import { copyFile as copyFile2, mkdir as mkdir7, writeFile as writeFile5, unlink as unlink2, stat as stat7 } from "fs/promises";
-import { join as join16, basename as basename5, resolve as resolve9 } from "path";
-async function exists3(path4) {
+import { copyFile as copyFile2, mkdir as mkdir7, writeFile as writeFile5, unlink as unlink2, stat as stat8 } from "fs/promises";
+import { join as join16, basename as basename6, resolve as resolve9 } from "path";
+async function exists3(path5) {
   try {
-    await stat7(path4);
+    await stat8(path5);
     return true;
   } catch {
     return false;
@@ -9574,7 +11785,7 @@ var sendCommand = new Command30("send").description("Send files to another Flint
     const copyFileNames = /* @__PURE__ */ new Set();
     if (options.copy) {
       for (const cf of options.copy) {
-        copyFileNames.add(basename5(resolve9(cf)));
+        copyFileNames.add(basename6(resolve9(cf)));
       }
     }
     const moveFiles = [];
@@ -9585,7 +11796,7 @@ var sendCommand = new Command30("send").description("Send files to another Flint
         console.error(pc35.red(`Error: File not found: ${file}`));
         process.exit(1);
       }
-      const fileName = basename5(file);
+      const fileName = basename6(file);
       const entry = { sourcePath, fileName };
       if (copyFileNames.has(fileName)) {
         copyFiles.push(entry);
@@ -9596,8 +11807,8 @@ var sendCommand = new Command30("send").description("Send files to another Flint
     if (options.copy) {
       for (const cf of options.copy) {
         const sourcePath = resolve9(cf);
-        const fileName = basename5(cf);
-        if (files.some((f) => basename5(resolve9(f)) === fileName)) continue;
+        const fileName = basename6(cf);
+        if (files.some((f) => basename6(resolve9(f)) === fileName)) continue;
         if (!await exists3(sourcePath)) {
           console.error(pc35.red(`Error: Copy file not found: ${cf}`));
           process.exit(1);
@@ -9622,7 +11833,7 @@ var sendCommand = new Command30("send").description("Send files to another Flint
     console.log();
     let sourceFlintName = "Unknown";
     try {
-      const { readFlintToml: readFlintToml3 } = await import("./dist-UIVVEOGP.js");
+      const { readFlintToml: readFlintToml3 } = await import("./dist-RGQKIZQW.js");
       const toml = await readFlintToml3(flintPath);
       if (toml?.flint?.name) {
         sourceFlintName = toml.flint.name;
@@ -9721,7 +11932,7 @@ var whoamiCommand = new Command31("whoami").description("Show the current person
 // src/commands/migrate.ts
 import { Command as Command32 } from "commander";
 import pc37 from "picocolors";
-var migrateCommand = new Command32("migrate").description("Run pending workspace migrations").option("-p, --path <dir>", "Path to flint (default: auto-detect)").option("--dry-run", "Show pending migrations without running them").action(async (options) => {
+var migrateCommand = new Command32("migrate").description("Run pending workspace migrations").option("-p, --path <dir>", "Path to flint (default: auto-detect)").option("--dry-run", "Show pending migrations without running them").option("--only <id>", "Run a single migration by ID (no version bump)").option("--list", "List all available migrations from the current version onwards").action(async (options) => {
   try {
     const flintPath = options.path || await findFlintRoot(process.cwd());
     if (!flintPath) {
@@ -9730,6 +11941,75 @@ var migrateCommand = new Command32("migrate").description("Run pending workspace
       );
       process.exit(1);
     }
+    if (options.list) {
+      const check2 = await checkMigrations(flintPath);
+      const steps = getVersionSteps();
+      console.log(pc37.bold("\nAll migrations from current version onwards:\n"));
+      let hasAny = false;
+      for (const step2 of steps) {
+        const stepMigrations = getMigrationsForVersion(step2);
+        const sealed = isVersionStepSealed(step2);
+        const hasPending = stepMigrations.some(
+          (m) => check2.pending.some((p) => p.id === m.id)
+        );
+        const hasSkipped = stepMigrations.some(
+          (m) => check2.skipped.some((s) => s.id === m.id)
+        );
+        if (!hasPending && !hasSkipped) continue;
+        hasAny = true;
+        const sealLabel = sealed ? pc37.green("sealed") : pc37.yellow("unsealed");
+        console.log(pc37.bold(`  \u2192 ${step2}`) + ` ${pc37.dim("(")}${sealLabel}${pc37.dim(")")}`);
+        for (const m of stepMigrations) {
+          const isPending = check2.pending.some((p) => p.id === m.id);
+          const isSkipped = check2.skipped.some((s) => s.id === m.id);
+          const status = isPending ? pc37.yellow("pending") : isSkipped ? pc37.dim("done") : pc37.dim("unknown");
+          console.log(`    ${isPending ? pc37.yellow("\u25CB") : pc37.dim("\u2713")} ${m.name} ${pc37.dim(`[${m.id}]`)} ${pc37.dim("\u2014")} ${status}`);
+          console.log(`      ${pc37.dim(m.description)}`);
+        }
+      }
+      if (!hasAny) {
+        console.log(pc37.green("  No migrations available \u2014 workspace is up to date."));
+      }
+      console.log("");
+      return;
+    }
+    if (options.only) {
+      console.log(pc37.bold(`
+Running single migration: ${options.only}
+`));
+      const result2 = await runSingleMigration(flintPath, options.only, {
+        log: (msg) => console.log(pc37.dim(`  ${msg}`)),
+        warn: (msg) => console.log(pc37.yellow(`  ! ${msg}`)),
+        error: (msg) => console.log(pc37.red(`  \u2717 ${msg}`))
+      });
+      for (const m of result2.applied) {
+        console.log(`  ${pc37.green("\u2713")} ${m.name}`);
+        for (const change of m.changes) {
+          console.log(`    ${pc37.dim("\u2192")} ${change}`);
+        }
+        if (m.warnings) {
+          for (const warning of m.warnings) {
+            console.log(`    ${pc37.yellow("!")} ${warning}`);
+          }
+        }
+      }
+      for (const m of result2.skipped) {
+        console.log(`  ${pc37.dim("\u25CB")} ${m.name} ${pc37.dim("(already done)")}`);
+      }
+      for (const m of result2.failed) {
+        console.log(`  ${pc37.red("\u2717")} ${m.name}`);
+        console.log(`    ${pc37.red("\u2192")} ${m.error}`);
+      }
+      console.log("");
+      if (result2.failed.length > 0) {
+        console.log(pc37.red("Migration failed."));
+        process.exit(1);
+      }
+      if (result2.applied.length > 0) {
+        console.log(pc37.green("\u2713 Migration applied (no version bump)."));
+      }
+      return;
+    }
     const check = await checkMigrations(flintPath);
     if (check.pending.length === 0) {
       console.log(pc37.green("\u2713 No pending migrations."));
@@ -9745,7 +12025,9 @@ var migrateCommand = new Command32("migrate").description("Run pending workspace
 ${check.pending.length} migration(s) pending:
 `));
     for (const [version, items] of groups) {
-      console.log(pc37.bold(`  \u2192 ${version}`));
+      const sealed = isVersionStepSealed(version);
+      const sealLabel = sealed ? pc37.green("sealed") : pc37.yellow("unsealed");
+      console.log(pc37.bold(`  \u2192 ${version}`) + ` ${pc37.dim("(")}${sealLabel}${pc37.dim(")")}`);
       for (const m of items) {
         console.log(`    ${pc37.dim("\u25CB")} ${m.name}`);
         console.log(`      ${pc37.dim(m.description)}`);
@@ -9945,6 +12227,7 @@ async function requireTinderboxRoot() {
 function printSummary(result) {
   console.log(pc40.bold("\nSummary"));
   console.log(`  Cloned: ${result.cloned.length}`);
+  console.log(`  Moved: ${result.moved.length}`);
   console.log(`  Referenced: ${result.referenced.length}`);
   console.log(`  Already present: ${result.present.length}`);
   console.log(`  Registry updated: ${result.registryUpdated.length}`);
@@ -10120,6 +12403,12 @@ var tinderboxCommand = new Command35("tinderbox").description("Orchestrate opera
           console.log(`  ${pc40.green("\u2713")} ${name}`);
         }
       }
+      if (result.moved.length > 0) {
+        console.log(pc40.bold("\nMoved"));
+        for (const entry of result.moved) {
+          console.log(`  ${pc40.green("\u2713")} ${entry.name} ${pc40.dim(`${abbreviatePath(entry.from)} \u2192 ${abbreviatePath(entry.to)}`)}`);
+        }
+      }
       if (result.referenced.length > 0) {
         console.log(pc40.bold("\nReferenced From Registry"));
         for (const name of result.referenced) {
@@ -10263,11 +12552,12 @@ var tinderboxCommand = new Command35("tinderbox").description("Orchestrate opera
 // src/commands/orb.ts
 import { Command as Command36 } from "commander";
 import pc41 from "picocolors";
-import { spawn as spawn5, spawnSync as spawnSync4, execSync as execSync5 } from "child_process";
-import { existsSync as existsSync9, readFileSync as readFileSync4, writeFileSync as writeFileSync2, mkdirSync as mkdirSync3 } from "fs";
+import { spawn as spawn6, spawnSync as spawnSync5, execSync as execSync5 } from "child_process";
+import { existsSync as existsSync12, mkdirSync as mkdirSync4, readFileSync as readFileSync9, readdirSync as readdirSync6, statSync as statSync5, writeFileSync as writeFileSync3 } from "fs";
 import { join as join17 } from "path";
+import { homedir as homedir9 } from "os";
 import { createInterface as createInterface7 } from "readline";
-function getSessionsDir(flintPath) {
+function getSessionsDir2(flintPath) {
   return join17(flintPath, ".flint", "sessions");
 }
 async function resolveFlintPath4(optionPath) {
@@ -10280,7 +12570,7 @@ async function resolveFlintPath4(optionPath) {
 }
 async function resolveCtx(optionPath) {
   const flintPath = await resolveFlintPath4(optionPath);
-  return { flintPath, sessionsDir: getSessionsDir(flintPath) };
+  return { flintPath, sessionsDir: getSessionsDir2(flintPath) };
 }
 function sessionReferencedInMesh2(flintPath, sessionId) {
   try {
@@ -10307,8 +12597,8 @@ function readTranscriptEntries(session, flintPath) {
   const transcriptPath = harness.resolveTranscriptPath(nativeId, flintPath);
   if (!transcriptPath) return null;
   try {
-    const content = readFileSync4(transcriptPath, "utf-8");
-    return harness.parseTranscript(content);
+    const content = readFileSync9(transcriptPath, "utf-8");
+    return harness.parseTranscript(content, { transcriptPath });
   } catch {
     return null;
   }
@@ -10330,7 +12620,7 @@ function formatTokenSummary(usage) {
 var DETACHED_ORB_MONITOR = String.raw`
 const { spawn, spawnSync } = require('node:child_process');
 const { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync, renameSync } = require('node:fs');
-const { dirname, join } = require('node:path');
+const { basename, dirname, join } = require('node:path');
 const { homedir } = require('node:os');
 
 const configJson = process.env.ORBH_MONITOR_CONFIG;
@@ -10388,7 +12678,7 @@ child.on('error', () => {
     updateCurrentRun(s, { status: 'failed', ended: new Date().toISOString() });
     writeSessionFile(s);
   }
-  notify('OrbH Session Failed', (s?.title || s?.description || 'Unknown').slice(0, 100));
+  notify('Orbh Session Failed', (s?.title || s?.description || 'Unknown').slice(0, 100));
   process.exit(1);
 });
 
@@ -10456,6 +12746,57 @@ if (command === 'codex') {
   }, 500);
 }
 
+// Gemini native session discovery — poll for a new session-*.json transcript
+if (command === 'gemini') {
+  const slugify = (name) => name.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '');
+  const geminiChatsDir = join(homedir(), '.gemini', 'tmp', slugify(basename(cwd)), 'chats');
+
+  // Snapshot existing transcript paths before launch to exclude them
+  const existingTranscripts = new Set();
+  try {
+    for (const f of readdirSync(geminiChatsDir)) {
+      if (f.startsWith('session-') && f.endsWith('.json')) {
+        existingTranscripts.add(join(geminiChatsDir, f));
+      }
+    }
+  } catch {}
+
+  function discoverGeminiSession() {
+    if (!existsSync(geminiChatsDir)) return null;
+    const files = readdirSync(geminiChatsDir)
+      .filter(f => f.startsWith('session-') && f.endsWith('.json'))
+      .map(f => join(geminiChatsDir, f))
+      .sort((a, b) => b.localeCompare(a));
+    for (const fp of files) {
+      if (existingTranscripts.has(fp)) continue;
+      try {
+        const parsed = JSON.parse(readFileSync(fp, 'utf-8'));
+        if (typeof parsed.sessionId === 'string') {
+          return { nativeSessionId: parsed.sessionId, transcriptPath: fp };
+        }
+      } catch { continue; }
+    }
+    return null;
+  }
+
+  let geminiDiscoveryAttempts = 0;
+  const geminiMaxAttempts = 60; // 30s at 500ms interval
+  const geminiDiscoveryTimer = setInterval(() => {
+    geminiDiscoveryAttempts++;
+    const found = discoverGeminiSession();
+    if (found) {
+      clearInterval(geminiDiscoveryTimer);
+      const s = readSession();
+      if (s) {
+        updateCurrentRun(s, { nativeSessionId: found.nativeSessionId });
+        writeSessionFile(s);
+      }
+    } else if (geminiDiscoveryAttempts >= geminiMaxAttempts) {
+      clearInterval(geminiDiscoveryTimer);
+    }
+  }, 500);
+}
+
 child.on('exit', (code) => {
   const s = readSession();
   if (!s) { process.exit(typeof code === 'number' ? code : 1); return; }
@@ -10477,7 +12818,7 @@ child.on('exit', (code) => {
       s.status = 'finished';
     }
     writeSessionFile(s);
-    notify('OrbH Session Complete', desc);
+    notify('Orbh Session Complete', desc);
   } else {
     if (!runIsTerminal) {
       updateCurrentRun(s, { status: 'failed' });
@@ -10487,7 +12828,7 @@ child.on('exit', (code) => {
     }
     writeSessionFile(s);
     const errLine = stderr.trim().split(/\r?\n/).find(Boolean);
-    notify('OrbH Session Failed', desc + (errLine ? ': ' + errLine.slice(0, 80) : ' (exit ' + code + ')'));
+    notify('Orbh Session Failed', desc + (errLine ? ': ' + errLine.slice(0, 80) : ' (exit ' + code + ')'));
   }
 
   process.exit(typeof code === 'number' ? code : 1);
@@ -10555,9 +12896,9 @@ async function buildOrbInitPrompt(sessionId, runtime2, flintPath, options) {
   }
   return `init, you are a ${runtime2} session, please read init-f.md and (System) Flint Init.md${identityClause}
 
-You are running in headless mode via OrbH. Your session ID is: ${sessionId}
+You are running in headless mode via Orbh. Your session ID is: ${sessionId}
 
-After initialization, load the Flint OrbH shard by reading Shards/(Dev) Flint OrbH/init-foh.md.
+After initialization, load the Flint Orbh shard by reading Shards/(Dev) Flint Orbh/init-foh.md.
 
 IMPORTANT: Use flint orb commands, NOT flint agent session commands.
 
@@ -10582,11 +12923,12 @@ async function buildInteractiveInitPrompt(sessionId, runtime2, flintPath) {
     }
   } catch {
   }
-  return `init, you are a ${runtime2} session, please read init-f.md and (System) Flint Init.md. Your session ID is ${sessionId}${identityClause}
+  const sessionIdClause = runtime2 === "codex" ? `Your Orbh session ID is ${sessionId}. If Codex later shows you a native Codex session ID or thread ID, that is different from the Orbh session ID and must not be used with flint orb commands.` : `Your session ID is ${sessionId}.`;
+  return `init, you are a ${runtime2} session, please read init-f.md and (System) Flint Init.md. ${sessionIdClause}${identityClause}
 
-You are running as an interactive OrbH session. Your session is tracked via the orbh system.
+You are running as an interactive Orbh session. Your session is tracked via the orbh system.
 
-After initialization, load the Flint OrbH shard by reading Shards/(Dev) Flint OrbH/init-foh.md.
+After initialization, load the Flint Orbh shard by reading Shards/(Dev) Flint Orbh/init-foh.md.
 
 IMPORTANT: Use flint orb commands, NOT flint agent session commands.
 
@@ -10595,7 +12937,7 @@ This is an interactive session \u2014 the human is present and will guide the co
 
 Use flint orb commands to keep your status and interface updated while you work.`;
 }
-function buildSessionFrontmatter(sessionId, runtime2) {
+function buildSessionFrontmatter2(sessionId, runtime2) {
   const now = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
   const runtimeTag = runtime2 === "claude" ? "claude-code" : runtime2;
   const runtimeTitle = runtime2 === "claude" ? "Claude Code" : runtime2.charAt(0).toUpperCase() + runtime2.slice(1);
@@ -10624,29 +12966,29 @@ function exportSessionTranscript(session, flintPath) {
   }
   let content;
   try {
-    content = readFileSync4(transcriptPath, "utf-8");
+    content = readFileSync9(transcriptPath, "utf-8");
   } catch {
     console.log(pc41.dim("Could not read transcript file."));
     return;
   }
-  const entries = harness.parseTranscript(content);
+  const entries = harness.parseTranscript(content, { transcriptPath });
   if (entries.length === 0) {
     console.log(pc41.dim("Transcript is empty, skipping export."));
     return;
   }
   const body = formatTranscriptMarkdown(entries);
-  const markdown = buildSessionFrontmatter(nativeId, session.runtime) + body;
+  const markdown = buildSessionFrontmatter2(nativeId, session.runtime) + body;
   const runtimeDir = session.runtime === "claude" ? "Claude Code" : session.runtime.charAt(0).toUpperCase() + session.runtime.slice(1);
   const outputDir = join17(flintPath, "Mesh", "Agents", runtimeDir);
-  mkdirSync3(outputDir, { recursive: true });
+  mkdirSync4(outputDir, { recursive: true });
   const outputPath = join17(outputDir, `${nativeId}.md`);
-  writeFileSync2(outputPath, markdown, "utf-8");
+  writeFileSync3(outputPath, markdown, "utf-8");
   console.log(pc41.green(`Session exported \u2192 Mesh/Agents/${runtimeDir}/${nativeId}.md`));
 }
 function startDetachedMonitor(sessionsDir, sessionId, cwd, command, args) {
   const sessionPath = getSessionPath2(sessionsDir, sessionId);
   const config = JSON.stringify({ sessionPath, cwd, command, args });
-  const monitor = spawn5(process.execPath, ["-e", DETACHED_ORB_MONITOR], {
+  const monitor = spawn6(process.execPath, ["-e", DETACHED_ORB_MONITOR], {
     cwd,
     detached: true,
     stdio: "ignore",
@@ -10742,51 +13084,24 @@ function formatEntry2(entry, maxLen, depth = 0, agentCalls) {
       return null;
   }
 }
-var orbCommand = new Command36("orb").description("OrbH meta-harness agent management").enablePositionalOptions();
-function isProcessAlive(pid) {
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch {
-    return false;
-  }
-}
+var orbCommand = new Command36("orb").description("Orbh meta-harness agent management").enablePositionalOptions();
 orbCommand.command("heal").description("Fix sessions stuck in non-terminal states (stale PIDs, orphaned runs)").option("-p, --path <dir>", "Path to flint (default: auto-detect)").option("--dry-run", "Show what would be healed without making changes").action(async (options) => {
   const { sessionsDir } = await resolveCtx(options.path);
   const sessions = listSessions2(sessionsDir);
   let healed = 0;
   for (const session of sessions) {
-    if (isTerminalStatus2(session.status)) continue;
     const currentRun = getCurrentRun2(session);
-    if (!currentRun) {
+    const prevStatus = session.status;
+    const prevRunStatus = currentRun?.status;
+    if (healSession(session)) {
+      const runDesc = currentRun ? `run ${shortId2(currentRun.id)} PID ${currentRun.pid ?? "none"} ${prevRunStatus} \u2192 ${currentRun.status}` : `no runs, ${prevStatus} \u2192 ${session.status}`;
       if (options.dryRun) {
-        console.log(`${pc41.yellow("would heal")} ${shortId2(session.id)} \u2014 no runs, status: ${session.status}`);
+        console.log(`${pc41.yellow("would heal")} ${shortId2(session.id)} \u2014 ${runDesc}`);
       } else {
-        session.status = "failed";
         writeSession(sessionsDir, session);
-        console.log(`${pc41.green("healed")} ${shortId2(session.id)} \u2014 no runs \u2192 failed`);
+        console.log(`${pc41.green("healed")} ${shortId2(session.id)} \u2014 ${runDesc}`);
       }
       healed++;
-      continue;
-    }
-    if (currentRun.status === "running") {
-      const pid = currentRun.pid;
-      const alive = pid ? isProcessAlive(pid) : false;
-      if (!alive) {
-        if (options.dryRun) {
-          console.log(`${pc41.yellow("would heal")} ${shortId2(session.id)} \u2014 run ${shortId2(currentRun.id)} PID ${pid ?? "none"} is dead, status: ${session.status}`);
-        } else {
-          updateCurrentRun2(session, {
-            status: "failed",
-            ended: (/* @__PURE__ */ new Date()).toISOString(),
-            exitCode: currentRun.exitCode ?? -1
-          });
-          session.status = "failed";
-          writeSession(sessionsDir, session);
-          console.log(`${pc41.green("healed")} ${shortId2(session.id)} \u2014 dead PID ${pid ?? "none"} \u2192 failed`);
-        }
-        healed++;
-      }
     }
   }
   if (healed === 0) {
@@ -10827,7 +13142,7 @@ orbCommand.command("launch").description("Launch a new headless agent session").
   const run = addRun2(session, { nativeSessionId });
   writeSession(sessionsDir, session);
   startDetachedMonitor(sessionsDir, session.id, flintPath, harness.name, args);
-  console.log(`${pc41.bold("OrbH Agent Session")}`);
+  console.log(`${pc41.bold("Orbh Agent Session")}`);
   console.log(`  ID: ${pc41.cyan(session.id)}`);
   console.log(`  Runtime: ${pc41.cyan(runtime2)}`);
   console.log(`  Run: ${pc41.dim(shortId2(run.id))}`);
@@ -10863,7 +13178,7 @@ orbCommand.command("resume").description("Resume an existing session (adds a new
   session.status = "queued";
   writeSession(sessionsDir, session);
   startDetachedMonitor(sessionsDir, session.id, flintPath, harness.name, args);
-  console.log(`${pc41.bold("OrbH Session Resumed")}`);
+  console.log(`${pc41.bold("Orbh Session Resumed")}`);
   console.log(`  ID: ${pc41.cyan(session.id)}`);
   console.log(`  Run: ${pc41.dim(shortId2(run.id))} (run #${session.runs.length})`);
   console.log("");
@@ -10894,6 +13209,24 @@ function buildCodexResumeArgs(threadId, prompt6, options) {
   if (prompt6) args.push(prompt6);
   return args;
 }
+function buildInteractiveDroidArgs(prompt6) {
+  return prompt6 ? [prompt6] : [];
+}
+function buildInteractiveDroidResumeArgs(nativeSessionId, prompt6) {
+  const args = ["--resume", nativeSessionId];
+  if (prompt6) args.push(prompt6);
+  return args;
+}
+function buildInteractiveGeminiArgs(prompt6, options) {
+  const args = ["--yolo", "--model", options.model || DEFAULT_GEMINI_MODEL];
+  if (prompt6) args.push(prompt6);
+  return args;
+}
+function buildInteractiveGeminiResumeArgs(nativeSessionId, prompt6, options) {
+  const args = ["--yolo", "--model", options.model || DEFAULT_GEMINI_MODEL, "--resume", nativeSessionId];
+  if (prompt6) args.push(prompt6);
+  return args;
+}
 orbCommand.command("i").alias("interactive").description("Launch an interactive agent TUI with orbh session tracking").argument("<runtime>", `Harness runtime (${listHarnesses().join(", ")})`).argument("[prompt]", "Optional initial prompt").option("-p, --path <dir>", "Path to flint (default: auto-detect)").option("-c, --continue <sessionId>", "Continue a previous orbh session").option("--continues <sessionId>", "Link as continuation of another session (new session)").option("--model <model>", "Model override").option("--dev-channels", "Load development MCP channels (e.g. orbh)").option("--no-export", "Skip transcript export on exit").action(async (runtime2, userPrompt, options) => {
   try {
     const { flintPath, sessionsDir } = await resolveCtx(options.path);
@@ -10918,7 +13251,17 @@ orbCommand.command("i").alias("interactive").description("Launch an interactive
       }
       session = existing;
       const lastRun = getCurrentRun2(session);
-      const nativeId = lastRun?.nativeSessionId ?? session.id;
+      let nativeId = lastRun?.nativeSessionId ?? session.id;
+      if (!lastRun?.nativeSessionId && runtime2 === "droid") {
+        nativeId = discoverDroidNativeSessionByOrbhSessionId(flintPath, session.id, {
+          startedAt: lastRun?.started ?? session.started
+        })?.nativeSessionId ?? nativeId;
+      }
+      if (!lastRun?.nativeSessionId && runtime2 === "gemini") {
+        nativeId = discoverGeminiNativeSessionByOrbhSessionId(flintPath, session.id, {
+          startedAt: lastRun?.started ?? session.started
+        })?.nativeSessionId ?? nativeId;
+      }
       const resumePrompt = userPrompt || `continuing session ${session.id}`;
       if (runtime2 === "claude") {
         spawnCommand = "claude";
@@ -10929,6 +13272,12 @@ orbCommand.command("i").alias("interactive").description("Launch an interactive
       } else if (runtime2 === "codex") {
         spawnCommand = "codex";
         spawnArgs = buildCodexResumeArgs(nativeId, resumePrompt, { model: options.model });
+      } else if (runtime2 === "droid") {
+        spawnCommand = "droid";
+        spawnArgs = buildInteractiveDroidResumeArgs(nativeId, resumePrompt);
+      } else if (runtime2 === "gemini") {
+        spawnCommand = "gemini";
+        spawnArgs = buildInteractiveGeminiResumeArgs(nativeId, resumePrompt, { model: options.model });
       } else {
         spawnCommand = harness.name;
         spawnArgs = resumePrompt ? [resumePrompt] : [];
@@ -10936,7 +13285,7 @@ orbCommand.command("i").alias("interactive").description("Launch an interactive
       addRun2(session, { nativeSessionId: nativeId, continuesRunId: lastRun?.id ?? null });
       session.status = "in-progress";
       writeSession(sessionsDir, session);
-      console.log(`${pc41.bold("OrbH Interactive Session (resumed)")}`);
+      console.log(`${pc41.bold("Orbh Interactive Session (resumed)")}`);
       console.log(`  ID: ${pc41.cyan(session.id)}`);
       console.log(`  Run: ${pc41.dim(shortId2(session.runs[session.runs.length - 1].id))} (run #${session.runs.length})`);
       console.log("");
@@ -10975,11 +13324,23 @@ ${prompt6}` : initPrompt;
           process.exit(1);
         }
         spawnCommand = "codex";
-        const codexResumePrompt = `your session id is ${threadId}. Please initialize now.`;
+        const codexResumePrompt = `Your native Codex session ID is ${threadId}. Your Orbh session ID remains ${session.id}. Use the Orbh session ID with flint orb commands, not the native Codex session ID. Please initialize now.`;
         spawnArgs = buildCodexResumeArgs(threadId, codexResumePrompt, { model: options.model });
         addRun2(session, { nativeSessionId: threadId });
         session.status = "in-progress";
         writeSession(sessionsDir, session);
+      } else if (runtime2 === "droid") {
+        spawnCommand = "droid";
+        spawnArgs = buildInteractiveDroidArgs(fullPrompt);
+        addRun2(session, { nativeSessionId: null });
+        session.status = "in-progress";
+        writeSession(sessionsDir, session);
+      } else if (runtime2 === "gemini") {
+        spawnCommand = "gemini";
+        spawnArgs = buildInteractiveGeminiArgs(fullPrompt, { model: options.model });
+        addRun2(session, { nativeSessionId: null });
+        session.status = "in-progress";
+        writeSession(sessionsDir, session);
       } else {
         spawnCommand = harness.name;
         spawnArgs = [fullPrompt];
@@ -10987,17 +13348,48 @@ ${prompt6}` : initPrompt;
         session.status = "in-progress";
         writeSession(sessionsDir, session);
       }
-      console.log(`${pc41.bold("OrbH Interactive Session")}`);
+      console.log(`${pc41.bold("Orbh Interactive Session")}`);
       console.log(`  ID: ${pc41.cyan(session.id)}`);
       console.log(`  Runtime: ${pc41.cyan(runtime2)}`);
       if (options.continues) console.log(`  Continues: ${pc41.dim(options.continues)}`);
       console.log("");
     }
-    const child = spawn5(spawnCommand, spawnArgs, {
+    const child = spawn6(spawnCommand, spawnArgs, {
       cwd: flintPath,
       stdio: "inherit",
       env: { ...process.env, ORBH_SESSION_ID: session.id }
     });
+    if (child.pid) {
+      updateCurrentRun2(session, { pid: child.pid });
+      session.status = "in-progress";
+      writeSession(sessionsDir, session);
+    }
+    let nativeDiscoveryTimer = null;
+    if ((runtime2 === "droid" || runtime2 === "gemini") && !getCurrentRun2(session)?.nativeSessionId) {
+      const startedAt = getCurrentRun2(session)?.started ?? session.started;
+      nativeDiscoveryTimer = setInterval(() => {
+        const fresh = readSession2(sessionsDir, session.id) ?? session;
+        const currentRun = getCurrentRun2(fresh);
+        if (!currentRun || currentRun.nativeSessionId) {
+          if (nativeDiscoveryTimer) {
+            clearInterval(nativeDiscoveryTimer);
+            nativeDiscoveryTimer = null;
+          }
+          return;
+        }
+        const discovered = runtime2 === "droid" ? discoverDroidNativeSessionByOrbhSessionId(flintPath, session.id, { startedAt }) : discoverGeminiNativeSessionByOrbhSessionId(flintPath, session.id, { startedAt });
+        if (!discovered) {
+          return;
+        }
+        updateCurrentRun2(fresh, { nativeSessionId: discovered.nativeSessionId });
+        writeSession(sessionsDir, fresh);
+        session = fresh;
+        if (nativeDiscoveryTimer) {
+          clearInterval(nativeDiscoveryTimer);
+          nativeDiscoveryTimer = null;
+        }
+      }, 500);
+    }
     child.on("error", (err) => {
       if (err.code === "ENOENT") {
         console.error(pc41.red(`Error: ${runtime2} is not installed.`));
@@ -11010,35 +13402,40 @@ ${prompt6}` : initPrompt;
       process.exit(1);
     });
     child.on("exit", async (code) => {
-      const run = getCurrentRun2(session);
+      if (nativeDiscoveryTimer) {
+        clearInterval(nativeDiscoveryTimer);
+        nativeDiscoveryTimer = null;
+      }
+      const fresh = readSession2(sessionsDir, session.id) ?? session;
+      const run = getCurrentRun2(fresh);
       const runIsTerminal = run && (run.status === "completed" || run.status === "failed" || run.status === "cancelled" || run.status === "suspended");
-      updateCurrentRun2(session, { ended: (/* @__PURE__ */ new Date()).toISOString(), exitCode: code });
+      updateCurrentRun2(fresh, { ended: (/* @__PURE__ */ new Date()).toISOString(), exitCode: code });
       if (code === 0) {
         if (!runIsTerminal) {
           const agentReturned = run && run.result;
-          updateCurrentRun2(session, { status: agentReturned ? "completed" : "suspended" });
+          updateCurrentRun2(fresh, { status: agentReturned ? "completed" : "suspended" });
         }
-        if (!isTerminalStatus2(session.status) && session.status !== "deferred") {
-          session.status = "finished";
+        if (!isTerminalStatus2(fresh.status) && fresh.status !== "deferred") {
+          fresh.status = "finished";
         }
       } else {
         if (!runIsTerminal) {
-          updateCurrentRun2(session, { status: "failed" });
+          updateCurrentRun2(fresh, { status: "failed" });
         }
-        if (!isTerminalStatus2(session.status) && session.status !== "deferred") {
-          session.status = "failed";
+        if (!isTerminalStatus2(fresh.status) && fresh.status !== "deferred") {
+          fresh.status = "failed";
         }
       }
-      writeSession(sessionsDir, session);
+      writeSession(sessionsDir, fresh);
       if (options.export !== false) {
         try {
-          const nativeId = run?.nativeSessionId ?? session.id;
-          if (sessionReferencedInMesh2(flintPath, session.id) || sessionReferencedInMesh2(flintPath, nativeId)) {
-            exportSessionTranscript(session, flintPath);
+          const nativeId = run?.nativeSessionId ?? fresh.id;
+          if (sessionReferencedInMesh2(flintPath, fresh.id) || sessionReferencedInMesh2(flintPath, nativeId)) {
+            exportSessionTranscript(fresh, flintPath);
           } else {
             const save = await askYesNo2(pc41.dim("Save session transcript? (y/N) "));
             if (save) {
-              exportSessionTranscript(session, flintPath);
+              exportSessionTranscript(fresh, flintPath);
             }
           }
         } catch (err) {
@@ -11057,6 +13454,11 @@ orbCommand.command("list").description("List all agent sessions").option("-p, --
   const { flintPath, sessionsDir } = await resolveCtx(options.path);
   const renderTable = (interactive) => {
     let sessions = listSessions2(sessionsDir);
+    for (const s of sessions) {
+      if (healSession(s)) {
+        writeSession(sessionsDir, s);
+      }
+    }
     if (options.status) {
       sessions = sessions.filter((s) => s.status === options.status);
     }
@@ -11070,7 +13472,7 @@ orbCommand.command("list").description("List all agent sessions").option("-p, --
       );
     }
     if (!options.all) sessions = sessions.slice(0, 30);
-    const lines = ["", pc41.bold("OrbH Sessions"), ""];
+    const lines = ["", pc41.bold("Orbh Sessions"), ""];
     if (sessions.length === 0) {
       lines.push(pc41.dim("No sessions found."));
     } else {
@@ -11097,7 +13499,8 @@ orbCommand.command("list").description("List all agent sessions").option("-p, --
             statsCol = `${pc41.dim("-").padEnd(6)} ${pc41.dim("-").padEnd(12)} `;
           }
         }
-        lines.push(`  ${icon} ${s.status.padEnd(13)} ${pc41.cyan(sid)} ${rt} ${runs} ${dur} ${statsCol}${desc}${cont}`);
+        const metaHint = s.metadata && Object.keys(s.metadata).length > 0 ? pc41.dim(` [meta: ${typeof s.metadata.plate === "string" ? s.metadata.plate : Object.keys(s.metadata).length + "k"}]`) : "";
+        lines.push(`  ${icon} ${s.status.padEnd(13)} ${pc41.cyan(sid)} ${rt} ${runs} ${dur} ${statsCol}${desc}${cont}${metaHint}`);
       }
     }
     if (interactive) {
@@ -11129,15 +13532,34 @@ orbCommand.command("list").description("List all agent sessions").option("-p, --
   }
   process.stdout.write(renderTable());
 });
-orbCommand.command("inspect").description("Inspect a specific session in detail").argument("<id>", "Session ID (full or partial)").option("-p, --path <dir>", "Path to flint (default: auto-detect)").action(async (id, options) => {
+orbCommand.command("inspect").description("Inspect a specific session in detail").argument("<id>", "Session ID (full or partial)").option("-p, --path <dir>", "Path to flint (default: auto-detect)").option("-r, --results", "Show run results").action(async (id, options) => {
   const { flintPath, sessionsDir } = await resolveCtx(options.path);
   const session = resolveSession2(sessionsDir, id);
   if (!session) {
     console.error(pc41.red(`Error: Session not found: ${id}`));
     process.exit(1);
   }
+  if (healSession(session)) {
+    writeSession(sessionsDir, session);
+  }
+  if (options.results) {
+    const runsWithResults = session.runs.filter((r) => r.result);
+    if (runsWithResults.length === 0) {
+      console.log(pc41.dim("No results for this session."));
+      return;
+    }
+    console.log(`
+${pc41.bold("Results")} ${pc41.dim(`\u2014 session ${shortId2(session.id)}`)}
+`);
+    for (const run of runsWithResults) {
+      console.log(`  ${pc41.dim(`run ${shortId2(run.id)}`)} ${pc41.dim(formatLocalTime2(run.started))}`);
+      console.log(`  ${run.result}`);
+      console.log("");
+    }
+    return;
+  }
   console.log(`
-${pc41.bold("OrbH Session")}
+${pc41.bold("Orbh Session")}
 `);
   console.log(`  ${pc41.dim("ID:")}          ${session.id}`);
   console.log(`  ${pc41.dim("Runtime:")}     ${session.runtime}`);
@@ -11149,12 +13571,6 @@ ${pc41.bold("OrbH Session")}
   console.log(`  ${pc41.dim("Updated:")}     ${formatLocalTime2(session.updated)}`);
   console.log(`  ${pc41.dim("Duration:")}    ${formatDuration2(session.started, isTerminalStatus2(session.status) ? session.updated : void 0)}`);
   if (session.continues) console.log(`  ${pc41.dim("Continues:")}   ${session.continues}`);
-  const latestRun = getCurrentRun2(session);
-  if (latestRun?.result) {
-    console.log(`
-  ${pc41.bold("Result:")} ${pc41.dim(`(run ${shortId2(latestRun.id)})`)}`);
-    console.log(`    ${latestRun.result}`);
-  }
   const entries = readTranscriptEntries(session, flintPath);
   if (entries && entries.length > 0) {
     const turns = groupIntoTurns(entries);
@@ -11214,8 +13630,26 @@ ${pc41.bold("OrbH Session")}
       console.log(`    ${pc41.cyan(key)}: ${val}`);
     }
   }
+  const meta = session.metadata;
+  if (meta && Object.keys(meta).length > 0) {
+    console.log(`
+  ${pc41.bold("Metadata:")}`);
+    for (const [key, val] of Object.entries(meta)) {
+      const display = typeof val === "string" ? val : JSON.stringify(val);
+      console.log(`    ${pc41.cyan(key)}: ${display}`);
+    }
+  }
   console.log("");
 });
+orbCommand.command("export").description("Export a session transcript to Mesh/Agents/<Runtime>/").argument("<id>", "Session ID (full or partial)").option("-p, --path <dir>", "Path to flint (default: auto-detect)").action(async (id, options) => {
+  const { flintPath, sessionsDir } = await resolveCtx(options.path);
+  const session = resolveSession2(sessionsDir, id);
+  if (!session) {
+    console.error(pc41.red(`Error: Session not found: ${id}`));
+    process.exit(1);
+  }
+  exportSessionTranscript(session, flintPath);
+});
 orbCommand.command("requests").description("View request/response pairs for a session").argument("<id>", "Session ID (full or partial)").option("-p, --path <dir>", "Path to flint (default: auto-detect)").option("--pending", "Show only unanswered requests").action(async (id, options) => {
   const { sessionsDir } = await resolveCtx(options.path);
   const session = resolveSession2(sessionsDir, id);
@@ -11293,7 +13727,7 @@ orbCommand.command("stats").description("Show detailed session statistics \u2014
     }
   }
   console.log(`
-${pc41.bold("OrbH Session Stats")} ${pc41.dim("\xB7")} ${pc41.cyan(shortId2(session.id))} ${pc41.dim("\xB7")} ${session.runtime}
+${pc41.bold("Orbh Session Stats")} ${pc41.dim("\xB7")} ${pc41.cyan(shortId2(session.id))} ${pc41.dim("\xB7")} ${session.runtime}
 `);
   console.log(`  ${pc41.bold("Overview")}`);
   console.log(`    Status:       ${statusIcon2(session.status)} ${session.status}`);
@@ -11405,22 +13839,40 @@ orbCommand.command("watch").description("Stream a live session transcript to the
     process.exit(1);
   }
   const run = getCurrentRun2(session);
-  const nativeId = run?.nativeSessionId ?? session.id;
-  const transcriptPath = harness.resolveTranscriptPath(nativeId, flintPath);
+  let nativeId = run?.nativeSessionId ?? session.id;
+  let transcriptPath = harness.resolveTranscriptPath(nativeId, flintPath);
   const maxLen = options.verbose ? Infinity : 200;
+  if (!transcriptPath && !isTerminalStatus2(session.status)) {
+    const deadline = Date.now() + 3e4;
+    process.stdout.write(pc41.dim("Waiting for transcript path resolution..."));
+    while (Date.now() <= deadline) {
+      await new Promise((resolve11) => setTimeout(resolve11, 500));
+      const fresh = resolveSession2(sessionsDir, id);
+      if (!fresh) break;
+      const freshRun = getCurrentRun2(fresh);
+      const freshNativeId = freshRun?.nativeSessionId ?? fresh.id;
+      transcriptPath = harness.resolveTranscriptPath(freshNativeId, flintPath);
+      if (transcriptPath) {
+        nativeId = freshNativeId;
+        break;
+      }
+    }
+    process.stdout.write("\r\x1B[2K");
+  }
   if (!transcriptPath) {
     console.error(pc41.red(`Error: Could not resolve transcript path for session ${shortId2(session.id)}`));
     process.exit(1);
   }
   const watchTitle = session.title ? ` ${pc41.dim("\xB7")} ${session.title}` : "";
-  console.log(`${pc41.bold("Watching")} ${pc41.cyan(shortId2(session.id))} ${pc41.dim("\xB7")} ${session.runtime}${watchTitle} ${pc41.dim("\xB7")} ${statusIcon2(session.status)} ${session.status}`);
+  const watchMeta = session.metadata && Object.keys(session.metadata).length > 0 ? ` ${pc41.dim("\xB7")} ${pc41.dim(`meta: ${typeof session.metadata.plate === "string" ? session.metadata.plate : Object.keys(session.metadata).length + " keys"}`)}` : "";
+  console.log(`${pc41.bold("Watching")} ${pc41.cyan(shortId2(session.id))} ${pc41.dim("\xB7")} ${session.runtime}${watchTitle} ${pc41.dim("\xB7")} ${statusIcon2(session.status)} ${session.status}${watchMeta}`);
   console.log(pc41.dim(transcriptPath));
   console.log("");
-  if (!existsSync9(transcriptPath)) {
+  if (!existsSync12(transcriptPath)) {
     process.stdout.write(pc41.dim("Waiting for transcript..."));
     await new Promise((resolve11, reject) => {
       const poll = setInterval(() => {
-        if (existsSync9(transcriptPath)) {
+        if (existsSync12(transcriptPath)) {
           clearInterval(poll);
           process.stdout.write("\r\x1B[2K");
           resolve11();
@@ -11630,7 +14082,7 @@ orbCommand.command("ask").description("Ask a blocking question and wait for a re
   session.status = "blocked";
   writeSession(sessionsDir, session);
   try {
-    spawnSync4("osascript", ["-e", `display notification "${question.slice(0, 100)}" with title "OrbH Agent Needs Input"`], { stdio: "ignore" });
+    spawnSync5("osascript", ["-e", `display notification "${question.slice(0, 100)}" with title "Orbh Agent Needs Input"`], { stdio: "ignore" });
   } catch {
   }
   const startTime = Date.now();
@@ -11664,7 +14116,7 @@ orbCommand.command("request").description("Post a deferred question and exit imm
   session.status = "deferred";
   writeSession(sessionsDir, session);
   try {
-    spawnSync4("osascript", ["-e", `display notification "${question.slice(0, 100)}" with title "OrbH Agent Needs Input"`], { stdio: "ignore" });
+    spawnSync5("osascript", ["-e", `display notification "${question.slice(0, 100)}" with title "Orbh Agent Needs Input"`], { stdio: "ignore" });
   } catch {
   }
   console.log(`Question posted. Session ${shortId2(session.id)} is now deferred.`);
@@ -11700,7 +14152,7 @@ orbCommand.command("respond").description("Answer a pending question on a sessio
     console.log(`Response sent to session ${shortId2(session.id)}`);
     console.log(pc41.dim("Deferred question answered \u2014 auto-resuming session..."));
     const resumePrompt = `Your deferred question has been answered. Run \`flint orb requests ${session.id}\` to see the response, then continue working.`;
-    spawnSync4("flint", ["orb", "resume", session.id, resumePrompt], {
+    spawnSync5("flint", ["orb", "resume", session.id, resumePrompt], {
       cwd: process.cwd(),
       stdio: "inherit"
     });
@@ -11713,24 +14165,24 @@ orbCommand.command("respond").description("Answer a pending question on a sessio
 
 // src/index.ts
 var __dirname3 = dirname4(fileURLToPath3(import.meta.url));
-var pkg = JSON.parse(readFileSync5(join18(__dirname3, "..", "package.json"), "utf-8"));
+var pkg = JSON.parse(readFileSync10(join18(__dirname3, "..", "package.json"), "utf-8"));
 var runtime = resolveRuntimeSync({ cliname: "flint" });
 var devAvailable = runtime.mode === "dev";
 var newDir = getConfigDir("flint");
-var oldDir = join18(homedir9(), ".flint");
-var intermediateDir = join18(homedir9(), ".nuucognition", ".flint");
+var oldDir = join18(homedir10(), ".flint");
+var intermediateDir = join18(homedir10(), ".nuucognition", ".flint");
 function migrateDir(sourceDir, label) {
-  if (!existsSync10(sourceDir)) return false;
+  if (!existsSync13(sourceDir)) return false;
   try {
-    const entries = readdirSync4(sourceDir);
+    const entries = readdirSync7(sourceDir);
     const filesToMigrate = entries.filter((e) => !e.startsWith(".DS_Store"));
     if (filesToMigrate.length === 0) return false;
-    mkdirSync4(newDir, { recursive: true });
+    mkdirSync5(newDir, { recursive: true });
     let migrated = 0;
     for (const entry of filesToMigrate) {
       const src = join18(sourceDir, entry);
       const dest = join18(newDir, entry);
-      if (!existsSync10(dest)) {
+      if (!existsSync13(dest)) {
         cpSync(src, dest, { recursive: true });
         migrated++;
       }
@@ -11834,3 +14286,42 @@ program.on("command:*", (operands) => {
   process.exit(1);
 });
 await program.parseAsync(process.argv);
+/*! Bundled license information:
+
+smol-toml/dist/error.js:
+smol-toml/dist/util.js:
+smol-toml/dist/date.js:
+smol-toml/dist/primitive.js:
+smol-toml/dist/extract.js:
+smol-toml/dist/struct.js:
+smol-toml/dist/parse.js:
+smol-toml/dist/stringify.js:
+smol-toml/dist/index.js:
+  (*!
+   * Copyright (c) Squirrel Chat et al., All rights reserved.
+   * SPDX-License-Identifier: BSD-3-Clause
+   *
+   * Redistribution and use in source and binary forms, with or without
+   * modification, are permitted provided that the following conditions are met:
+   *
+   * 1. Redistributions of source code must retain the above copyright notice, this
+   *    list of conditions and the following disclaimer.
+   * 2. Redistributions in binary form must reproduce the above copyright notice,
+   *    this list of conditions and the following disclaimer in the
+   *    documentation and/or other materials provided with the distribution.
+   * 3. Neither the name of the copyright holder nor the names of its contributors
+   *    may be used to endorse or promote products derived from this software without
+   *    specific prior written permission.
+   *
+   * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+   * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+   * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+   * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+   * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+   * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+   * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+   *)
+*/