@seed-hypermedia/cli 0.0.7 → 0.0.9

package/dist/index.js

@@ -6032,6 +6032,87 @@ function isSurrogate(s, i) {
   const code = s.charCodeAt(i);
   return 55296 <= code && code <= 56319;
 }
+async function resolveHypermediaUrl(url) {
+  let latest = false;
+  let blockRef = null;
+  let blockRange = null;
+  let panel = null;
+  try {
+    const parsedUrl = new URL(url);
+    const hasVersion = parsedUrl.searchParams.has("v");
+    const hasLatest = parsedUrl.searchParams.has("l");
+    panel = parsedUrl.searchParams.get("panel");
+    if (parsedUrl.hash) {
+      const fragment = parseFragment(parsedUrl.hash.slice(1));
+      if (fragment) {
+        blockRef = fragment.blockId;
+        if ("start" in fragment && fragment.start !== undefined) {
+          blockRange = { start: fragment.start, end: fragment.end };
+        } else if ("expanded" in fragment && fragment.expanded) {
+          blockRange = { expanded: fragment.expanded };
+        }
+      }
+    }
+    latest = blockRef ? false : hasLatest || !hasVersion;
+  } catch {}
+  const response = await fetch(url, {
+    method: "OPTIONS"
+  });
+  if (response.status === 200) {
+    const rawId = response.headers.get("x-hypermedia-id");
+    const id = rawId ? decodeURIComponent(rawId) : null;
+    const version = response.headers.get("x-hypermedia-version");
+    const encodedTitle = response.headers.get("x-hypermedia-title");
+    const title = encodedTitle ? decodeURIComponent(encodedTitle) : null;
+    const rawTarget = response.headers.get("x-hypermedia-target");
+    const target = rawTarget ? unpackHmId(decodeURIComponent(rawTarget)) : null;
+    const rawAuthors = response.headers.get("x-hypermedia-authors");
+    const authors = rawAuthors ? decodeURIComponent(rawAuthors).split(",").map((author) => unpackHmId(author)) : null;
+    const type = response.headers.get("x-hypermedia-type");
+    if (id) {
+      const hmId = unpackHmId(id);
+      const resolvedVersion = version ?? hmId?.version ?? null;
+      let siteHostname = null;
+      try {
+        const inputUrl = new URL(url);
+        if (!inputUrl.pathname.startsWith("/hm/")) {
+          siteHostname = inputUrl.origin;
+        }
+      } catch {}
+      return {
+        id,
+        hmId: hmId ? {
+          ...hmId,
+          version: resolvedVersion,
+          latest,
+          blockRef,
+          blockRange,
+          hostname: siteHostname || hmId.hostname
+        } : null,
+        version,
+        title,
+        target,
+        authors,
+        type,
+        panel
+      };
+    }
+    return null;
+  }
+  return null;
+}
+async function resolveId(input) {
+  const parsed = unpackHmId(input);
+  if (parsed)
+    return parsed;
+  if (input.startsWith("http://") || input.startsWith("https://")) {
+    const resolved = await resolveHypermediaUrl(input);
+    if (resolved?.hmId)
+      return resolved.hmId;
+    throw new Error(`URL does not appear to be a Seed Hypermedia resource: ${input}`);
+  }
+  throw new Error(`Invalid Hypermedia ID: ${input}`);
+}
 var BlockRangeSchema, unpackedHmIdSchema, HMBlockChildrenTypeSchema, HMEmbedViewSchema, HMQueryStyleSchema, baseAnnotationProperties, BoldAnnotationSchema, ItalicAnnotationSchema, UnderlineAnnotationSchema, StrikeAnnotationSchema, CodeAnnotationSchema, LinkAnnotationSchema, InlineEmbedAnnotationSchema, HighlightAnnotationSchema, HMAnnotationSchema, HMAnnotationsSchema, blockBaseProperties, textBlockProperties, parentBlockAttributes, HMBlockParagraphSchema, HMBlockHeadingSchema, HMBlockCodeSchema, HMBlockMathSchema, HMBlockImageSchema, HMBlockVideoSchema, HMBlockFileSchema, HMBlockButtonAlignmentSchema, HMBlockButtonSchema, HMBlockEmbedSchema, HMBlockWebEmbedSchema, HMBlockNostrSchema, HMTimestampSchema, HMBlockNodeSchema, HMDocumentMetadataSchema, visibilityMap, HMResourceVisibilitySchema, HMCommentSchema, HMBreadcrumbSchema, HMCommentGroupSchema, HMExternalCommentGroupSchema, HMActivitySummarySchema, HMGenerationInfoSchema, HMRedirectInfoSchema, HMDocumentInfoSchema, HMQueryResultSchema, HMRoleSchema, HMMetadataPayloadSchema, HMAccountPayloadSchema, HMAccountNotFoundSchema, HMAccountResultSchema, HMSiteMemberSchema, HMAccountsMetadataSchema, HMQueryInclusionSchema, HMQuerySortSchema, HMQuerySchema, HMBlockQuerySchema, HMBlockGroupSchema, HMBlockLinkSchema, HMBlockKnownSchema, HMBlockUnknownSchema, HMBlockSchema, knownBlockTypes, HMDocumentSchema, HMResourceDocumentSchema, HMResourceCommentSchema, HMResourceRedirectSchema, HMResourceNotFoundSchema, HMResourceTombstoneSchema, HMResourceErrorSchema, HMResourceSchema, HMResolvedResourceSchema, HMContactSubscribeSchema, HMContactRecordSchema, HMAccountContactsRequestSchema, HMCommentDraftSchema, HMListedCommentDraftSchema, HMHostConfigSchema, HMContactSchema, HMContactItemSchema, HMCapabilitySchema, siteDiscoverRequestSchema, HMPeerConnectionRequestSchema, ParsedFragmentSchema, HMCitationCommentSourceSchema, HMCitationDocumentSourceSchema, HMCitationSchema, DeviceLinkSessionSchema, HMNavigationItemSchema, HMDraftContentSchema, HMDraftMetaBaseSchema, draftLocationRefinement = (data) => data.editUid || data.locationUid, HMDraftMetaSchema, HMListedDraftSchema, HMListedDraftReadSchema, HMSubjectContactsRequestSchema, HMResourceRequestSchema, HMResourceMetadataRequestSchema, HMAccountRequestSchema, HMCommentRequestSchema, HMSearchInputSchema, HMSearchResultItemSchema, HMSearchPayloadSchema, HMSearchRequestSchema, HMQueryRequestSchema, HMListCommentsInputSchema, HMListCommentsOutputSchema, HMListCommentsRequestSchema, HMListDiscussionsInputSchema, HMListDiscussionsOutputSchema, HMListDiscussionsRequestSchema, HMListCommentsByReferenceInputSchema, HMListCommentsByReferenceRequestSchema, HMGetCommentReplyCountInputSchema, HMGetCommentReplyCountRequestSchema, HMListEventsInputSchema, HMLoadedEventSchema, HMListEventsOutputSchema, HMListEventsRequestSchema, HMListAccountsOutputSchema, HMListAccountsInputSchema, HMListAccountsRequestSchema, HMGetCIDOutputSchema, HMGetCIDInputSchema, HMGetCIDRequestSchema, HMListCommentsByAuthorOutputSchema, HMListCommentsByAuthorInputSchema, HMListCommentsByAuthorRequestSchema, HMRawMentionSchema, HMListCitationsOutputSchema, HMListCitationsInputSchema, HMListCitationsRequestSchema, HMRawDocumentChangeSchema, HMListChangesOutputSchema, HMListChangesInputSchema, HMListChangesRequestSchema, HMRawCapabilitySchema, HMListCapabilitiesOutputSchema, HMListCapabilitiesInputSchema, HMListCapabilitiesRequestSchema, HMInteractionSummaryInputSchema, HMInteractionSummaryOutputSchema, HMInteractionSummaryRequestSchema, HMPublishBlobsOutputSchema, HMPublishBlobsInputSchema, HMPublishBlobsRequestSchema, ProtoAnnotationSchema, ProtoBlockSchema, ProtoSetAttributeValueSchema, ProtoDocumentChangeSchema, HMPrepareDocumentChangeInputSchema, HMPrepareDocumentChangeOutputSchema, HMPrepareDocumentChangeRequestSchema, HMListCommentVersionsInputSchema, HMListCommentVersionsOutputSchema, HMListCommentVersionsRequestSchema, HMGetRequestSchema, HMActionSchema, HMRequestSchema, HYPERMEDIA_SCHEME = "hm", STATIC_HM_PATHS;
 var init_hm_types = __esm(() => {
   init_zod();
@@ -6627,7 +6708,7 @@ var init_hm_types = __esm(() => {
     output: HMCommentSchema
   });
   HMSearchInputSchema = objectType({
-    query: stringType(),
+    query: coerce.string(),
     accountUid: stringType().optional(),
     includeBody: booleanType().optional(),
     contextSize: numberType().optional(),
@@ -138238,6 +138319,8 @@ __export(exports_src2, {
   signDocumentChange: () => signDocumentChange,
   shouldAutoLinkParent: () => shouldAutoLinkParent2,
   serializeBlockRange: () => serializeBlockRange,
+  resolveId: () => resolveId,
+  resolveHypermediaUrl: () => resolveHypermediaUrl,
   resolveFileLinksInBlocks: () => resolveFileLinksInBlocks2,
   resolveDocumentState: () => resolveDocumentState2,
   pushSpanToAnnotation: () => pushSpanToAnnotation2,
@@ -161018,43 +161101,52 @@ __export(exports_nanoid, {
   customRandom: () => customRandom,
   customAlphabet: () => customAlphabet
 });
-import { randomFillSync } from "crypto";
-var POOL_SIZE_MULTIPLIER = 128, pool2, poolOffset, fillPool = (bytes) => {
+import { webcrypto as crypto4 } from "node:crypto";
+function fillPool(bytes) {
   if (!pool2 || pool2.length < bytes) {
     pool2 = Buffer.allocUnsafe(bytes * POOL_SIZE_MULTIPLIER);
-    randomFillSync(pool2);
+    crypto4.getRandomValues(pool2);
     poolOffset = 0;
   } else if (poolOffset + bytes > pool2.length) {
-    randomFillSync(pool2);
+    crypto4.getRandomValues(pool2);
     poolOffset = 0;
   }
   poolOffset += bytes;
-}, random = (bytes) => {
-  fillPool(bytes -= 0);
+}
+function random(bytes) {
+  fillPool(bytes |= 0);
   return pool2.subarray(poolOffset - bytes, poolOffset);
-}, customRandom = (alphabet2, defaultSize, getRandom) => {
+}
+function customRandom(alphabet2, defaultSize, getRandom) {
   let mask = (2 << 31 - Math.clz32(alphabet2.length - 1 | 1)) - 1;
   let step = Math.ceil(1.6 * mask * defaultSize / alphabet2.length);
   return (size = defaultSize) => {
+    if (!size)
+      return "";
     let id = "";
     while (true) {
       let bytes = getRandom(step);
       let i = step;
       while (i--) {
         id += alphabet2[bytes[i] & mask] || "";
-        if (id.length === size)
+        if (id.length >= size)
           return id;
       }
     }
   };
-}, customAlphabet = (alphabet2, size = 21) => customRandom(alphabet2, size, random), nanoid = (size = 21) => {
-  fillPool(size -= 0);
+}
+function customAlphabet(alphabet2, size = 21) {
+  return customRandom(alphabet2, size, random);
+}
+function nanoid(size = 21) {
+  fillPool(size |= 0);
   let id = "";
   for (let i = poolOffset - size;i < poolOffset; i++) {
     id += urlAlphabet[pool2[i] & 63];
   }
   return id;
-};
+}
+var POOL_SIZE_MULTIPLIER = 128, pool2, poolOffset;
 var init_nanoid = () => {};
 
 // node_modules/commander/esm.mjs
@@ -165376,6 +165468,18 @@ function esc(s) {
   return `'${s.replace(/'/g, "'\\''")}'`;
 }
 
+// src/utils/resolve-id.ts
+init_src16();
+async function resolveIdWithClient(rawId, globalOpts) {
+  const parsed = unpackHmId(rawId);
+  if (parsed) {
+    return { id: parsed, client: getClient(globalOpts) };
+  }
+  const id = await resolveId(rawId);
+  const origin = new URL(rawId).origin;
+  return { id, client: createSeedClient(origin) };
+}
+
 // src/utils/signer.ts
 function createSignerFromKey(key) {
   return {
@@ -165524,9 +165628,8 @@ async function readInput(options2) {
 }
 function registerDocumentCommands(program2) {
   const doc = program2.command("document").description("Manage documents (get, create, update, delete, fork, move, redirect, changes, stats, cid)");
-  doc.command("get <id>").description("Fetch a document, comment, or entity by Hypermedia ID").option("-m, --metadata", "Fetch metadata only").option("-r, --resolve", "Resolve embeds, mentions, and queries in markdown output").option("-o, --output <file>", "Write output to file instead of stdout").option("-q, --quiet", "Output minimal info").action(async (id, options2, cmd) => {
+  doc.command("get <id>").description("Fetch a document, comment, or entity by Hypermedia ID or URL").option("-m, --metadata", "Fetch metadata only").option("-r, --resolve", "Resolve embeds, mentions, and queries in markdown output").option("-o, --output <file>", "Write output to file instead of stdout").option("-q, --quiet", "Output minimal info").action(async (id, options2, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
-    const client = getClient(globalOpts);
     const format2 = getOutputFormat(globalOpts);
     const pretty = isPretty(globalOpts);
     const useStructuredOutput = !!(globalOpts.json || globalOpts.yaml);
@@ -165541,13 +165644,9 @@ function registerDocumentCommands(program2) {
       }
     }
     try {
+      const { id: resolvedId, client } = await resolveIdWithClient(id, globalOpts);
       if (options2.metadata) {
-        const unpacked = unpackHmId3(id);
-        if (!unpacked) {
-          printError2(`Invalid Hypermedia ID: ${id}`);
-          process.exit(1);
-        }
-        const result2 = await client.request("ResourceMetadata", unpacked);
+        const result2 = await client.request("ResourceMetadata", resolvedId);
         if (globalOpts.quiet || options2.quiet) {
           emit(result2.metadata?.name || result2.id.id);
         } else {
@@ -165555,12 +165654,7 @@ function registerDocumentCommands(program2) {
         }
         return;
       }
-      const resourceId = unpackHmId3(id);
-      if (!resourceId) {
-        printError2(`Invalid Hypermedia ID: ${id}`);
-        process.exit(1);
-      }
-      const result = await client.request("Resource", resourceId);
+      const result = await client.request("Resource", resolvedId);
       if (globalOpts.quiet || options2.quiet) {
         if (result.type === "document") {
           emit(result.document.metadata?.name || result.id.id);
@@ -165707,18 +165801,13 @@ function registerDocumentCommands(program2) {
   doc.command("update <id>").description("Update document content and metadata (smart diff — only changed blocks are submitted)").option("-f, --file <path>", "Input file (format detected by extension: .md, .json). Diffs against existing content.").option("--name <value>", "Set document title").option("--summary <value>", "Set document summary").option("--display-author <value>", "Display author name").option("--display-publish-time <value>", "Display publish time (YYYY-MM-DD)").option("--icon <value>", "Document icon (ipfs:// or file:// URL)").option("--cover <value>", "Cover image (ipfs:// or file:// URL)").option("--site-url <value>", "Site URL").option("--layout <value>", "Document layout").option("--show-outline", "Show document outline").option("--no-show-outline", "Hide document outline").option("--show-activity", "Show document activity").option("--no-show-activity", "Hide document activity").option("--content-width <value>", "Content width (S, M, L)").option("--seed-experimental-logo <value>", "Experimental logo (ipfs:// or file:// URL)").option("--seed-experimental-home-order <value>", "Home ordering (UpdatedFirst, CreatedFirst)").option("--import-categories <value>", "Import categories (comma-separated)").option("--import-tags <value>", "Import tags (comma-separated)").option("--parent <blockId>", "Parent block ID for new content (default: root)").option("--delete-blocks <ids>", "Comma-separated block IDs to delete").option("-k, --key <name>", "Signing key name or account ID").action(async (id, options2, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     const dev = !!globalOpts.dev;
-    const client = getClient(globalOpts);
     try {
+      const { id: resourceId, client } = await resolveIdWithClient(id, globalOpts);
       const key = resolveKey(options2.key, dev);
       const hasFileInput = !!options2.file;
       const ops = [];
       let fileBlobs = [];
       let metaBlobs = [];
-      const resourceId = unpackHmId3(id);
-      if (!resourceId) {
-        printError2(`Invalid Hypermedia ID: ${id}`);
-        process.exit(1);
-      }
       const resource = await client.request("Resource", resourceId);
       if (resource.type !== "document") {
         printError2(`Resource is ${resource.type}, not a document.`);
@@ -165798,15 +165887,10 @@ function registerDocumentCommands(program2) {
   doc.command("delete <id>").description("Delete a document by publishing a tombstone ref").option("-k, --key <name>", "Signing key name or account ID").action(async (id, _options, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     const dev = !!globalOpts.dev;
-    const client = getClient(globalOpts);
     try {
+      const { id: unpacked, client } = await resolveIdWithClient(id, globalOpts);
       const key = resolveKey(_options.key, dev);
       const signer = createSignerFromKey(key);
-      const unpacked = unpackHmId3(id);
-      if (!unpacked) {
-        printError2(`Invalid Hypermedia ID: ${id}`);
-        process.exit(1);
-      }
       const resource = await client.request("Resource", unpacked);
       if (resource.type !== "document") {
         printError2(`Cannot delete: resource is ${resource.type}, not a document.`);
@@ -165831,15 +165915,11 @@ function registerDocumentCommands(program2) {
   doc.command("fork <sourceId> <destinationId>").description("Fork a document to a new location (creates a copy)").option("-k, --key <name>", "Signing key name or account ID").action(async (sourceId, destinationId, _options, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     const dev = !!globalOpts.dev;
-    const client = getClient(globalOpts);
     try {
+      const { id: sourceUnpacked, client } = await resolveIdWithClient(sourceId, globalOpts);
+      const { id: dest } = await resolveIdWithClient(destinationId, globalOpts);
       const key = resolveKey(_options.key, dev);
       const signer = createSignerFromKey(key);
-      const sourceUnpacked = unpackHmId3(sourceId);
-      if (!sourceUnpacked) {
-        printError2(`Invalid source Hypermedia ID: ${sourceId}`);
-        process.exit(1);
-      }
       const resource = await client.request("Resource", sourceUnpacked);
       if (resource.type !== "document") {
         printError2(`Cannot fork: source is ${resource.type}, not a document.`);
@@ -165848,11 +165928,6 @@ function registerDocumentCommands(program2) {
       const doc2 = resource.document;
       if (!doc2.generationInfo)
         throw new Error("No generation info for source document");
-      const dest = unpackHmId3(destinationId);
-      if (!dest) {
-        printError2(`Invalid destination Hypermedia ID: ${destinationId}`);
-        process.exit(1);
-      }
       const refInput = await createVersionRef({
         space: dest.uid,
         path: hmIdPathToEntityQueryPath3(dest.path),
@@ -165873,20 +165948,11 @@ function registerDocumentCommands(program2) {
   doc.command("move <sourceId> <destinationId>").description("Move a document to a new location (creates redirect at source)").option("-k, --key <name>", "Signing key name or account ID").action(async (sourceId, destinationId, _options, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     const dev = !!globalOpts.dev;
-    const client = getClient(globalOpts);
     try {
+      const { id: source, client } = await resolveIdWithClient(sourceId, globalOpts);
+      const { id: dest } = await resolveIdWithClient(destinationId, globalOpts);
       const key = resolveKey(_options.key, dev);
       const signer = createSignerFromKey(key);
-      const source = unpackHmId3(sourceId);
-      const dest = unpackHmId3(destinationId);
-      if (!source) {
-        printError2(`Invalid source Hypermedia ID: ${sourceId}`);
-        process.exit(1);
-      }
-      if (!dest) {
-        printError2(`Invalid destination Hypermedia ID: ${destinationId}`);
-        process.exit(1);
-      }
       const resource = await client.request("Resource", source);
       if (resource.type !== "document") {
         printError2(`Cannot move: source is ${resource.type}, not a document.`);
@@ -165924,20 +165990,11 @@ function registerDocumentCommands(program2) {
   doc.command("redirect <id>").description("Create a redirect from one document to another").requiredOption("--to <targetId>", "Target Hypermedia ID to redirect to").option("--republish", "Republish target content at this location").option("-k, --key <name>", "Signing key name or account ID").action(async (id, _options, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     const dev = !!globalOpts.dev;
-    const client = getClient(globalOpts);
     try {
+      const { id: source, client } = await resolveIdWithClient(id, globalOpts);
+      const { id: target } = await resolveIdWithClient(_options.to, globalOpts);
       const key = resolveKey(_options.key, dev);
       const signer = createSignerFromKey(key);
-      const source = unpackHmId3(id);
-      const target = unpackHmId3(_options.to);
-      if (!source) {
-        printError2(`Invalid source Hypermedia ID: ${id}`);
-        process.exit(1);
-      }
-      if (!target) {
-        printError2(`Invalid target Hypermedia ID: ${_options.to}`);
-        process.exit(1);
-      }
       const resource = await client.request("Resource", source);
       if (resource.type !== "document") {
         printError2(`Cannot redirect: resource is ${resource.type}, not a document.`);
@@ -165964,15 +166021,10 @@ function registerDocumentCommands(program2) {
   });
   doc.command("changes <targetId>").description("List document change history").option("-q, --quiet", "Output CIDs and authors only").action(async (targetId, _options, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
-    const client = getClient(globalOpts);
     const format2 = getOutputFormat(globalOpts);
     const pretty = isPretty(globalOpts);
     try {
-      const unpacked = unpackHmId3(targetId);
-      if (!unpacked) {
-        printError2(`Invalid Hypermedia ID: ${targetId}`);
-        process.exit(1);
-      }
+      const { id: unpacked, client } = await resolveIdWithClient(targetId, globalOpts);
       const result = await client.request("ListChanges", { targetId: unpacked });
       if (globalOpts.quiet) {
         result.changes.forEach((c) => {
@@ -165991,15 +166043,10 @@ function registerDocumentCommands(program2) {
   });
   doc.command("stats <id>").description("Get interaction statistics for a document").action(async (id, _options, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
-    const client = getClient(globalOpts);
     const format2 = getOutputFormat(globalOpts);
     const pretty = isPretty(globalOpts);
     try {
-      const unpacked = unpackHmId3(id);
-      if (!unpacked) {
-        printError2(`Invalid Hypermedia ID: ${id}`);
-        process.exit(1);
-      }
+      const { id: unpacked, client } = await resolveIdWithClient(id, globalOpts);
       const result = await client.request("InteractionSummary", { id: unpacked });
       console.log(formatOutput2(result, format2, pretty));
     } catch (error) {
@@ -166133,17 +166180,12 @@ function registerCommentCommands(program2) {
       process.exit(1);
     }
   });
-  comment.command("list <targetId>").description("List comments on a document").option("-q, --quiet", "Output IDs and authors only").action(async (targetId, _options, cmd) => {
+  comment.command("list <targetId>").description("List comments on a document or URL").option("-q, --quiet", "Output IDs and authors only").action(async (targetId, _options, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
-    const client = getClient(globalOpts);
     const format2 = getOutputFormat(globalOpts);
     const pretty = isPretty(globalOpts);
     try {
-      const unpacked = unpackHmId3(targetId);
-      if (!unpacked) {
-        printError2(`Invalid Hypermedia ID: ${targetId}`);
-        process.exit(1);
-      }
+      const { id: unpacked, client } = await resolveIdWithClient(targetId, globalOpts);
       const result = await client.request("ListComments", { targetId: unpacked });
       if (globalOpts.quiet) {
         result.comments.forEach((c) => {
@@ -166158,17 +166200,13 @@ function registerCommentCommands(program2) {
       process.exit(1);
     }
   });
-  comment.command("create <targetId>").description("Create a comment on a document").option("--body <text>", "Comment text").option("--file <path>", "Read comment text from file").option("--reply <commentId>", "Reply to an existing comment").option("-k, --key <name>", "Signing key name or account ID").action(async (targetId, options2, cmd) => {
+  comment.command("create <targetId>").description("Create a comment on a document or URL").option("--body <text>", "Comment text").option("--file <path>", "Read comment text from file").option("--reply <commentId>", "Reply to an existing comment").option("-k, --key <name>", "Signing key name or account ID").action(async (targetId, options2, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
     const dev = !!globalOpts.dev;
-    const client = getClient(globalOpts);
     try {
+      const { id: unpacked, client } = await resolveIdWithClient(targetId, globalOpts);
       const key = resolveKey(options2.key, dev);
       const text3 = readCommentText(options2);
-      const unpacked = unpackHmId3(targetId);
-      if (!unpacked) {
-        throw new Error(`Invalid Hypermedia ID: ${targetId}`);
-      }
       const blockRef = unpacked.blockRef;
       const resourceId = { ...unpacked, blockRef: null };
       const resource = await client.request("Resource", resourceId);
@@ -166290,17 +166328,12 @@ function registerCommentCommands(program2) {
       process.exit(1);
     }
   });
-  comment.command("discussions <targetId>").description("List threaded discussions on a document").option("-c, --comment <id>", "Filter to specific thread").action(async (targetId, options2, cmd) => {
+  comment.command("discussions <targetId>").description("List threaded discussions on a document or URL").option("-c, --comment <id>", "Filter to specific thread").action(async (targetId, options2, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
-    const client = getClient(globalOpts);
     const format2 = getOutputFormat(globalOpts);
     const pretty = isPretty(globalOpts);
     try {
-      const unpacked = unpackHmId3(targetId);
-      if (!unpacked) {
-        printError2(`Invalid Hypermedia ID: ${targetId}`);
-        process.exit(1);
-      }
+      const { id: unpacked, client } = await resolveIdWithClient(targetId, globalOpts);
       const result = await client.request("ListDiscussions", { targetId: unpacked, commentId: options2.comment });
       console.log(formatOutput2(result, format2, pretty));
     } catch (error) {
@@ -166532,7 +166565,6 @@ Examples:
 }
 
 // src/commands/account.ts
-init_entity_id_url();
 function registerAccountCommands(program2) {
   const account = program2.command("account").description("Manage accounts (get, list, contacts, capabilities)");
   account.command("get <uid>").description("Get account information").option("-q, --quiet", "Output ID only").action(async (uid, _options, cmd) => {
@@ -166597,15 +166629,10 @@ function registerAccountCommands(program2) {
   });
   account.command("capabilities <id>").description("List access control capabilities").action(async (id, _options, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
-    const client = getClient(globalOpts);
     const format2 = getOutputFormat(globalOpts);
     const pretty = isPretty(globalOpts);
     try {
-      const unpacked = unpackHmId3(id);
-      if (!unpacked) {
-        printError2(`Invalid Hypermedia ID: ${id}`);
-        process.exit(1);
-      }
+      const { id: unpacked, client } = await resolveIdWithClient(id, globalOpts);
       const result = await client.request("ListCapabilities", { targetId: unpacked });
       console.log(formatOutput2(result, format2, pretty));
     } catch (error) {
@@ -166658,7 +166685,6 @@ function registerSearchCommand(program2) {
 }
 
 // src/commands/query.ts
-init_entity_id_url();
 function registerQueryCommands(program2) {
   program2.command("query <space>").description("List documents in a space").option("-p, --path <path>", "Path prefix").option("-m, --mode <mode>", "Query mode: Children or AllDescendants", "Children").option("-l, --limit <n>", "Limit results", parseInt).option("--sort <term>", "Sort by: Path, Title, CreateTime, UpdateTime, DisplayTime").option("--reverse", "Reverse sort order").option("-q, --quiet", "Output IDs and names only").action(async (space, options2, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
@@ -166723,15 +166749,10 @@ function registerQueryCommands(program2) {
   });
   program2.command("citations <id>").description("List documents citing this resource").option("-q, --quiet", "Output source IDs only").action(async (id, _options, cmd) => {
     const globalOpts = cmd.optsWithGlobals();
-    const client = getClient(globalOpts);
     const format2 = getOutputFormat(globalOpts);
     const pretty = isPretty(globalOpts);
     try {
-      const unpacked = unpackHmId3(id);
-      if (!unpacked) {
-        printError2(`Invalid Hypermedia ID: ${id}`);
-        process.exit(1);
-      }
+      const { id: unpacked, client } = await resolveIdWithClient(id, globalOpts);
       const result = await client.request("ListCitations", { targetId: unpacked });
       if (globalOpts.quiet) {
         result.citations.forEach((c) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seed-hypermedia/cli",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/seed-hypermedia/seed.git",
@@ -54,7 +54,6 @@
     "@ipld/dag-cbor": "^9.2.2",
     "@noble/ed25519": "^2.2.0",
     "@noble/hashes": "^1.7.0",
-    "@seed-hypermedia/client": "workspace:*",
     "bip39": "^3.1.0",
     "pdfjs-dist": "^4.2.67",
     "chalk": "^5.3.0",
@@ -65,6 +64,7 @@
     "yaml": "^2.6.0"
   },
   "devDependencies": {
+    "@seed-hypermedia/client": "workspace:*",
     "@types/bun": "latest",
     "@types/node": "^20.0.0",
     "typescript": "^5.7.0"