@opencode-manager/ocm-cli 0.1.2 → 0.1.3

package/dist/ocm.js

@@ -192,10 +192,10 @@ class ManagerApi {
 
 // src/mirror.ts
 import { spawnSync as spawnSync3, spawn } from "child_process";
-import { existsSync as existsSync2 } from "fs";
+import { existsSync as existsSync2, statSync } 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
@@ -252,6 +252,45 @@ 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(() => {});
+  }
+}
+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) {
@@ -331,6 +370,8 @@ 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];
   for (const dir of HARDCODED_EXCLUDES)
     tarArgs.push("--exclude", dir);
@@ -364,9 +405,12 @@ async function mirrorUp(plan, opts) {
   try {
     for await (const chunk of child.stdout) {
       await flusher.push(chunk);
+      bytesSent += chunk.length;
+      opts.onProgress?.({ phase: "uploading", bytesSent, totalBytes });
     }
     await tarExit;
     const totalParts = await flusher.finish();
+    opts.onProgress?.({ phase: "committing", bytesSent, totalBytes });
     const result = await opts.api.mirrorCommit(begin.repoId, begin.uploadId, totalParts);
     return result;
   } catch (err) {
@@ -403,6 +447,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 +467,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 +484,77 @@ 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 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;
+      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 +585,7 @@ function toTarget(last) {
 // package.json
 var package_default = {
   name: "@opencode-manager/ocm-cli",
-  version: "0.1.2",
+  version: "0.1.3",
   description: "OpenCode Manager CLI: attach a local OpenCode TUI to a Manager-hosted repo.",
   license: "MIT",
   repository: {
@@ -760,6 +881,15 @@ 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) => {
+    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 remotes = repos.map((r) => ({
     repoId: r.repoId,
     name: r.name,
@@ -789,11 +919,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 +957,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.3",
   "description": "OpenCode Manager CLI: attach a local OpenCode TUI to a Manager-hosted repo.",
   "license": "MIT",
   "repository": {