CLI perf: reduce deps (#22652)

2 files changed, 13 insertions, 3 deletions

diff --git a/packages/shared/src/util/error.ts b/packages/shared/src/util/error.ts
index 12c27a0a7..9d3b7c661 100644
--- a/packages/shared/src/util/error.ts
+++ b/packages/shared/src/util/error.ts
@@ -4,6 +4,12 @@ export abstract class NamedError extends Error {
   abstract schema(): z.core.$ZodType
   abstract toObject(): { name: string; data: any }
 
+  static hasName(error: unknown, name: string): boolean {
+    return (
+      typeof error === "object" && error !== null && "name" in error && (error as Record<string, unknown>).name === name
+    )
+  }
+
   static create<Name extends string, Data extends z.core.$ZodType>(name: Name, data: Data) {
     const schema = z
       .object({
diff --git a/packages/shared/src/util/flock.ts b/packages/shared/src/util/flock.ts
index 4a1df1dee..958bd9fd1 100644
--- a/packages/shared/src/util/flock.ts
+++ b/packages/shared/src/util/flock.ts
@@ -345,10 +345,14 @@ export namespace Flock {
     return await fn()
   }
 
-  export const effect = Effect.fn("Flock.effect")(function* (key: string) {
+  export const effect = Effect.fn("Flock.effect")(function* (key: string, input: Options = {}) {
     return yield* Effect.acquireRelease(
-      Effect.promise((signal) => Flock.acquire(key, { signal })),
-      (foo) => Effect.promise(() => foo.release()),
+      Effect.promise((signal) => Flock.acquire(key, { ...input, signal })).pipe(
+        Effect.withSpan("Flock.acquire", {
+          attributes: { key },
+        }),
+      ),
+      (lock) => Effect.promise(() => lock.release()).pipe(Effect.withSpan("Flock.release")),
     ).pipe(Effect.asVoid)
   })
 }