docz-cli 0.5.0 → 0.7.0

package/dist/{chunk-EBJ32KUL.js → chunk-BHXHIHWH.js}

@@ -1,6 +1,15 @@
 #!/usr/bin/env node
 
 // src/client.ts
+var ConflictError = class extends Error {
+  constructor(detail) {
+    super(
+      "Conflict: file has been modified by others. Please re-read the latest content and re-apply your changes."
+    );
+    this.detail = detail;
+    this.name = "ConflictError";
+  }
+};
 var DocSyncClient = class {
   constructor(baseUrl, token) {
     this.baseUrl = baseUrl;
@@ -48,12 +57,28 @@ var DocSyncClient = class {
       `/api/spaces/${spaceId}/tree?path=${encodeURIComponent(path)}`
     );
   }
+  async treeFull(spaceId) {
+    return this.request(`/api/spaces/${spaceId}/tree/full`);
+  }
   // --- Blob ---
   async cat(spaceId, filepath) {
     return this.request(
       `/api/spaces/${spaceId}/blob/${encodeURIComponent(filepath)}`
     );
   }
+  async catWithRef(spaceId, filepath) {
+    const res = await fetch(
+      `${this.baseUrl}/api/spaces/${spaceId}/blob/${encodeURIComponent(filepath)}`,
+      { headers: { Authorization: `Bearer ${this.token}` } }
+    );
+    if (!res.ok) {
+      const body = await res.text().catch(() => "");
+      throw new Error(`${res.status} ${res.statusText}: ${body}`.trim());
+    }
+    const content = await res.text();
+    const ref = res.headers.get("X-Git-Ref") ?? "";
+    return { content, ref };
+  }
   // --- Write ---
   async upload(spaceId, dir, filename, content) {
     const blob = typeof content === "string" ? new Blob([content], { type: "application/octet-stream" }) : new Blob([content], { type: "application/octet-stream" });
@@ -65,6 +90,31 @@ var DocSyncClient = class {
       body: form
     });
   }
+  async save(spaceId, path, content, opts) {
+    const body = { path, content };
+    if (opts?.baseRef) body.base_ref = opts.baseRef;
+    if (opts?.message) body.message = opts.message;
+    const res = await fetch(
+      `${this.baseUrl}/api/spaces/${spaceId}/files/save`,
+      {
+        method: "POST",
+        headers: {
+          Authorization: `Bearer ${this.token}`,
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify(body)
+      }
+    );
+    if (res.status === 409) {
+      const data = await res.json();
+      throw new ConflictError(data);
+    }
+    if (!res.ok) {
+      const text = await res.text().catch(() => "");
+      throw new Error(`${res.status} ${res.statusText}: ${text}`.trim());
+    }
+    return res.json();
+  }
   async mkdir(spaceId, path) {
     await this.request(`/api/spaces/${spaceId}/files/mkdir`, {
       method: "POST",
@@ -86,6 +136,13 @@ var DocSyncClient = class {
       body: JSON.stringify({ old_path: from, new_path: to })
     });
   }
+  async rollback(spaceId, filePath, commitHash) {
+    await this.request(`/api/spaces/${spaceId}/files/rollback`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ file_path: filePath, commit_hash: commitHash })
+    });
+  }
   // --- History ---
   async log(spaceId, filepath) {
     const path = filepath ? `/api/spaces/${spaceId}/log/${encodeURIComponent(filepath)}` : `/api/spaces/${spaceId}/log/`;
@@ -95,6 +152,48 @@ var DocSyncClient = class {
   async trash(spaceId) {
     return this.request(`/api/spaces/${spaceId}/trash`);
   }
+  async restore(spaceId, path, commit) {
+    await this.request(`/api/spaces/${spaceId}/trash/restore`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ path, commit })
+    });
+  }
+  // --- Comments ---
+  async listComments(spaceId, filePath) {
+    return this.request(
+      `/api/spaces/${spaceId}/comments?path=${encodeURIComponent(filePath)}`
+    );
+  }
+  async createComment(spaceId, filePath, content) {
+    return this.request(`/api/spaces/${spaceId}/comments`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ file_path: filePath, content })
+    });
+  }
+  async replyComment(spaceId, commentId, content) {
+    return this.request(
+      `/api/spaces/${spaceId}/comments/${commentId}/replies`,
+      {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ content })
+      }
+    );
+  }
+  async closeComment(spaceId, commentId) {
+    return this.request(`/api/spaces/${spaceId}/comments/${commentId}`, {
+      method: "PUT",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ is_closed: true })
+    });
+  }
+  async deleteComment(spaceId, commentId) {
+    await this.request(`/api/spaces/${spaceId}/comments/${commentId}`, {
+      method: "DELETE"
+    });
+  }
   // --- Share Links ---
   async createShareLink(spaceId, filePath, opts) {
     const body = { file_path: filePath };
@@ -137,7 +236,9 @@ var DocSyncClient = class {
   async diffFile(spaceId, filePath, to, from) {
     const params = new URLSearchParams({ to });
     if (from) params.set("from", from);
-    return this.request(`/api/spaces/${spaceId}/diff/${encodeURIComponent(filePath)}?${params}`);
+    return this.request(
+      `/api/spaces/${spaceId}/diff/${encodeURIComponent(filePath)}?${params}`
+    );
   }
   async diffSummary(spaceId, to, from) {
     const params = new URLSearchParams({ to });
@@ -192,7 +293,7 @@ function getConfigPath() {
 
 // src/commands.ts
 import { readFileSync as readFileSync2 } from "fs";
-import { basename, dirname } from "path";
+import { basename } from "path";
 function getClient() {
   const token = getToken();
   if (!token) {
@@ -222,47 +323,76 @@ function formatSize(bytes) {
   if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
   return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
 }
-var SHORT_URL_RE = /\/s\/([^/]+)\/f\/([^/?\s]+)/;
-var SLUG_ONLY_RE = /\/s\/([^/?\s]+)\/?(?:\?.*)?$/;
 var SHARE_URL_RE = /\/share\/([^/?\s]+)/;
+async function resolveSlug(client, slug) {
+  try {
+    const spaces = await client.listSpaces();
+    const found = spaces.find((s) => s.slug === slug);
+    if (found) return found;
+  } catch {
+  }
+  return client.resolveBySlug(slug);
+}
 async function resolveUrl(client, input) {
-  const fileMatch = input.match(SHORT_URL_RE);
+  let pathname;
+  try {
+    pathname = new URL(input).pathname;
+  } catch {
+    return null;
+  }
+  const fileMatch = pathname.match(/^\/s\/([^/]+)\/f\/([^/]+)$/);
   if (fileMatch) {
     const [, slug, fileId] = fileMatch;
     const space = await resolveSlug(client, slug);
     const ref = await client.resolveFileRef(fileId);
     return { spaceId: space.id, path: ref.path };
   }
-  const slugMatch = input.match(SLUG_ONLY_RE);
+  const slugMatch = pathname.match(/^\/s\/([^/]+)(\/.*)?$/);
   if (slugMatch) {
-    const [, slug] = slugMatch;
+    const [, slug, rest] = slugMatch;
     const space = await resolveSlug(client, slug);
-    return { spaceId: space.id, path: "" };
+    const filePath = rest ? decodeURIComponent(rest.slice(1)) : "";
+    return { spaceId: space.id, path: filePath };
   }
-  return null;
-}
-async function resolveSlug(client, slug) {
-  try {
-    const spaces = await client.listSpaces();
-    const found = spaces.find((s) => s.slug === slug);
-    if (found) return found;
-  } catch {
+  const legacyMatch = pathname.match(/^\/spaces\/([^/]+)(\/.*)?$/);
+  if (legacyMatch) {
+    const [, spaceId, rest] = legacyMatch;
+    const filePath = rest ? decodeURIComponent(rest.slice(1)) : "";
+    return { spaceId, path: filePath };
   }
-  return client.resolveBySlug(slug);
+  return null;
 }
 async function resolveTarget(client, args) {
   const first = args[0];
   if (first && (first.startsWith("http://") || first.startsWith("https://"))) {
     const result = await resolveUrl(client, first);
     if (result) return result;
+    throw new Error(
+      `Unrecognized DocSync URL: ${first}
+Expected: /s/{slug}[/f/{fileId}], /s/{slug}[/path], or /spaces/{id}[/path]`
+    );
   }
   const { space, path } = parseTarget(args);
   const s = await client.resolveSpace(space);
   return { spaceId: s.id, path };
 }
+async function resolveSpaceArg(client, input) {
+  if (input.startsWith("http://") || input.startsWith("https://")) {
+    const result = await resolveUrl(client, input);
+    if (result) return { id: result.spaceId };
+    throw new Error(
+      `Unrecognized DocSync URL: ${input}
+Expected: /s/{slug}[/f/{fileId}], /s/{slug}[/path], or /spaces/{id}[/path]`
+    );
+  }
+  return client.resolveSpace(input);
+}
 function parseExpires(value) {
   const match = value.match(/^(\d+)([dh])$/);
-  if (!match) throw new Error(`Invalid expires format: "${value}". Use e.g. 7d, 24h, 30d`);
+  if (!match)
+    throw new Error(
+      `Invalid expires format: "${value}". Use e.g. 7d, 24h, 30d`
+    );
   const [, num, unit] = match;
   const ms = unit === "d" ? Number(num) * 864e5 : Number(num) * 36e5;
   return new Date(Date.now() + ms).toISOString();
@@ -272,6 +402,14 @@ function extractShareToken(input) {
   if (m) return m[1];
   return input;
 }
+async function readStdin() {
+  const chunks = [];
+  for await (const chunk of process.stdin) {
+    chunks.push(chunk);
+  }
+  return Buffer.concat(chunks).toString("utf-8");
+}
+var MAX_SAVE_SIZE = 2 * 1024 * 1024;
 function registerCommands(program) {
   program.command("login").description("Configure DocSync credentials").option("-u, --url <url>", "DocSync server URL").option("-t, --token <token>", "API token").action(async (opts) => {
     const url = opts.url ?? getBaseUrl();
@@ -308,10 +446,10 @@ function registerCommands(program) {
       console.log(`${s.name}	${tag}	${s.member_count} members	${s.id}`);
     }
   });
-  program.command("ls").description("List files \u2014 docz ls <space>[:<path>] or <url>").argument("<target...>").action(async (args) => {
+  program.command("ls").description("List files \u2014 docz ls <space>[:<path>] or <url>").argument("<target...>").option("-R, --recursive", "Recursively list all files").action(async (args, opts) => {
     const client = getClient();
     const { spaceId, path } = await resolveTarget(client, args);
-    const entries = await client.ls(spaceId, path);
+    const entries = opts.recursive ? await client.treeFull(spaceId) : await client.ls(spaceId, path);
     if (entries.length === 0) {
       console.log("(empty)");
       return;
@@ -324,7 +462,7 @@ function registerCommands(program) {
       }
     }
   });
-  program.command("cat").description("Read file content \u2014 docz cat <space>:<path> or <url>").argument("<target...>").action(async (args) => {
+  program.command("cat").description("Read file content \u2014 docz cat <space>:<path> or <url>").argument("<target...>").option("--ref", "Also output Git ref to stderr").action(async (args, opts) => {
     const client = getClient();
     const { spaceId, path } = await resolveTarget(client, args);
     if (!path) {
@@ -333,80 +471,100 @@ function registerCommands(program) {
       );
       process.exit(1);
     }
-    const content = await client.cat(spaceId, path);
-    process.stdout.write(content);
+    if (opts.ref) {
+      const result = await client.catWithRef(spaceId, path);
+      console.error(`ref: ${result.ref}`);
+      process.stdout.write(result.content);
+    } else {
+      const content = await client.cat(spaceId, path);
+      process.stdout.write(content);
+    }
   });
-  program.command("upload").description("Upload file \u2014 docz upload <local-file> <space>[:<dir>]").argument("<file>", "Local file to upload").argument("<target...>").action(async (file, args) => {
-    const { space, path: dir } = parseTarget(args);
+  program.command("upload").description(
+    "Upload file \u2014 docz upload <local-file> <space>[:<dir>] or <url>"
+  ).argument("<file>", "Local file to upload").argument("<target...>").action(async (file, args) => {
     const client = getClient();
-    const s = await client.resolveSpace(space);
+    const { spaceId, path: dir } = await resolveTarget(client, args);
     const content = readFileSync2(file);
     const filename = basename(file);
     const targetDir = dir || "";
-    const result = await client.upload(s.id, targetDir, filename, content);
+    const result = await client.upload(spaceId, targetDir, filename, content);
     console.log(`Uploaded: ${result.path}`);
   });
-  program.command("write").description("Write content to file \u2014 docz write <space>:<path> <content>").argument("<target>", "space:dir/filename.md").argument("<content>", "File content (or - for stdin)").action(async (target, content) => {
-    const { space, path } = parseTarget([target]);
-    if (!path) {
-      console.error(
-        "Error: path is required. Usage: docz write <space>:<dir/filename> <content>"
-      );
-      process.exit(1);
-    }
-    const client = getClient();
-    const s = await client.resolveSpace(space);
-    const filename = basename(path);
-    const dir = dirname(path);
-    let body;
-    if (content === "-") {
-      const chunks = [];
-      for await (const chunk of process.stdin) {
-        chunks.push(chunk);
+  program.command("write").description(
+    "Write content to file \u2014 docz write <space>:<path> <content> or <url> <content>"
+  ).argument("<target>", "space:dir/filename.md or short URL").argument("<content>", "File content (or - for stdin)").option("--force", "Skip conflict detection").option("-m, --message <msg>", "Custom commit message").action(
+    async (target, content, opts) => {
+      const client = getClient();
+      const { spaceId, path } = await resolveTarget(client, [target]);
+      if (!path) {
+        console.error(
+          "Error: path is required. Usage: docz write <space>:<dir/filename> <content>"
+        );
+        process.exit(1);
+      }
+      const body = content === "-" ? await readStdin() : content;
+      if (Buffer.byteLength(body, "utf-8") > MAX_SAVE_SIZE) {
+        console.error(
+          "Error: content exceeds 2MB limit. Use `docz upload` for large files."
+        );
+        process.exit(1);
+      }
+      let baseRef;
+      if (!opts.force) {
+        try {
+          const existing = await client.catWithRef(spaceId, path);
+          baseRef = existing.ref;
+        } catch (err) {
+          const msg = err instanceof Error ? err.message : "";
+          if (!msg.includes("404")) throw err;
+        }
+      }
+      try {
+        const result = await client.save(spaceId, path, body, {
+          baseRef,
+          message: opts.message
+        });
+        console.log(`Written: ${result.path} (ref: ${result.ref})`);
+      } catch (err) {
+        if (err instanceof ConflictError) {
+          console.error(
+            "Error: file was modified by someone else. Please re-read the latest content and try again."
+          );
+          process.exit(1);
+        }
+        throw err;
       }
-      body = Buffer.concat(chunks).toString("utf-8");
-    } else {
-      body = content;
     }
-    const result = await client.upload(
-      s.id,
-      dir === "." ? "" : dir,
-      filename,
-      body
-    );
-    console.log(`Written: ${result.path}`);
-  });
-  program.command("mkdir").description("Create folder \u2014 docz mkdir <space>:<path>").argument("<target...>").action(async (args) => {
-    const { space, path } = parseTarget(args);
+  );
+  program.command("mkdir").description("Create folder \u2014 docz mkdir <space>:<path> or <url>").argument("<target...>").action(async (args) => {
+    const client = getClient();
+    const { spaceId, path } = await resolveTarget(client, args);
     if (!path) {
       console.error("Error: path is required.");
       process.exit(1);
     }
-    const client = getClient();
-    const s = await client.resolveSpace(space);
-    await client.mkdir(s.id, path);
+    await client.mkdir(spaceId, path);
     console.log(`Created: ${path}`);
   });
-  program.command("rm").description("Delete file/folder \u2014 docz rm <space>:<path>").argument("<target...>").action(async (args) => {
-    const { space, path } = parseTarget(args);
+  program.command("rm").description("Delete file/folder \u2014 docz rm <space>:<path> or <url>").argument("<target...>").action(async (args) => {
+    const client = getClient();
+    const { spaceId, path } = await resolveTarget(client, args);
     if (!path) {
       console.error("Error: path is required.");
       process.exit(1);
     }
-    const client = getClient();
-    const s = await client.resolveSpace(space);
-    await client.rm(s.id, path);
+    await client.rm(spaceId, path);
     console.log(`Deleted: ${path} (recoverable from trash for 30 days)`);
   });
-  program.command("mv").description("Rename/move \u2014 docz mv <space>:<from> <to>").argument("<target>", "space:old-path").argument("<to>", "new-path").action(async (target, to) => {
-    const { space, path: from } = parseTarget([target]);
+  program.command("mv").description("Rename/move \u2014 docz mv <space>:<from> <to> or <url> <to>").argument("<target>", "space:old-path or short URL").argument("<to>", "new-path").action(async (target, to) => {
+    const client = getClient();
+    const { spaceId, path: from } = await resolveTarget(client, [target]);
     if (!from) {
       console.error("Error: source path is required.");
       process.exit(1);
     }
-    const client = getClient();
-    const s = await client.resolveSpace(space);
-    await client.mv(s.id, from, to);
+    await client.mv(spaceId, from, to);
     console.log(`Moved: ${from} \u2192 ${to}`);
   });
   program.command("log").description("Show change history \u2014 docz log <space>[:<path>] or <url>").argument("<target...>").action(async (args) => {
@@ -421,9 +579,21 @@ function registerCommands(program) {
       console.log(`${l.hash}  ${l.date}  ${l.message}`);
     }
   });
+  program.command("rollback").description(
+    "Rollback file to a previous version \u2014 docz rollback <space>:<path> <commit> or <url> <commit>"
+  ).argument("<target>", "space:path or short URL").argument("<commit>", "Commit hash to rollback to").action(async (target, commit) => {
+    const client = getClient();
+    const { spaceId, path } = await resolveTarget(client, [target]);
+    if (!path) {
+      console.error("Error: file path is required.");
+      process.exit(1);
+    }
+    await client.rollback(spaceId, path, commit);
+    console.log(`Rolled back: ${path} \u2192 ${commit.substring(0, 7)}`);
+  });
   program.command("trash").description("Show deleted files \u2014 docz trash <space>").argument("<space>").action(async (spaceName) => {
     const client = getClient();
-    const s = await client.resolveSpace(spaceName);
+    const s = await resolveSpaceArg(client, spaceName);
     const items = await client.trash(s.id);
     if (items.length === 0) {
       console.log("Trash is empty.");
@@ -435,32 +605,109 @@ function registerCommands(program) {
       );
     }
   });
-  const share = program.command("share").description("Manage share links");
-  share.command("create").description("Create share link \u2014 docz share create <space>:<path>").argument("<target>", "space:path").option("--expires <duration>", "Expiry duration (e.g. 7d, 24h)").option("--users <emails>", "Comma-separated user emails or IDs").option("--groups <ids>", "Comma-separated group IDs").action(async (target, opts) => {
-    const { space, path } = parseTarget([target]);
+  program.command("restore").description(
+    "Restore file from trash \u2014 docz restore <space>:<path> <commit> or <url> <commit>"
+  ).argument("<target>", "space:path or short URL").argument("<commit>", "Commit hash from trash listing").action(async (target, commit) => {
+    const client = getClient();
+    const { spaceId, path } = await resolveTarget(client, [target]);
+    if (!path) {
+      console.error("Error: path is required.");
+      process.exit(1);
+    }
+    await client.restore(spaceId, path, commit);
+    console.log(`Restored: ${path}`);
+  });
+  const comment = program.command("comment").description("Manage file comments");
+  comment.command("list").description("List comments \u2014 docz comment list <space>:<path>").argument("<target...>").action(async (args) => {
+    const client = getClient();
+    const { spaceId, path } = await resolveTarget(client, args);
+    if (!path) {
+      console.error("Error: file path is required.");
+      process.exit(1);
+    }
+    const comments = await client.listComments(spaceId, path);
+    if (comments.length === 0) {
+      console.log("No comments.");
+      return;
+    }
+    for (const c of comments) {
+      const status = c.is_closed ? " [closed]" : "";
+      console.log(`#${c.id} ${c.user_name} (${c.created_at})${status}`);
+      console.log(`  ${c.content}`);
+      for (const r of c.replies) {
+        console.log(`    \u2192 ${r.user_name}: ${r.content}`);
+      }
+    }
+  });
+  comment.command("add").description(
+    "Add comment \u2014 docz comment add <space>:<path> <content> or <url> <content>"
+  ).argument("<target>", "space:path or short URL").argument("<content>", "Comment text (or - for stdin)").action(async (target, content) => {
+    const client = getClient();
+    const { spaceId, path } = await resolveTarget(client, [target]);
     if (!path) {
-      console.error("Error: file path is required. Usage: docz share create <space>:<path>");
+      console.error("Error: file path is required.");
       process.exit(1);
     }
+    const body = content === "-" ? await readStdin() : content;
+    const c = await client.createComment(spaceId, path, body);
+    console.log(`Comment #${c.id} created.`);
+  });
+  comment.command("reply").description(
+    "Reply to comment \u2014 docz comment reply <space> <commentId> <content>"
+  ).argument("<space>").argument("<commentId>").argument("<content>", "Reply text (or - for stdin)").action(async (spaceName, commentId, content) => {
+    const client = getClient();
+    const s = await resolveSpaceArg(client, spaceName);
+    const body = content === "-" ? await readStdin() : content;
+    const r = await client.replyComment(s.id, Number(commentId), body);
+    console.log(`Reply #${r.id} created.`);
+  });
+  comment.command("close").description("Close comment \u2014 docz comment close <space> <commentId>").argument("<space>").argument("<commentId>").action(async (spaceName, commentId) => {
+    const client = getClient();
+    const s = await resolveSpaceArg(client, spaceName);
+    await client.closeComment(s.id, Number(commentId));
+    console.log(`Comment #${commentId} closed.`);
+  });
+  comment.command("rm").description("Delete comment \u2014 docz comment rm <space> <commentId>").argument("<space>").argument("<commentId>").action(async (spaceName, commentId) => {
     const client = getClient();
-    const s = await client.resolveSpace(space);
-    const apiOpts = {};
-    if (opts.expires) apiOpts.expiresAt = parseExpires(opts.expires);
-    if (opts.users) apiOpts.userIds = opts.users.split(",").map((s2) => s2.trim());
-    if (opts.groups) apiOpts.groupIds = opts.groups.split(",").map((s2) => s2.trim());
-    const link = await client.createShareLink(s.id, path, apiOpts);
-    const baseUrl = getBaseUrl();
-    console.log(`Created share link:`);
-    console.log(`  id:      ${link.id}`);
-    console.log(`  token:   ${link.token}`);
-    console.log(`  url:     ${baseUrl}/share/${link.token}`);
-    console.log(`  expires: ${link.expires_at ?? "never"}`);
-    if (link.user_ids?.length) console.log(`  users:   ${link.user_ids.join(", ")}`);
-    if (link.group_ids?.length) console.log(`  groups:  ${link.group_ids.length}`);
+    const s = await resolveSpaceArg(client, spaceName);
+    await client.deleteComment(s.id, Number(commentId));
+    console.log(`Comment #${commentId} deleted.`);
   });
+  const share = program.command("share").description("Manage share links");
+  share.command("create").description(
+    "Create share link \u2014 docz share create <space>:<path> or <url>"
+  ).argument("<target>", "space:path or short URL").option("--expires <duration>", "Expiry duration (e.g. 7d, 24h)").option("--users <emails>", "Comma-separated user emails or IDs").option("--groups <ids>", "Comma-separated group IDs").action(
+    async (target, opts) => {
+      const client = getClient();
+      const { spaceId, path } = await resolveTarget(client, [target]);
+      if (!path) {
+        console.error(
+          "Error: file path is required. Usage: docz share create <space>:<path>"
+        );
+        process.exit(1);
+      }
+      const apiOpts = {};
+      if (opts.expires) apiOpts.expiresAt = parseExpires(opts.expires);
+      if (opts.users)
+        apiOpts.userIds = opts.users.split(",").map((s) => s.trim());
+      if (opts.groups)
+        apiOpts.groupIds = opts.groups.split(",").map((s) => s.trim());
+      const link = await client.createShareLink(spaceId, path, apiOpts);
+      const baseUrl = getBaseUrl();
+      console.log("Created share link:");
+      console.log(`  id:      ${link.id}`);
+      console.log(`  token:   ${link.token}`);
+      console.log(`  url:     ${baseUrl}/share/${link.token}`);
+      console.log(`  expires: ${link.expires_at ?? "never"}`);
+      if (link.user_ids?.length)
+        console.log(`  users:   ${link.user_ids.join(", ")}`);
+      if (link.group_ids?.length)
+        console.log(`  groups:  ${link.group_ids.length}`);
+    }
+  );
   share.command("list").description("List share links \u2014 docz share list <space>").argument("<space>").option("--file <path>", "Filter by file path").action(async (spaceName, opts) => {
     const client = getClient();
-    const s = await client.resolveSpace(spaceName);
+    const s = await resolveSpaceArg(client, spaceName);
     const links = await client.listShareLinks(s.id, opts.file);
     if (links.length === 0) {
       console.log("No share links.");
@@ -469,19 +716,25 @@ function registerCommands(program) {
     for (const l of links) {
       const expires = l.expires_at ?? "never";
       const creator = l.created_by_name ?? l.created_by_email ?? l.created_by;
-      console.log(`${l.id}	${l.token}	${l.file_path}	${expires}	${creator}`);
+      console.log(
+        `${l.id}	${l.token}	${l.file_path}	${expires}	${creator}`
+      );
     }
   });
-  share.command("update").description("Update share link \u2014 docz share update <space> <link-id>").argument("<space>").argument("<linkId>").option("--expires <duration>", "New expiry duration (e.g. 30d)").option("--users <emails>", "Comma-separated user emails or IDs").option("--groups <ids>", "Comma-separated group IDs").action(async (spaceName, linkId, opts) => {
-    const client = getClient();
-    const s = await client.resolveSpace(spaceName);
-    const apiOpts = {};
-    if (opts.expires) apiOpts.expiresAt = parseExpires(opts.expires);
-    if (opts.users) apiOpts.userIds = opts.users.split(",").map((s2) => s2.trim());
-    if (opts.groups) apiOpts.groupIds = opts.groups.split(",").map((s2) => s2.trim());
-    await client.updateShareLink(s.id, linkId, apiOpts);
-    console.log(`Updated share link: ${linkId}`);
-  });
+  share.command("update").description("Update share link \u2014 docz share update <space> <link-id>").argument("<space>").argument("<linkId>").option("--expires <duration>", "New expiry duration (e.g. 30d)").option("--users <emails>", "Comma-separated user emails or IDs").option("--groups <ids>", "Comma-separated group IDs").action(
+    async (spaceName, linkId, opts) => {
+      const client = getClient();
+      const s = await resolveSpaceArg(client, spaceName);
+      const apiOpts = {};
+      if (opts.expires) apiOpts.expiresAt = parseExpires(opts.expires);
+      if (opts.users)
+        apiOpts.userIds = opts.users.split(",").map((s2) => s2.trim());
+      if (opts.groups)
+        apiOpts.groupIds = opts.groups.split(",").map((s2) => s2.trim());
+      await client.updateShareLink(s.id, linkId, apiOpts);
+      console.log(`Updated share link: ${linkId}`);
+    }
+  );
   share.command("cat").description("Read shared file \u2014 docz share cat <token-or-url>").argument("<token>", "Share token or full URL").option("--raw", "Output raw content only").action(async (tokenArg, opts) => {
     const client = getClient();
     const token = extractShareToken(tokenArg);
@@ -489,7 +742,9 @@ function registerCommands(program) {
       try {
         const info = await client.getSharedFileInfo(token);
         console.log(`File: ${info.file_path} (${info.space_name})`);
-        console.log(`Shared by: ${info.created_by_name} | Expires: ${info.expires_at ?? "never"}`);
+        console.log(
+          `Shared by: ${info.created_by_name} | Expires: ${info.expires_at ?? "never"}`
+        );
         console.log("---");
       } catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
@@ -512,7 +767,7 @@ function registerCommands(program) {
   });
   share.command("rm").description("Delete share link \u2014 docz share rm <space> <link-id>").argument("<space>").argument("<linkId>").action(async (spaceName, linkId) => {
     const client = getClient();
-    const s = await client.resolveSpace(spaceName);
+    const s = await resolveSpaceArg(client, spaceName);
     await client.deleteShareLink(s.id, linkId);
     console.log(`Deleted share link: ${linkId}`);
   });
@@ -528,19 +783,20 @@ function registerCommands(program) {
     const ref = await client.getFileRef(spaceId, path);
     console.log(ref.url);
   });
-  program.command("diff").description("Show changes \u2014 docz diff <space>[:<path>] <commit> [<from>]").argument("<target>", "space or space:path").argument("<to>", "Commit hash").argument("[from]", "From commit hash (default: to^)").action(async (target, to, from) => {
+  program.command("diff").description(
+    "Show changes \u2014 docz diff <space>[:<path>] <commit> [<from>] or <url> <commit> [<from>]"
+  ).argument("<target>", "space or space:path or short URL").argument("<to>", "Commit hash").argument("[from]", "From commit hash (default: to^)").action(async (target, to, from) => {
     const client = getClient();
-    const { space, path } = parseTarget([target]);
-    const s = await client.resolveSpace(space);
+    const { spaceId, path } = await resolveTarget(client, [target]);
     if (path) {
-      const result = await client.diffFile(s.id, path, to, from);
+      const result = await client.diffFile(spaceId, path, to, from);
       if (result.diff) {
         process.stdout.write(result.diff);
       } else {
         console.log("No changes.");
       }
     } else {
-      const result = await client.diffSummary(s.id, to, from);
+      const result = await client.diffSummary(spaceId, to, from);
       if (result.files.length === 0) {
         console.log("No changes.");
         return;
@@ -553,10 +809,11 @@ function registerCommands(program) {
 }
 
 export {
+  ConflictError,
   DocSyncClient,
   getBaseUrl,
   getToken,
   parseExpires,
   registerCommands
 };
-//# sourceMappingURL=chunk-EBJ32KUL.js.map
+//# sourceMappingURL=chunk-BHXHIHWH.js.map