bitpull 0.1.10 → 0.1.13

package/bitpull.cjs

@@ -18444,6 +18444,55 @@ function sandboxArgs(sb, name, workdir, spec) {
     ...spec.command
   ];
 }
+function dockerCreateArgs(sb, name, volume, spec) {
+  const args = sandboxArgs(sb, name, "HOST", spec);
+  const v = args.indexOf("-v");
+  args.splice(v, 2, "-v", `${volume}:/work:rw`);
+  args.splice(0, 2, "create");
+  return args;
+}
+var usesVolumes = (sb) => sb.cli === "docker";
+function tarArchive(entries) {
+  const blocks = [];
+  const octal = (n, len) => n.toString(8).padStart(len - 1, "0") + "\0";
+  for (const e of entries) {
+    const isDir = e.data === void 0;
+    const full = isDir && !e.path.endsWith("/") ? `${e.path}/` : e.path;
+    let name = full;
+    let prefix = "";
+    if (Buffer.byteLength(full) > 100) {
+      const cut = [...full.matchAll(/\//g)].map((m) => m.index).find((i) => i <= 155 && Buffer.byteLength(full.slice(i + 1)) <= 100);
+      if (cut === void 0) throw new Error(`path too long: ${e.path}`);
+      prefix = full.slice(0, cut);
+      name = full.slice(cut + 1);
+    }
+    const h = Buffer.alloc(512);
+    h.write(name, 0, 100);
+    h.write(octal(isDir ? 511 : 438, 8), 100);
+    h.write(octal(65534, 8), 108);
+    h.write(octal(65534, 8), 116);
+    h.write(octal(isDir ? 0 : e.data.length, 12), 124);
+    h.write(octal(Math.floor(Date.now() / 1e3), 12), 136);
+    h.write("        ", 148);
+    h.write(isDir ? "5" : "0", 156);
+    h.write("ustar\0", 257);
+    h.write("00", 263);
+    h.write("nobody", 265);
+    h.write("nobody", 297);
+    h.write(prefix, 345, 155);
+    let sum = 0;
+    for (const b of h) sum += b;
+    h.write(octal(sum, 7) + " ", 148);
+    blocks.push(h);
+    if (!isDir && e.data.length) {
+      blocks.push(e.data);
+      const pad = (512 - e.data.length % 512) % 512;
+      if (pad) blocks.push(Buffer.alloc(pad));
+    }
+  }
+  blocks.push(Buffer.alloc(1024));
+  return Buffer.concat(blocks);
+}
 function killArgs(sb, name) {
   return sb.runtime === "apple" ? ["kill", name] : ["kill", name];
 }
@@ -18515,7 +18564,8 @@ async function ensureImage(sb, image, timeoutMs = 6e5) {
 }
 var cached2 = null;
 async function selectSandbox(preference = "auto", probe = probeSandbox) {
-  if (cached2 && cached2.preference === preference && Date.now() - cached2.at < 864e5) return cached2;
+  const ttl = cached2?.sandbox ? 864e5 : 5 * 6e4;
+  if (cached2 && cached2.preference === preference && Date.now() - cached2.at < ttl) return cached2;
   const candidates = (await availableRuntimes()).filter((r) => preference === "auto" || r.runtime === preference);
   const tried = [];
   let chosen = null;
@@ -18751,9 +18801,82 @@ async function collectOutputs(dir) {
   return out;
 }
 async function runContainer(spec, sandbox, signal) {
+  return usesVolumes(sandbox) ? runDockerJob(spec, sandbox, signal) : runFolderJob(spec, sandbox, signal);
+}
+function inputFiles(spec) {
+  const files = [];
+  for (const [path, b64] of Object.entries(spec.inputs ?? {})) {
+    const rel = normalizeRepoPath(path);
+    if (!rel || rel.startsWith("out/")) return null;
+    files.push({ path: rel, data: Buffer.from(b64, "base64") });
+  }
+  return files;
+}
+function runWithInput(cmd, args, input) {
+  return new Promise((resolve, reject) => {
+    const child = (0, import_node_child_process5.spawn)(cmd, args, { stdio: ["pipe", "ignore", "pipe"], windowsHide: true });
+    let stderr = "";
+    child.stderr.on("data", (c) => stderr += c.toString("utf8"));
+    child.on("error", reject);
+    child.on("close", (code) => resolve({ code: code ?? -1, stderr }));
+    child.stdin.end(input);
+  });
+}
+async function runDockerJob(spec, sandbox, signal) {
+  const files = inputFiles(spec);
+  if (!files) return { ok: false, usage: {}, error: "bad input path" };
+  const name = `bitpull-${(0, import_node_crypto6.randomBytes)(6).toString("hex")}`;
+  const volume = `${name}-work`;
+  const docker = (args, timeout = 12e4) => exec4("docker", args, { timeout, windowsHide: true });
+  let outDir = null;
+  try {
+    for (const image of [spec.image, PROBE_IMAGE]) {
+      const pulled = await ensureImage(sandbox, image);
+      if (!pulled.ok) return { ok: false, usage: {}, error: `sandbox_error: ${pulled.error}` };
+    }
+    await docker(["volume", "create", volume]);
+    await docker(dockerCreateArgs(sandbox, name, volume, spec));
+    const tar = tarArchive([{ path: "." }, { path: "out" }, ...[...new Set(files.flatMap((f) => f.path.split("/").slice(0, -1).map((_, i, a) => a.slice(0, i + 1).join("/"))))].map((d) => ({ path: d })), ...files]);
+    const copied = await runWithInput("docker", ["cp", "-a", "-", `${name}:/work`], tar);
+    if (copied.code !== 0) return { ok: false, usage: {}, error: `sandbox_error: ${copied.stderr.trim().slice(0, 300)}` };
+    await docker(["run", "--rm", "--network", "none", "--cap-drop", "ALL", "--cap-add", "CHOWN", "--security-opt", "no-new-privileges", "-v", `${volume}:/work`, PROBE_IMAGE, "chown", "65534:65534", "/work"]);
+    const started = Date.now();
+    const stdout = capped();
+    const stderr = capped();
+    const exitCode = await new Promise((resolve, reject) => {
+      const child = (0, import_node_child_process5.spawn)("docker", ["start", "-a", name], { stdio: ["ignore", "pipe", "pipe"], windowsHide: true });
+      child.stdout.on("data", (c) => stdout.push(c));
+      child.stderr.on("data", (c) => stderr.push(c));
+      const kill = () => (0, import_node_child_process5.spawn)("docker", ["kill", name], { stdio: "ignore", windowsHide: true });
+      const timer = setTimeout(kill, spec.timeoutSec * 1e3);
+      signal.addEventListener("abort", kill, { once: true });
+      child.on("error", reject);
+      child.on("close", (code) => {
+        clearTimeout(timer);
+        resolve(code ?? -1);
+      });
+    });
+    const seconds = (Date.now() - started) / 1e3;
+    if (signal.aborted) return { ok: false, usage: { seconds }, error: "stopped_by_owner" };
+    outDir = await (0, import_promises12.mkdtemp)((0, import_node_path10.join)((0, import_node_os6.tmpdir)(), "bitpull-out-"));
+    await docker(["cp", `${name}:/work/out/.`, outDir]).catch(() => void 0);
+    return {
+      ok: true,
+      result: { exitCode, stdout: stdout.text(), stderr: stderr.text(), outputs: await collectOutputs(outDir) },
+      usage: { seconds }
+    };
+  } catch (err) {
+    return { ok: false, usage: {}, error: `sandbox_error: ${String(err.stderr || err.message).trim().slice(0, 300)}` };
+  } finally {
+    await docker(["rm", "-f", name], 6e4).catch(() => void 0);
+    await docker(["volume", "rm", "-f", volume], 6e4).catch(() => void 0);
+    if (outDir) await (0, import_promises12.rm)(outDir, { recursive: true, force: true });
+  }
+}
+async function runFolderJob(spec, sandbox, signal) {
   const workdir = await (0, import_promises12.mkdtemp)((0, import_node_path10.join)((0, import_node_os6.tmpdir)(), "bitpull-job-"));
   const name = `bitpull-${(0, import_node_crypto6.randomBytes)(6).toString("hex")}`;
-  const started = Date.now();
+  let started = Date.now();
   try {
     for (const [path, b64] of Object.entries(spec.inputs ?? {})) {
       const rel = normalizeRepoPath(path);
@@ -18765,7 +18888,8 @@ async function runContainer(spec, sandbox, signal) {
     await (0, import_promises12.chmod)(workdir, 511);
     await (0, import_promises12.chmod)((0, import_node_path10.join)(workdir, "out"), 511);
     const pulled = await ensureImage(sandbox, spec.image);
-    if (!pulled.ok) return { ok: false, usage: { seconds: (Date.now() - started) / 1e3 }, error: `sandbox_error: ${pulled.error}` };
+    if (!pulled.ok) return { ok: false, usage: {}, error: `sandbox_error: ${pulled.error}` };
+    started = Date.now();
     const stdout = capped();
     const stderr = capped();
     const exitCode = await new Promise((resolve, reject) => {
@@ -19131,7 +19255,7 @@ async function doctor(cfg) {
 }
 
 // apps/agent/src/control.ts
-var APP_VERSION = true ? "0.1.10" : "dev";
+var APP_VERSION = true ? "0.1.13" : "dev";
 var UPDATE_MANIFEST = "https://github.com/SamuealPK/bitpull-releases/releases/latest/download/latest.json";
 var inDesktopApp = () => /bitpull-agent(\.exe)?$/i.test(process.execPath);
 function newerVersion(a, b) {
@@ -19273,7 +19397,8 @@ function startControlServer(ctx, node, port = ctx.config.controlPort) {
       const home = ctx.home ?? bitpullHome();
       const status = await (0, import_promises15.readFile)((0, import_node_path12.join)(home, "update-status.json"), "utf8").then((x) => JSON.parse(x)).catch(() => null);
       const latest = await fetch(UPDATE_MANIFEST, { signal: AbortSignal.timeout(8e3) }).then((r) => r.ok ? r.json() : null).then((m) => m?.version ?? null).catch(() => null);
-      return { current: APP_VERSION, latest, available: !!latest && APP_VERSION !== "dev" && newerVersion(latest, APP_VERSION), inApp: inDesktopApp(), status };
+      const shown = latest && APP_VERSION !== "dev" && newerVersion(APP_VERSION, latest) ? APP_VERSION : latest;
+      return { current: APP_VERSION, latest: shown, available: !!latest && APP_VERSION !== "dev" && newerVersion(latest, APP_VERSION), inApp: inDesktopApp(), status };
     },
     /** Asks the desktop app to check for an update and install it now. */
     "POST /api/update": async () => {
@@ -30460,7 +30585,7 @@ async function startNode(ctx, home, opts = {}) {
       busy = false;
     }
   };
-  await tick();
+  void tick();
   const timer = setInterval(tick, opts.heartbeatMs ?? 3e4);
   const worker = startWorker(ctx, { pollMs: opts.workerPollMs, sandbox });
   status.worker = worker.status;
@@ -30550,7 +30675,7 @@ function openBrowser(url) {
   const args = (0, import_node_os10.platform)() === "win32" ? ["/c", "start", "", url] : [url];
   (0, import_node_child_process7.spawn)(cmd, args, { stdio: "ignore", detached: true }).unref();
 }
-var agentVersion = () => true ? "0.1.10" : "dev";
+var agentVersion = () => true ? "0.1.13" : "dev";
 var dashboardUrl = (cfg) => `http://127.0.0.1:${cfg.controlPort}/#token=${cfg.controlToken}`;
 var AppNotRunning = class extends Error {
 };
@@ -30881,7 +31006,7 @@ ${DRAFT_INSTRUCTIONS.replace(/call publish_repo.*/, 'run "bitpull publish <folde
       const control2 = await startControlServer(ctx, node);
       await (0, import_promises21.writeFile)((0, import_node_path18.join)(bitpullHome(), "agent.json"), JSON.stringify({ pid: process.pid, version: agentVersion() }));
       console.log(`BitPull is running. Dashboard: ${dashboardUrl(cfg)}`);
-      console.log(node.status.online ? "Connected to the network." : `Not connected yet: ${node.status.lastError}`);
+      console.log('Connecting to the network in the background (see the dashboard or "bitpull status").');
       const stop = async () => {
         control2.close();
         await node.stop();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bitpull",
-  "version": "0.1.10",
+  "version": "0.1.13",
   "description": "BitPull: share signed, AI-readable code and computing power with AI tools through MCP. CLI and MCP server.",
   "mcpName": "io.github.SamuealPK/bitpull",
   "bin": {