omp-fabric 1.25.9 → 1.25.11

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 1.25.11
+
+### Fixed
+
+- Outside a Git repository the `.git/info/exclude` step from 1.25.10 still ran `git rev-parse` on every session start and discarded the failure, and it ran unawaited, so a session or test could tear down its directory while that `git` child still held it (`EBUSY` on Windows CI). Fabric now looks for a `.git` entry first and skips plain directories without spawning `git` (0.02 ms against about 2 ms), and the step is awaited. 1.25.10 was tagged but never published, because that race failed its release gate.
+
+## 1.25.10
+
+### Fixed
+
+- Fabric's per-project state under `.omp/fabric/` (the mesh and the MCP descriptor cache) made repositories without an `.omp/` ignore rule show `?? .omp/`. Only managed worktrees were excluded, and only once an agent created one. Every session now adds `**/.omp/fabric/` to the repository's local `.git/info/exclude`, once, from whatever subdirectory it starts in; the old `.omp/fabric/worktrees/` rule was anchored to the repository root and missed a session started below it. Tracked ignore files are never edited, and OMP's own `.omp/` files (plans, `lsp.json`) are left alone.
+- A peer whose host lease lapsed showed up to other sessions as `Peer <session>` without its label. The listing falls back to the legacy session record when a host lease expires, and that record's reader dropped the label its writer stores. On Windows CI a slow refresh published an already-expired lease, which is why `peer-labels` failed intermittently there.
+- The `matchLimit` note on a grep cut short by `limit` now says the host takes matches from each file in turn, so `skip` cannot reach the rest of a file the limit cut, and suggests pointing `path` at one file.
+
 ## 1.25.9
 
 ### Changed

package/dist/agents/worktree-paths.d.ts

@@ -1,5 +1,5 @@
-export declare const FABRIC_WORKTREE_EXCLUDE = ".omp/fabric/worktrees/";
+export declare const FABRIC_STATE_EXCLUDE = "**/.omp/fabric/";
 export declare const fabricWorktreePath: (gitRoot: string, id: string) => string;
 export declare const isFabricWorktreePath: (worktree: string, id: string) => boolean;
-export declare const ensureWorktreeExclude: (gitRoot: string) => Promise<void>;
+export declare const ensureFabricStateExclude: (directory: string) => Promise<void>;
 //# sourceMappingURL=worktree-paths.d.ts.map

package/dist/agents/worktree-paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worktree-paths.d.ts","sourceRoot":"","sources":["../../src/agents/worktree-paths.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,uBAAuB,2BAA2B,CAAC;AAEhE,eAAO,MAAM,kBAAkB,GAAI,SAAS,MAAM,EAAE,IAAI,MAAM,KAAG,MACZ,CAAC;AAEtD,eAAO,MAAM,oBAAoB,GAAI,UAAU,MAAM,EAAE,IAAI,MAAM,KAAG,OASnE,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAU,SAAS,MAAM,KAAG,OAAO,CAAC,IAAI,CAkBzE,CAAC"}
+{"version":3,"file":"worktree-paths.d.ts","sourceRoot":"","sources":["../../src/agents/worktree-paths.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,oBAAoB,oBAAoB,CAAC;AAEtD,eAAO,MAAM,kBAAkB,GAAI,SAAS,MAAM,EAAE,IAAI,MAAM,KAAG,MACZ,CAAC;AAEtD,eAAO,MAAM,oBAAoB,GAAI,UAAU,MAAM,EAAE,IAAI,MAAM,KAAG,OASnE,CAAC;AAYF,eAAO,MAAM,wBAAwB,GAAU,WAAW,MAAM,KAAG,OAAO,CAAC,IAAI,CAmB9E,CAAC"}

package/dist/chunks/{chunk-YAI5SCIE.js → chunk-7A7AWSK2.js}

@@ -861,11 +861,52 @@ var lifecycleSubscriptionFromValue = (value) => {
   return value;
 };
 
+// src/agents/worktree-paths.ts
+import fs2 from "node:fs";
+import path4 from "node:path";
+var FABRIC_WORKTREE_SEGMENTS = [".omp", "fabric", "worktrees"];
+var FABRIC_STATE_EXCLUDE = "**/.omp/fabric/";
+var fabricWorktreePath = (gitRoot, id) => path4.join(gitRoot, ...FABRIC_WORKTREE_SEGMENTS, id);
+var isFabricWorktreePath = (worktree, id) => {
+  const parts = worktree.split(/[\\/]/).filter(Boolean);
+  return parts.length >= 4 && parts.at(-1) === id && parts.at(-2) === "worktrees" && parts.at(-3) === "fabric" && parts.at(-4) === ".omp";
+};
+var insideGitRepository = (directory) => {
+  let current = path4.resolve(directory);
+  while (true) {
+    if (fs2.existsSync(path4.join(current, ".git"))) return true;
+    const parent = path4.dirname(current);
+    if (parent === current) return false;
+    current = parent;
+  }
+};
+var ensureFabricStateExclude = async (directory) => {
+  if (!insideGitRepository(directory)) return;
+  const located = await executeFile("git", ["rev-parse", "--git-path", "info/exclude"], {
+    cwd: directory,
+    timeoutMs: 1e4
+  });
+  const excludePath = path4.resolve(directory, located.stdout.trim());
+  fs2.mkdirSync(path4.dirname(excludePath), { recursive: true });
+  let current = "";
+  try {
+    current = fs2.readFileSync(excludePath, "utf8");
+  } catch (error) {
+    const code = error instanceof Error && "code" in error ? error.code : void 0;
+    if (code !== "ENOENT") throw error;
+  }
+  const lines = current.split(/\r?\n/);
+  if (lines.some((line) => line.trim() === FABRIC_STATE_EXCLUDE)) return;
+  const prefix = current.length === 0 || current.endsWith("\n") ? "" : "\n";
+  fs2.appendFileSync(excludePath, `${prefix}${FABRIC_STATE_EXCLUDE}
+`);
+};
+
 // src/agents/budget-ledger.ts
 import { randomUUID as randomUUID2 } from "node:crypto";
-import fs2 from "node:fs";
+import fs3 from "node:fs";
 import os from "node:os";
-import path4 from "node:path";
+import path5 from "node:path";
 var ENV_BUDGET = "OMP_FABRIC_BUDGET";
 var ENV_BUDGET_FILE = "OMP_FABRIC_BUDGET_FILE";
 var ENV_BUDGET_ID = "OMP_FABRIC_BUDGET_ID";
@@ -881,9 +922,9 @@ function activeBudgetState() {
   return { budget, file, id: process.env[ENV_BUDGET_ID] ?? "" };
 }
 function initBudgetLedger(budget) {
-  const directory = fs2.mkdtempSync(path4.join(os.tmpdir(), "omp-fabric-budget-"));
-  const file = path4.join(directory, "cost.jsonl");
-  fs2.writeFileSync(file, "", { mode: 384 });
+  const directory = fs3.mkdtempSync(path5.join(os.tmpdir(), "omp-fabric-budget-"));
+  const file = path5.join(directory, "cost.jsonl");
+  fs3.writeFileSync(file, "", { mode: 384 });
   const id = randomUUID2().replaceAll("-", "").slice(0, 16);
   process.env[ENV_BUDGET] = String(budget);
   process.env[ENV_BUDGET_FILE] = file;
@@ -905,7 +946,7 @@ function readBudgetLedger(file) {
   let tokens = 0;
   let raw;
   try {
-    raw = fs2.readFileSync(file, "utf8");
+    raw = fs3.readFileSync(file, "utf8");
   } catch {
     return { cost, tokens };
   }
@@ -922,7 +963,7 @@ function readBudgetLedger(file) {
 }
 function appendBudgetLedger(file, entry) {
   try {
-    fs2.appendFileSync(file, `${JSON.stringify(entry)}
+    fs3.appendFileSync(file, `${JSON.stringify(entry)}
 `);
   } catch {
   }
@@ -986,11 +1027,11 @@ var Semaphore = class {
 };
 
 // src/agents/rm.ts
-import fs3 from "node:fs";
+import fs4 from "node:fs";
 var RETRYABLE_RM_CODES = /* @__PURE__ */ new Set(["ENOTEMPTY", "EBUSY", "EPERM", "EMFILE"]);
 var RM_RETRY_BACKOFF_MS = 5;
 var RM_MAX_ATTEMPTS = 5;
-var defaultRemove = (target, options) => fs3.promises.rm(target, options);
+var defaultRemove = (target, options) => fs4.promises.rm(target, options);
 var removeTree = async (target, rm = defaultRemove) => {
   for (let attempt = 0; attempt < RM_MAX_ATTEMPTS; attempt++) {
     try {
@@ -1301,8 +1342,8 @@ import fs6 from "node:fs";
 import path7 from "node:path";
 
 // src/agents/cow-clone.ts
-import fs4 from "node:fs";
-import path5 from "node:path";
+import fs5 from "node:fs";
+import path6 from "node:path";
 var CLONE_SKIP_PREFIXES = [".git", ".omp/fabric/worktrees"];
 var CowUnavailableError = class extends Error {
   constructor(message, options) {
@@ -1318,11 +1359,11 @@ var isCowUnavailable = (error) => {
 };
 var cloneEntry = async (from, to) => {
   try {
-    await fs4.promises.cp(from, to, {
+    await fs5.promises.cp(from, to, {
       recursive: true,
       verbatimSymlinks: true,
       force: false,
-      mode: fs4.constants.COPYFILE_FICLONE_FORCE
+      mode: fs5.constants.COPYFILE_FICLONE_FORCE
     });
   } catch (error) {
     if (isCowUnavailable(error)) {
@@ -1342,13 +1383,13 @@ var hasNestedSkip = (rel, prefixes) => {
   return prefixes.some((prefix) => prefix.startsWith(`${value}/`));
 };
 var cloneLevel = async (source, dest, relBase, prefixes) => {
-  await fs4.promises.mkdir(dest, { recursive: true });
-  const entries = await fs4.promises.readdir(source, { withFileTypes: true });
+  await fs5.promises.mkdir(dest, { recursive: true });
+  const entries = await fs5.promises.readdir(source, { withFileTypes: true });
   for (const entry of entries) {
     const rel = relBase ? `${relBase}/${entry.name}` : entry.name;
     if (skipped(rel, prefixes)) continue;
-    const from = path5.join(source, entry.name);
-    const to = path5.join(dest, entry.name);
+    const from = path6.join(source, entry.name);
+    const to = path6.join(dest, entry.name);
     if (entry.isDirectory() && !entry.isSymbolicLink() && hasNestedSkip(rel, prefixes)) {
       await cloneLevel(from, to, rel, prefixes);
       continue;
@@ -1361,42 +1402,11 @@ var cloneTree = async (source, dest, prefixes = CLONE_SKIP_PREFIXES) => {
   await cloneLevel(source, dest, "", prefixes);
 };
 
-// src/agents/worktree-paths.ts
-import fs5 from "node:fs";
-import path6 from "node:path";
-var FABRIC_WORKTREE_SEGMENTS = [".omp", "fabric", "worktrees"];
-var FABRIC_WORKTREE_EXCLUDE = ".omp/fabric/worktrees/";
-var fabricWorktreePath = (gitRoot, id) => path6.join(gitRoot, ...FABRIC_WORKTREE_SEGMENTS, id);
-var isFabricWorktreePath = (worktree, id) => {
-  const parts = worktree.split(/[\\/]/).filter(Boolean);
-  return parts.length >= 4 && parts.at(-1) === id && parts.at(-2) === "worktrees" && parts.at(-3) === "fabric" && parts.at(-4) === ".omp";
-};
-var ensureWorktreeExclude = async (gitRoot) => {
-  const located = await executeFile("git", ["rev-parse", "--git-path", "info/exclude"], {
-    cwd: gitRoot,
-    timeoutMs: 1e4
-  });
-  const excludePath = path6.resolve(gitRoot, located.stdout.trim());
-  fs5.mkdirSync(path6.dirname(excludePath), { recursive: true });
-  let current = "";
-  try {
-    current = fs5.readFileSync(excludePath, "utf8");
-  } catch (error) {
-    const code = error instanceof Error && "code" in error ? error.code : void 0;
-    if (code !== "ENOENT") throw error;
-  }
-  const lines = current.split(/\r?\n/);
-  if (lines.some((line) => line.trim() === FABRIC_WORKTREE_EXCLUDE)) return;
-  const prefix = current.length === 0 || current.endsWith("\n") ? "" : "\n";
-  fs5.appendFileSync(excludePath, `${prefix}${FABRIC_WORKTREE_EXCLUDE}
-`);
-};
-
 // src/agents/clone-first-worktree.ts
 var addCloneFirstWorktree = async (options) => {
   const dest = options.dest;
   if (isFabricWorktreePath(dest, path7.basename(dest))) {
-    await ensureWorktreeExclude(options.gitRoot);
+    await ensureFabricStateExclude(options.gitRoot);
   }
   fs6.mkdirSync(path7.dirname(dest), { recursive: true });
   const args = ["worktree", "add", "--no-checkout"];
@@ -6254,6 +6264,7 @@ var legacyRootFromEntry = (entry, localRootId, now) => {
     ownerHostId: value.id,
     ownerIdentityId: value.id,
     name: typeof value.name === "string" ? value.name : "main",
+    ...typeof value.label === "string" && value.label ? { label: value.label } : {},
     status: value.status,
     runner: "omp",
     transport: "host",
@@ -6768,6 +6779,7 @@ export {
   isFabricLifecycleEventType,
   lifecycleSourceIdentity,
   isFabricWorktreePath,
+  ensureFabricStateExclude,
   addCloneFirstWorktree,
   useBudgetLedger,
   effectiveAgentTimeoutMs,
@@ -6784,4 +6796,4 @@ export {
   agentParticipantRecords,
   actorParticipantRecord
 };
-//# sourceMappingURL=chunk-YAI5SCIE.js.map
+//# sourceMappingURL=chunk-7A7AWSK2.js.map