@opencode-manager/ocm-cli 0.1.1 → 0.1.3

package/dist/ocm.js

@@ -95,6 +95,35 @@ function deleteToken(account) {
 }
 
 // src/manager-api.ts
+class ManagerApiError extends Error {
+  status;
+  code;
+  operation;
+  constructor(message, status, code, operation) {
+    super(message);
+    this.status = status;
+    this.code = code;
+    this.operation = operation;
+    this.name = "ManagerApiError";
+  }
+}
+async function formatErrorResponse(res, operation) {
+  const text = await res.text().catch(() => "");
+  let code = null;
+  let detail = text;
+  if (text) {
+    try {
+      const parsed = JSON.parse(text);
+      const errField = typeof parsed.error === "string" ? parsed.error : null;
+      const msgField = typeof parsed.message === "string" ? parsed.message : null;
+      code = errField;
+      detail = msgField ?? errField ?? text;
+    } catch {}
+  }
+  const message = detail ? `${operation} failed (${res.status}): ${detail}` : `${operation} failed (${res.status})`;
+  return new ManagerApiError(message, res.status, code, operation);
+}
+
 class ManagerApi {
   baseUrl;
   token;
@@ -105,49 +134,68 @@ class ManagerApi {
   headers(extra = {}) {
     return { Authorization: `Bearer ${this.token}`, ...extra };
   }
-  async mirrorUp(repoId, body, opts) {
-    const params = new URLSearchParams;
-    if (opts.force)
-      params.set("force", "1");
+  async mirrorBegin(repoId, opts) {
+    const url = `${this.baseUrl}/api/internal/repos/${repoId}/mirror/begin`;
+    const body = { force: opts.force === true };
     if (opts.create) {
-      params.set("create", "1");
-      params.set("name", opts.create.name);
+      body.create = true;
+      body.name = opts.create.name;
       if (opts.create.originUrl)
-        params.set("originUrl", opts.create.originUrl);
+        body.originUrl = opts.create.originUrl;
       if (opts.create.branch)
-        params.set("branch", opts.create.branch);
+        body.branch = opts.create.branch;
     }
-    const qs = params.toString() ? `?${params.toString()}` : "";
-    const url = `${this.baseUrl}/api/internal/repos/${repoId}/mirror${qs}`;
     const res = await fetch(url, {
       method: "POST",
-      headers: {
-        ...this.headers(),
-        "Content-Type": "application/x-tar"
-      },
-      body,
-      duplex: "half"
+      headers: { ...this.headers(), "Content-Type": "application/json" },
+      body: JSON.stringify(body)
+    });
+    if (!res.ok)
+      throw await formatErrorResponse(res, "mirror begin");
+    return await res.json();
+  }
+  async mirrorUploadPart(repoId, uploadId, index, chunk) {
+    const url = `${this.baseUrl}/api/internal/repos/${repoId}/mirror/parts/${uploadId}/${index}`;
+    const ab = chunk.buffer.slice(chunk.byteOffset, chunk.byteOffset + chunk.byteLength);
+    const res = await fetch(url, {
+      method: "PUT",
+      headers: { ...this.headers(), "Content-Type": "application/octet-stream" },
+      body: ab
+    });
+    if (!res.ok)
+      throw await formatErrorResponse(res, `mirror part ${index}`);
+  }
+  async mirrorCommit(repoId, uploadId, totalParts) {
+    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 })
     });
     if (!res.ok)
-      throw new Error(`mirror ${res.status}: ${await res.text()}`);
+      throw await formatErrorResponse(res, "mirror commit");
     return await res.json();
   }
+  async mirrorAbort(repoId, uploadId) {
+    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`, {
       headers: this.headers()
     });
     if (!res.ok)
-      throw new Error(`mirror ${res.status}: ${await res.text()}`);
+      throw await formatErrorResponse(res, "mirror download");
     return res.body;
   }
 }
 
 // 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
@@ -191,7 +239,9 @@ function urlsEqual(a, b) {
 }
 
 // src/mirror.ts
-var HARDCODED_EXCLUDES = ["node_modules", "dist", ".next", ".venv", "__pycache__", ".turbo"];
+var HARDCODED_EXCLUDES = ["node_modules", "dist", ".next", ".venv", "__pycache__", ".turbo", ".DS_Store", "._*"];
+var PART_RETRIES = 3;
+var PART_BACKOFF_MS = [500, 2000, 8000];
 function getGitignoreExclusions(repoRoot) {
   const res = spawnSync3("git", ["ls-files", "--others", "--ignored", "--exclude-standard", "--directory"], {
     cwd: repoRoot,
@@ -202,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) {
@@ -219,7 +308,70 @@ function prepareMirror(cwd, remotes) {
   const matched = remotes.filter((r) => urlsEqual(localOrigin, r.originUrl));
   return { repoRoot, localOrigin, matched };
 }
+function delay(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function isRetryablePartError(err) {
+  if (err instanceof ManagerApiError) {
+    return err.status >= 500 || err.status === 408 || err.status === 429;
+  }
+  return true;
+}
+async function uploadPartWithRetry(api, repoId, uploadId, index, chunk) {
+  let lastError;
+  for (let attempt = 0;attempt < PART_RETRIES; attempt++) {
+    try {
+      await api.mirrorUploadPart(repoId, uploadId, index, chunk);
+      return;
+    } catch (err) {
+      lastError = err;
+      if (!isRetryablePartError(err))
+        break;
+      if (attempt < PART_RETRIES - 1) {
+        await delay(PART_BACKOFF_MS[attempt]);
+      }
+    }
+  }
+  throw lastError instanceof Error ? lastError : new Error(`part ${index} failed: ${String(lastError)}`);
+}
+function createPartFlusher(api, repoId, uploadId, chunkSize) {
+  let acc = [];
+  let accLen = 0;
+  let index = 0;
+  const flush = async () => {
+    if (accLen === 0)
+      return;
+    const buf = Buffer.concat(acc, accLen);
+    acc = [];
+    accLen = 0;
+    await uploadPartWithRetry(api, repoId, uploadId, index, buf);
+    index += 1;
+  };
+  return {
+    async push(buf) {
+      let offset = 0;
+      while (offset < buf.length) {
+        const room = chunkSize - accLen;
+        const take = Math.min(room, buf.length - offset);
+        acc.push(buf.subarray(offset, offset + take));
+        accLen += take;
+        offset += take;
+        if (accLen >= chunkSize) {
+          await flush();
+        }
+      }
+    },
+    async finish() {
+      await flush();
+      return index;
+    }
+  };
+}
 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);
@@ -232,7 +384,10 @@ async function mirrorUp(plan, opts) {
     tarArgs.push("--exclude-from", excludeFile);
   }
   tarArgs.push(".");
-  const child = spawn("tar", tarArgs, { stdio: ["pipe", "pipe", "pipe"] });
+  const child = spawn("tar", tarArgs, {
+    stdio: ["pipe", "pipe", "pipe"],
+    env: { ...process.env, COPYFILE_DISABLE: "1" }
+  });
   const stderrChunks = [];
   child.stderr.on("data", (chunk) => stderrChunks.push(chunk));
   const tarExit = new Promise((resolve, reject) => {
@@ -246,17 +401,23 @@ async function mirrorUp(plan, opts) {
     });
     child.on("error", reject);
   });
-  const body = Readable.toWeb(child.stdout);
-  const repoId = opts.create ? 0 : plan.matched[0].repoId;
+  const flusher = createPartFlusher(opts.api, begin.repoId, begin.uploadId, begin.chunkSize);
   try {
-    const [result] = await Promise.all([
-      opts.api.mirrorUp(repoId, body, {
-        force: opts.force,
-        create: opts.create
-      }),
-      tarExit
-    ]);
+    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) {
+    if (!child.killed)
+      child.kill("SIGKILL");
+    await opts.api.mirrorAbort(begin.repoId, begin.uploadId);
+    throw err;
   } finally {
     if (excludeFile) {
       await fsp.rm(excludeFile, { force: true }).catch(() => {});
@@ -286,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()}`;
@@ -301,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) {
@@ -317,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);
@@ -347,7 +585,7 @@ function toTarget(last) {
 // package.json
 var package_default = {
   name: "@opencode-manager/ocm-cli",
-  version: "0.1.1",
+  version: "0.1.3",
   description: "OpenCode Manager CLI: attach a local OpenCode TUI to a Manager-hosted repo.",
   license: "MIT",
   repository: {
@@ -643,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,
@@ -672,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(", ");
@@ -707,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.1",
+  "version": "0.1.3",
   "description": "OpenCode Manager CLI: attach a local OpenCode TUI to a Manager-hosted repo.",
   "license": "MIT",
   "repository": {