@opencode-manager/ocm-cli 0.1.2 → 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)
@@ -195,7 +196,7 @@ import { spawnSync as spawnSync3, spawn } from "child_process";
 import { existsSync as existsSync2 } from "fs";
 import * as fsp from "fs/promises";
 import { Readable } from "stream";
-import { join as join2 } from "path";
+import { join as join2, dirname as dirname2 } from "path";
 import { tmpdir } from "os";
 
 // src/local-repo.ts
@@ -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,
@@ -252,6 +254,21 @@ function getGitignoreExclusions(repoRoot) {
   return (res.stdout ?? "").split(`
 `).filter((line) => line.length > 0);
 }
+async function carryOverIgnored(fromDir, toDir) {
+  if (!existsSync2(fromDir))
+    return;
+  for (const rel of getGitignoreExclusions(fromDir)) {
+    const clean = rel.replace(/\/+$/, "");
+    if (!clean)
+      continue;
+    const src = join2(fromDir, clean);
+    const dest = join2(toDir, clean);
+    if (!existsSync2(src) || existsSync2(dest))
+      continue;
+    await fsp.mkdir(dirname2(dest), { recursive: true });
+    await fsp.rename(src, dest).catch(() => {});
+  }
+}
 
 class MirrorAbort extends Error {
   constructor(message) {
@@ -331,7 +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 });
+  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);
@@ -364,10 +384,13 @@ async function mirrorUp(plan, opts) {
   try {
     for await (const chunk of child.stdout) {
       await flusher.push(chunk);
+      bytesSent += chunk.length;
+      opts.onProgress?.({ bytesSent });
     }
     await tarExit;
     const totalParts = await flusher.finish();
-    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)
@@ -387,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) => {
@@ -403,6 +429,11 @@ async function mirrorDown(repoId, repoRoot, api, opts = { force: false }) {
       child.on("error", reject);
     });
     const stdinWritable = Readable.fromWeb(tarball);
+    let received = 0;
+    stdinWritable.on("data", (chunk) => {
+      received += chunk.length;
+      opts.onProgress?.(received);
+    });
     stdinWritable.pipe(child.stdin);
     await tarDone;
     const backupDir = `${repoRoot}.ocm-backup-${Date.now()}`;
@@ -418,6 +449,7 @@ async function mirrorDown(repoId, repoRoot, api, opts = { force: false }) {
       for (const entry of stagingEntries) {
         await fsp.rename(join2(staging, entry), join2(repoRoot, entry));
       }
+      await carryOverIgnored(backupDir, repoRoot);
       await fsp.rm(backupDir, { recursive: true, force: true }).catch(() => {});
       await fsp.rm(staging, { recursive: true, force: true }).catch(() => {});
     } catch (swapError) {
@@ -434,6 +466,56 @@ async function mirrorDown(repoId, repoRoot, api, opts = { force: false }) {
   }
 }
 
+// src/progress.ts
+var FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+function formatBytes(bytes) {
+  if (bytes < 1024) {
+    return `${bytes} B`;
+  }
+  if (bytes < 1024 * 1024) {
+    return `${(bytes / 1024).toFixed(1)} KB`;
+  }
+  if (bytes < 1024 * 1024 * 1024) {
+    return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+  }
+  return `${(bytes / (1024 * 1024 * 1024)).toFixed(1)} GB`;
+}
+function createProgressReporter(label, out = process.stderr, now = Date.now) {
+  let finished = false;
+  let lastRenderAt = -Infinity;
+  let lastNonTtyTickAt = -Infinity;
+  let frameIndex = 0;
+  const isTTY = out.isTTY === true;
+  return {
+    tick(bytes) {
+      if (finished)
+        return;
+      const t = now();
+      if (isTTY) {
+        if (t - lastRenderAt < 80)
+          return;
+        lastRenderAt = t;
+        out.write(`\r\x1B[K${label}: ${FRAMES[frameIndex]} ${formatBytes(bytes)}`);
+        frameIndex = (frameIndex + 1) % FRAMES.length;
+      } else {
+        if (t - lastNonTtyTickAt < 1000)
+          return;
+        lastNonTtyTickAt = t;
+        out.write(`${label}: ${formatBytes(bytes)}
+`);
+      }
+    },
+    done() {
+      if (finished)
+        return;
+      finished = true;
+      if (isTTY) {
+        out.write("\r\x1B[K");
+      }
+    }
+  };
+}
+
 // src/resolve-target.ts
 function resolveTarget(input) {
   const repoRoot = getRepoRoot(input.cwd);
@@ -464,7 +546,7 @@ function toTarget(last) {
 // package.json
 var package_default = {
   name: "@opencode-manager/ocm-cli",
-  version: "0.1.2",
+  version: "0.1.4",
   description: "OpenCode Manager CLI: attach a local OpenCode TUI to a Manager-hosted repo.",
   license: "MIT",
   repository: {
@@ -760,6 +842,8 @@ async function cmdPush(args) {
   const token = requireToken(state);
   const api = new ManagerApi(state.managerUrl, token);
   const repos = await fetchRepos(state.managerUrl, token);
+  const progress = createProgressReporter("push");
+  const onProgress = (p) => progress.tick(p.bytesSent);
   const remotes = repos.map((r) => ({
     repoId: r.repoId,
     name: r.name,
@@ -789,11 +873,14 @@ async function cmdPush(args) {
     const result = await mirrorUp(plan, {
       api,
       force,
-      create: { name, originUrl: plan.localOrigin, branch }
+      create: { name, originUrl: plan.localOrigin, branch },
+      onProgress
     });
+    progress.done();
     info(`pushed ${plan.repoRoot} -> ${result.created ? "created" : "updated"} (repoId=${result.repoId}, branch=${result.branch})`);
   } else if (plan.matched.length === 1) {
-    const result = await mirrorUp(plan, { api, force });
+    const result = await mirrorUp(plan, { api, force, onProgress });
+    progress.done();
     info(`pushed ${plan.repoRoot} -> ${plan.matched[0].name} (repoId=${result.repoId}, branch=${result.branch})`);
   } else {
     const names = plan.matched.map((r) => `${r.name} (id=${r.repoId})`).join(", ");
@@ -824,7 +911,12 @@ async function cmdPull(args) {
     const names = plan.matched.map((r) => `${r.name} (id=${r.repoId})`).join(", ");
     die(`multiple Manager repos match origin ${plan.localOrigin}: ${names}; disambiguate with \`ocm pull <repoId>\``);
   }
-  await mirrorDown(plan.matched[0].repoId, plan.repoRoot, api, { force });
+  const progress = createProgressReporter("pull");
+  try {
+    await mirrorDown(plan.matched[0].repoId, plan.repoRoot, api, { force, onProgress: (bytes) => progress.tick(bytes) });
+  } finally {
+    progress.done();
+  }
   info(`pulled ${plan.matched[0].name} -> ${plan.repoRoot}`);
 }
 async function main() {

package/package.json

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