@opencode-manager/ocm-cli 0.1.3 → 0.1.4

package/README.md

@@ -69,6 +69,6 @@ export default [ocm]
 ## Requirements
 
 - `opencode` available on `PATH`
-- `git` and `tar` available on `PATH`
+- `git` and `tar` (with gzip support, i.e. the `-z` flag) available on `PATH`
 - macOS `security` CLI for Keychain-backed token storage
 - An OpenCode Manager URL and bearer token

package/dist/ocm.js

@@ -165,12 +165,12 @@ class ManagerApi {
     if (!res.ok)
       throw await formatErrorResponse(res, `mirror part ${index}`);
   }
-  async mirrorCommit(repoId, uploadId, totalParts) {
+  async mirrorCommit(repoId, uploadId, totalParts, gzip) {
     const url = `${this.baseUrl}/api/internal/repos/${repoId}/mirror/commit`;
     const res = await fetch(url, {
       method: "POST",
       headers: { ...this.headers(), "Content-Type": "application/json" },
-      body: JSON.stringify({ uploadId, totalParts })
+      body: JSON.stringify({ uploadId, totalParts, gzip })
     });
     if (!res.ok)
       throw await formatErrorResponse(res, "mirror commit");
@@ -180,8 +180,9 @@ class ManagerApi {
     const url = `${this.baseUrl}/api/internal/repos/${repoId}/mirror/uploads/${uploadId}`;
     await fetch(url, { method: "DELETE", headers: this.headers() }).catch(() => {});
   }
-  async mirrorDown(repoId) {
-    const res = await fetch(`${this.baseUrl}/api/internal/repos/${repoId}/mirror`, {
+  async mirrorDown(repoId, gzip) {
+    const query = gzip ? "?compress=gzip" : "";
+    const res = await fetch(`${this.baseUrl}/api/internal/repos/${repoId}/mirror${query}`, {
       headers: this.headers()
     });
     if (!res.ok)
@@ -192,7 +193,7 @@ class ManagerApi {
 
 // src/mirror.ts
 import { spawnSync as spawnSync3, spawn } from "child_process";
-import { existsSync as existsSync2, statSync } from "fs";
+import { existsSync as existsSync2 } from "fs";
 import * as fsp from "fs/promises";
 import { Readable } from "stream";
 import { join as join2, dirname as dirname2 } from "path";
@@ -242,6 +243,7 @@ function urlsEqual(a, b) {
 var HARDCODED_EXCLUDES = ["node_modules", "dist", ".next", ".venv", "__pycache__", ".turbo", ".DS_Store", "._*"];
 var PART_RETRIES = 3;
 var PART_BACKOFF_MS = [500, 2000, 8000];
+var MIRROR_GZIP = true;
 function getGitignoreExclusions(repoRoot) {
   const res = spawnSync3("git", ["ls-files", "--others", "--ignored", "--exclude-standard", "--directory"], {
     cwd: repoRoot,
@@ -267,30 +269,6 @@ async function carryOverIgnored(fromDir, toDir) {
     await fsp.rename(src, dest).catch(() => {});
   }
 }
-function listIncludedFiles(repoRoot) {
-  const tracked = spawnSync3("git", ["ls-files", "-z"], { cwd: repoRoot, encoding: "utf-8" });
-  const untracked = spawnSync3("git", ["ls-files", "--others", "--exclude-standard", "-z"], { cwd: repoRoot, encoding: "utf-8" });
-  const split = (out) => (out ?? "").split("\x00").filter((p) => p.length > 0);
-  const all = [...split(tracked.stdout), ...split(untracked.stdout)];
-  return all.filter((p) => {
-    const top = p.split("/")[0] ?? p;
-    return !HARDCODED_EXCLUDES.includes(top);
-  });
-}
-function estimateTarSize(repoRoot) {
-  const files = listIncludedFiles(repoRoot);
-  let total = 0;
-  for (const rel of files) {
-    let size = 0;
-    try {
-      size = statSync(join2(repoRoot, rel)).size;
-    } catch {
-      continue;
-    }
-    total += 512 + Math.ceil(size / 512) * 512;
-  }
-  return total + 1024;
-}
 
 class MirrorAbort extends Error {
   constructor(message) {
@@ -370,9 +348,10 @@ function createPartFlusher(api, repoId, uploadId, chunkSize) {
 async function mirrorUp(plan, opts) {
   const repoId = opts.create ? 0 : plan.matched[0].repoId;
   const begin = await opts.api.mirrorBegin(repoId, { force: opts.force, create: opts.create });
-  const totalBytes = estimateTarSize(plan.repoRoot);
   let bytesSent = 0;
   const tarArgs = ["-c", "-C", plan.repoRoot];
+  if (MIRROR_GZIP)
+    tarArgs.unshift("-z");
   for (const dir of HARDCODED_EXCLUDES)
     tarArgs.push("--exclude", dir);
   const ignoredPaths = getGitignoreExclusions(plan.repoRoot);
@@ -406,12 +385,12 @@ async function mirrorUp(plan, opts) {
     for await (const chunk of child.stdout) {
       await flusher.push(chunk);
       bytesSent += chunk.length;
-      opts.onProgress?.({ phase: "uploading", bytesSent, totalBytes });
+      opts.onProgress?.({ bytesSent });
     }
     await tarExit;
     const totalParts = await flusher.finish();
-    opts.onProgress?.({ phase: "committing", bytesSent, totalBytes });
-    const result = await opts.api.mirrorCommit(begin.repoId, begin.uploadId, totalParts);
+    opts.onProgress?.({ bytesSent });
+    const result = await opts.api.mirrorCommit(begin.repoId, begin.uploadId, totalParts, MIRROR_GZIP);
     return result;
   } catch (err) {
     if (!child.killed)
@@ -431,8 +410,11 @@ async function mirrorDown(repoId, repoRoot, api, opts = { force: false }) {
   const staging = `${repoRoot}.ocm-recv-${Date.now()}`;
   await fsp.mkdir(staging, { recursive: true });
   try {
-    const tarball = await api.mirrorDown(repoId);
-    const child = spawn("tar", ["-x", "-f", "-", "-C", staging], { stdio: ["pipe", "pipe", "pipe"] });
+    const tarball = await api.mirrorDown(repoId, MIRROR_GZIP);
+    const tarArgs = ["-x", "-f", "-", "-C", staging];
+    if (MIRROR_GZIP)
+      tarArgs.unshift("-z");
+    const child = spawn("tar", tarArgs, { stdio: ["pipe", "pipe", "pipe"] });
     const stderrChunks = [];
     child.stderr.on("data", (chunk) => stderrChunks.push(chunk));
     const tarDone = new Promise((resolve, reject) => {
@@ -501,31 +483,10 @@ function formatBytes(bytes) {
 function createProgressReporter(label, out = process.stderr, now = Date.now) {
   let finished = false;
   let lastRenderAt = -Infinity;
-  let lastBucket = -1;
   let lastNonTtyTickAt = -Infinity;
   let frameIndex = 0;
   const isTTY = out.isTTY === true;
   return {
-    update(current, total) {
-      if (finished)
-        return;
-      if (isTTY) {
-        const t = now();
-        if (t - lastRenderAt < 80)
-          return;
-        lastRenderAt = t;
-        const pct = total > 0 ? Math.min(99, Math.floor(current / total * 100)) : 0;
-        out.write(`\r\x1B[K${label}: ${pct}% (${formatBytes(current)} / ${formatBytes(total)})`);
-      } else {
-        const pct = total > 0 ? Math.min(99, Math.floor(current / total * 100)) : 0;
-        const bucket = Math.floor(pct / 10);
-        if (bucket === lastBucket)
-          return;
-        lastBucket = bucket;
-        out.write(`${label}: ${pct}% (${formatBytes(current)} / ${formatBytes(total)})
-`);
-      }
-    },
     tick(bytes) {
       if (finished)
         return;
@@ -585,7 +546,7 @@ function toTarget(last) {
 // package.json
 var package_default = {
   name: "@opencode-manager/ocm-cli",
-  version: "0.1.3",
+  version: "0.1.4",
   description: "OpenCode Manager CLI: attach a local OpenCode TUI to a Manager-hosted repo.",
   license: "MIT",
   repository: {
@@ -882,14 +843,7 @@ async function cmdPush(args) {
   const api = new ManagerApi(state.managerUrl, token);
   const repos = await fetchRepos(state.managerUrl, token);
   const progress = createProgressReporter("push");
-  const onProgress = (p) => {
-    if (p.phase === "committing")
-      progress.tick(p.bytesSent);
-    else if (p.totalBytes > 0)
-      progress.update(p.bytesSent, p.totalBytes);
-    else
-      progress.tick(p.bytesSent);
-  };
+  const onProgress = (p) => progress.tick(p.bytesSent);
   const remotes = repos.map((r) => ({
     repoId: r.repoId,
     name: r.name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-manager/ocm-cli",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "OpenCode Manager CLI: attach a local OpenCode TUI to a Manager-hosted repo.",
   "license": "MIT",
   "repository": {