@dxos/cli-util 0.8.4-main.fcfe5033a5 → 0.9.0

package/LICENSE

@@ -1,8 +1,105 @@
-MIT License
-Copyright (c) 2025 DXOS
+# Functional Source License, Version 1.1, ALv2 Future License
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+## Abbreviation
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+FSL-1.1-Apache-2.0
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+## Notice
+
+Copyright 2026 DXOS
+
+## Terms and Conditions
+
+### Licensor ("We")
+
+The party offering the Software under these Terms and Conditions.
+
+### The Software
+
+The "Software" is each version of the software that we make available under
+these Terms and Conditions, as indicated by our inclusion of these Terms and
+Conditions with the Software.
+
+### License Grant
+
+Subject to your compliance with this License Grant and the Patents,
+Redistribution and Trademark clauses below, we hereby grant you the right to
+use, copy, modify, create derivative works, publicly perform, publicly display
+and redistribute the Software for any Permitted Purpose identified below.
+
+### Permitted Purpose
+
+A Permitted Purpose is any purpose other than a Competing Use. A Competing Use
+means making the Software available to others in a commercial product or
+service that:
+
+1. substitutes for the Software;
+
+2. substitutes for any other product or service we offer using the Software
+   that exists as of the date we make the Software available; or
+
+3. offers the same or substantially similar functionality as the Software.
+
+Permitted Purposes specifically include using the Software:
+
+1. for your internal use and access;
+
+2. for non-commercial education;
+
+3. for non-commercial research; and
+
+4. in connection with professional services that you provide to a licensee
+   using the Software in accordance with these Terms and Conditions.
+
+### Patents
+
+To the extent your use for a Permitted Purpose would necessarily infringe our
+patents, the license grant above includes a license under our patents. If you
+make a claim against any party that the Software infringes or contributes to
+the infringement of any patent, then your patent license to the Software ends
+immediately.
+
+### Redistribution
+
+The Terms and Conditions apply to all copies, modifications and derivatives of
+the Software.
+
+If you redistribute any copies, modifications or derivatives of the Software,
+you must include a copy of or a link to these Terms and Conditions and not
+remove any copyright notices provided in or with the Software.
+
+### Disclaimer
+
+THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTIES OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING WITHOUT LIMITATION WARRANTIES OF FITNESS FOR A PARTICULAR
+PURPOSE, MERCHANTABILITY, TITLE OR NON-INFRINGEMENT.
+
+IN NO EVENT WILL WE HAVE ANY LIABILITY TO YOU ARISING OUT OF OR RELATED TO THE
+SOFTWARE, INCLUDING INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES,
+EVEN IF WE HAVE BEEN INFORMED OF THEIR POSSIBILITY IN ADVANCE.
+
+### Trademarks
+
+Except for displaying the License Details and identifying us as the origin of
+the Software, you have no right under these Terms and Conditions to use our
+trademarks, trade names, service marks or product names.
+
+## Grant of Future License
+
+We hereby irrevocably grant you an additional license to use the Software under
+the Apache License, Version 2.0 that is effective on the second anniversary of
+the date we make the Software available. On or after that date, you may use the
+Software under the Apache License, Version 2.0, in which case the following
+will apply:
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License.
+
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.

package/dist/lib/node-esm/{chunk-6TKUDRM6.mjs → chunk-N5LOOWPE.mjs}

@@ -24,4 +24,4 @@ export {
   __export,
   CommandConfig
 };
-//# sourceMappingURL=chunk-6TKUDRM6.mjs.map
+//# sourceMappingURL=chunk-N5LOOWPE.mjs.map

package/dist/lib/node-esm/index.mjs

@@ -2,7 +2,7 @@ import { createRequire } from 'node:module';const require = createRequire(import
 import {
   CommandConfig,
   __export
-} from "./chunk-6TKUDRM6.mjs";
+} from "./chunk-N5LOOWPE.mjs";
 
 // src/util/form-builder.ts
 var form_builder_exports = {};
@@ -44,16 +44,16 @@ var calculateDimensions = (entries, prefix) => {
 var buildKeyLine = (prefix, key, targetWidth) => {
   return Doc.annotate(Doc.fill(targetWidth)(Doc.text(prefix + key + ": ")), Ansi.blackBright);
 };
-var setImpl = (builder, key, value2, color) => {
-  if (value2 !== void 0) {
+var setImpl = (builder, key, value, color) => {
+  if (value !== void 0) {
     let valueDoc;
-    if (typeof value2 === "object" && value2 !== null) {
-      valueDoc = value2;
+    if (typeof value === "object" && value !== null) {
+      valueDoc = value;
     } else {
-      valueDoc = Doc.text(String(value2));
+      valueDoc = Doc.text(String(value));
     }
     if (color) {
-      const ansi = typeof color === "function" ? color(value2) : color;
+      const ansi = typeof color === "function" ? color(value) : color;
       valueDoc = Doc.annotate(valueDoc, ansi);
     }
     builder.entries.push({
@@ -68,13 +68,13 @@ function set(builderOrKey, keyOrValue, valueOrColor, color) {
   if (builderOrKey instanceof FormBuilderImpl) {
     const builder = builderOrKey;
     const key = keyOrValue;
-    const value2 = valueOrColor;
-    return setImpl(builder, key, value2, color);
+    const value = valueOrColor;
+    return setImpl(builder, key, value, color);
   } else {
     const key = builderOrKey;
-    const value2 = keyOrValue;
+    const value = keyOrValue;
     const color2 = valueOrColor;
-    return (builder) => setImpl(builder, key, value2, color2);
+    return (builder) => setImpl(builder, key, value, color2);
   }
 }
 var nestImpl = (parent, key, builder) => {
@@ -103,9 +103,9 @@ function nest(parentOrKey, keyOrBuilder, builder) {
     return (parent) => nestImpl(parent, key, builder2);
   }
 }
-var optionImpl = (builder, key, value2, color) => {
-  if (Option.isSome(value2)) {
-    return setImpl(builder, key, value2.value, color);
+var optionImpl = (builder, key, value, color) => {
+  if (Option.isSome(value)) {
+    return setImpl(builder, key, value.value, color);
   }
   return builder;
 };
@@ -113,30 +113,30 @@ function option(builderOrKey, keyOrValue, valueOrColor, color) {
   if (builderOrKey instanceof FormBuilderImpl) {
     const builder = builderOrKey;
     const key = keyOrValue;
-    const value2 = valueOrColor;
-    return optionImpl(builder, key, value2, color);
+    const value = valueOrColor;
+    return optionImpl(builder, key, value, color);
   } else {
     const key = builderOrKey;
-    const value2 = keyOrValue;
+    const value = keyOrValue;
     const color2 = valueOrColor;
-    return (builder) => optionImpl(builder, key, value2, color2);
+    return (builder) => optionImpl(builder, key, value, color2);
   }
 }
-var nestedOptionImpl = (builder, key, value2) => {
-  if (Option.isSome(value2)) {
-    return nestImpl(builder, key, value2.value);
+var nestedOptionImpl = (builder, key, value) => {
+  if (Option.isSome(value)) {
+    return nestImpl(builder, key, value.value);
   }
   return builder;
 };
-function nestedOption(builderOrKey, keyOrValue, value2) {
+function nestedOption(builderOrKey, keyOrValue, value) {
   if (builderOrKey instanceof FormBuilderImpl) {
     const builder = builderOrKey;
     const key = keyOrValue;
-    return nestedOptionImpl(builder, key, value2);
+    return nestedOptionImpl(builder, key, value);
   } else {
     const key = builderOrKey;
-    const value3 = keyOrValue;
-    return (builder) => nestedOptionImpl(builder, key, value3);
+    const value2 = keyOrValue;
+    return (builder) => nestedOptionImpl(builder, key, value2);
   }
 }
 var whenImpl = (builder, condition, ...ops) => {
@@ -179,18 +179,18 @@ function each(builderOrItems, itemsOrFn, fn3) {
 var build = (builder) => {
   const { targetWidth } = calculateDimensions(builder.entries, builder.prefix);
   const entryLines = [];
-  builder.entries.forEach(({ key, value: value2, isNested }) => {
+  builder.entries.forEach(({ key, value, isNested }) => {
     const keyLine = buildKeyLine(builder.prefix, key, targetWidth);
     if (isNested) {
       entryLines.push(Doc.hcat([
         keyLine,
         Doc.hardLine,
-        value2
+        value
       ]));
     } else {
       entryLines.push(Doc.hcat([
         keyLine,
-        value2
+        value
       ]));
     }
   });
@@ -324,13 +324,12 @@ var withTypes = (...types) => Effect2.gen(function* () {
 import * as Console from "effect/Console";
 import * as Effect3 from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as Match from "effect/Match";
 import * as Option2 from "effect/Option";
 import { getPersonalSpace } from "@dxos/app-toolkit";
 import { ClientService as ClientService2 } from "@dxos/client";
-import { Database } from "@dxos/echo";
+import { Database, Feed } from "@dxos/echo";
+import { createFeedServiceLayer } from "@dxos/echo-client";
 import { BaseError } from "@dxos/errors";
-import { QueueService } from "@dxos/functions";
 import { log as log2 } from "@dxos/log";
 import { EdgeReplicationSetting } from "@dxos/protocols/proto/dxos/echo/metadata";
 import { isBun } from "@dxos/util";
@@ -352,47 +351,40 @@ var spaceIdWithDefault = (spaceId) => Effect3.gen(function* () {
 var spaceLayer = (spaceId$, fallbackToPersonalSpace = false) => {
   const getSpace2 = Effect3.fn(function* () {
     const client = yield* ClientService2;
-    const spaceId = Match.value(fallbackToPersonalSpace).pipe(Match.when(true, () => spaceId$.pipe(Option2.orElse(() => Option2.fromNullable(getPersonalSpace(client)?.id)))), Match.when(false, () => spaceId$), Match.exhaustive);
-    const space = spaceId.pipe(Option2.flatMap((id) => Option2.fromNullable(client.spaces.get(id))), Option2.getOrUndefined);
+    const resolveSpace = () => {
+      if (!fallbackToPersonalSpace) {
+        return spaceId$.pipe(Option2.flatMap((id) => Option2.fromNullable(client.spaces.get(id))));
+      }
+      return spaceId$.pipe(Option2.flatMap((id) => Option2.fromNullable(client.spaces.get(id))), Option2.orElse(() => Option2.fromNullable(getPersonalSpace(client))), Option2.orElse(() => Option2.fromNullable(client.spaces.get()[0])));
+    };
+    const space = resolveSpace().pipe(Option2.getOrUndefined);
     if (space) {
       yield* Effect3.promise(() => space.waitUntilReady());
     }
     return space;
   });
+  const NO_DB_STUB = {
+    get db() {
+      throw new Error("Space not found");
+    }
+  };
   const db = Layer.scoped(Database.Service, Effect3.acquireRelease(Effect3.gen(function* () {
     const space = yield* getSpace2();
     if (!space) {
-      return {
-        get db() {
-          throw new Error("Space not found");
-        }
-      };
+      return NO_DB_STUB;
     }
     return {
       db: space.db
     };
-  }), ({ db: db2 }) => Effect3.promise(() => db2.flush())));
-  const queue = Layer.effect(QueueService, Effect3.gen(function* () {
+  }), (holder) => holder === NO_DB_STUB ? Effect3.void : Effect3.promise(() => holder.db.flush())));
+  const feed = Layer.unwrapEffect(Effect3.gen(function* () {
     const space = yield* getSpace2();
     if (!space) {
-      return {
-        queues: {
-          get: (_dxn) => {
-            throw new Error("Queues not available");
-          },
-          create: () => {
-            throw new Error("Queues not available");
-          }
-        },
-        queue: void 0
-      };
+      return Feed.notAvailable;
     }
-    return {
-      queues: space.queues,
-      queue: void 0
-    };
+    return createFeedServiceLayer(space.queues);
   }));
-  return Layer.merge(db, queue);
+  return Layer.merge(db, feed);
 };
 var waitForSync = Effect3.fn(function* (space) {
   if (!isBun()) {
@@ -405,12 +397,7 @@ var waitForSync = Effect3.fn(function* (space) {
   yield* Effect3.promise(() => space.internal.syncToEdge({
     onProgress: (state) => log2.info("syncing", {
       state: state ?? "no connection to edge"
-    }, {
-      F: __dxlog_file,
-      L: 125,
-      S: this,
-      C: (f, a) => f(...a)
-    })
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 94, S: this })
   }));
   yield* Console.log("Sync complete");
 });
@@ -432,28 +419,61 @@ var SpaceNotFoundError = class extends BaseError.extend("SpaceNotFoundError", "S
 };
 
 // src/util/space-format.ts
+import * as Duration from "effect/Duration";
 import * as Effect4 from "effect/Effect";
 import { SpaceState } from "@dxos/client/echo";
-var formatSpace = Effect4.fn(function* (space, options = {
+var DEFAULT_OPTIONS = {
   verbose: false,
-  truncateKeys: false
-}) {
-  yield* Effect4.tryPromise(() => space.waitUntilReady());
-  const { open, ready } = space.internal.data.metrics ?? {};
-  const startup = open && ready && ready.getTime() - open.getTime();
-  const pipeline = space.internal.data.pipeline;
+  truncateKeys: false,
+  waitSeconds: 0
+};
+var READ_TIMEOUT_SECONDS = 2;
+var tryWithFallback = (label, run, fallback) => Effect4.tryPromise(run).pipe(Effect4.timeoutFail({
+  duration: Duration.seconds(READ_TIMEOUT_SECONDS),
+  onTimeout: () => new Error(`${label} timed out`)
+}), Effect4.catchAll(() => Effect4.succeed(fallback)));
+var tryWithFallbackSync = (read, fallback) => {
+  try {
+    return read();
+  } catch {
+    return fallback;
+  }
+};
+var formatSpace = Effect4.fn(function* (space, options = {}) {
+  const { waitSeconds } = {
+    ...DEFAULT_OPTIONS,
+    ...options
+  };
+  if (waitSeconds > 0) {
+    yield* Effect4.tryPromise(() => space.waitUntilReady()).pipe(Effect4.timeoutFail({
+      duration: Duration.seconds(waitSeconds),
+      onTimeout: () => new Error("waitUntilReady timed out")
+    }), Effect4.catchAll(() => Effect4.void));
+  }
+  const state = tryWithFallbackSync(() => space.state.get(), SpaceState.SPACE_INITIALIZING);
+  const ready = state === SpaceState.SPACE_READY;
+  const metrics = tryWithFallbackSync(() => space.internal.data.metrics, void 0);
+  const startup = metrics?.open && metrics?.ready ? metrics.ready.getTime() - metrics.open.getTime() : void 0;
+  const pipeline = tryWithFallbackSync(() => space.internal.data.pipeline, void 0);
   const epoch = pipeline?.currentEpoch?.subject.assertion.number;
-  const syncState = aggregateSyncState(yield* Effect4.tryPromise(() => space.internal.db.coreDatabase.getSyncState()));
+  const syncStateRaw = yield* tryWithFallback("getSyncState", () => space.internal.db.getSyncState(), {
+    peers: {}
+  });
+  const syncState = aggregateSyncState(syncStateRaw);
+  const name = ready ? tryWithFallbackSync(() => space.properties.name, void 0) : "loading...";
+  const members = tryWithFallbackSync(() => space.members.get().length, 0);
+  const objects = tryWithFallbackSync(() => space.internal.db.getAllObjectIds().length, 0);
+  const key = options.truncateKeys ? tryWithFallbackSync(() => space.key.truncate(), "") : tryWithFallbackSync(() => space.key.toHex(), "");
   return {
     id: space.id,
-    state: SpaceState[space.state.get()],
-    name: space.state.get() === SpaceState.SPACE_READY ? space.properties.name : "loading...",
-    members: space.members.get().length,
-    objects: space.internal.db.coreDatabase.getAllObjectIds().length,
-    key: options.truncateKeys ? space.key.truncate() : space.key.toHex(),
+    state: SpaceState[state],
+    name,
+    members,
+    objects,
+    key,
     epoch,
     startup,
-    automergeRoot: space.internal.data.pipeline?.spaceRootUrl,
+    automergeRoot: pipeline?.spaceRootUrl,
     // appliedEpoch,
     syncState: `${syncState.count} ${getSyncIndicator(syncState.up, syncState.down)} (${syncState.peers} peers)`
   };
@@ -491,13 +511,13 @@ var printSpace = (spaceData) => make({
 
 // src/util/timeout.ts
 import * as Config from "effect/Config";
-import * as Duration from "effect/Duration";
+import * as Duration2 from "effect/Duration";
 import * as Effect5 from "effect/Effect";
 import * as Option3 from "effect/Option";
-var withTimeout = Effect5.fnUntraced(function* (effect2) {
+var withTimeout = Effect5.fnUntraced(function* (effect) {
   const timeout2 = yield* Config.integer("TIMEOUT").pipe(Config.option);
-  const duration = timeout2.pipe(Option3.map(Duration.millis), Option3.getOrElse(() => Duration.infinity));
-  return yield* effect2.pipe(Effect5.timeout(duration));
+  const duration = timeout2.pipe(Option3.map(Duration2.millis), Option3.getOrElse(() => Duration2.infinity));
+  return yield* effect.pipe(Effect5.timeout(duration));
 });
 export {
   CommandConfig,