openzoo 0.39.4 → 0.40.0

package/lib/boxes.js

@@ -173,7 +173,39 @@ export async function reapExpired() {
   return { reaped };
 }
 
-export async function spawnBox({ name = 'bot', days = 1, vcpu = 2, walletJson, pubkey } = {}) {
+/**
+ * MACHINE TIERS — a menu, not one size.
+ *
+ * A box that only runs a shell is fine on 2 vCPU, but a grokbot agent that
+ * builds a site, runs a dev server, or compiles wants real muscle — and some
+ * tasks want a GPU. So the orchestrator quotes SEVERAL tiers per timeframe and
+ * the user picks. GPU is a DELIBERATE tier here, never an accident: the guard
+ * below refuses GPU fields on a CPU tier, so a cpu tier can't silently 100x the
+ * bill, while a gpu tier carries them on purpose.
+ *
+ * $/hr are approximate RunPod secure-cloud rates for sizing the quote; the real
+ * charge is whatever RunPod bills. estUsdHr is labelled approximate for that.
+ */
+export const BOX_TIERS = {
+  'cpu-sm':  { label: 'CPU · 2 vCPU',       compute: 'CPU', vcpu: 2, disk: 20,  estUsdHr: 0.06 },
+  'cpu-md':  { label: 'CPU · 4 vCPU',       compute: 'CPU', vcpu: 4, disk: 40,  estUsdHr: 0.12 },
+  'cpu-lg':  { label: 'CPU · 8 vCPU',       compute: 'CPU', vcpu: 8, disk: 60,  estUsdHr: 0.24 },
+  'gpu-4090':{ label: 'GPU · 1× RTX 4090',  compute: 'GPU', gpuTypeIds: ['NVIDIA GeForce RTX 4090'], gpuCount: 1, disk: 60,  estUsdHr: 0.44 },
+  'gpu-a100':{ label: 'GPU · 1× A100 80GB', compute: 'GPU', gpuTypeIds: ['NVIDIA A100 80GB PCIe'],   gpuCount: 1, disk: 80,  estUsdHr: 1.64 },
+};
+export const DEFAULT_TIER = 'cpu-sm';
+
+/** The quote menu the orchestrator shows: every tier priced for `days`. */
+export function quoteTiers(days = 1) {
+  const hrs = ttlHours(days);
+  return Object.entries(BOX_TIERS).map(([key, t]) => ({
+    tier: key, label: t.label, days: Math.round(hrs / 24 * 10) / 10,
+    estUsd: Math.round(t.estUsdHr * hrs * 100) / 100, estUsdHr: t.estUsdHr, gpu: t.compute === 'GPU',
+  }));
+}
+
+export async function spawnBox({ name = 'bot', days = 1, tier = DEFAULT_TIER, walletJson, pubkey } = {}) {
+  const spec = BOX_TIERS[tier] || BOX_TIERS[DEFAULT_TIER];
   const expiresAt = new Date(Date.now() + ttlHours(days) * 3600 * 1000);
   const unix = Math.floor(expiresAt.getTime() / 1000);
   const rand = Math.random().toString(36).slice(2, 6);
@@ -181,19 +213,20 @@ export async function spawnBox({ name = 'bot', days = 1, vcpu = 2, walletJson, p
 
   const body = {
     name: full,
-    computeType: 'CPU',
+    computeType: spec.compute,
     cloudType: 'SECURE',
-    vcpuCount: Math.max(1, Math.min(Number(vcpu) || 2, 4)),
-    cpuFlavorIds: CPU_FLAVORS,
-    cpuFlavorPriority: 'availability',
     imageName: BOX_IMAGE,
-    containerDiskInGb: 20,
+    containerDiskInGb: spec.disk,
     volumeInGb: 10,
     volumeMountPath: '/workspace',
     ports: BOX_PORTS,
     dockerStartCmd: ENTRYPOINT,
+    ...(spec.compute === 'CPU'
+      ? { vcpuCount: spec.vcpu, cpuFlavorIds: CPU_FLAVORS, cpuFlavorPriority: 'availability' }
+      : { gpuCount: spec.gpuCount, gpuTypeIds: spec.gpuTypeIds }),
     env: {
       OPENZOO_BOX: '1',
+      OPENZOO_TIER: tier,
       OPENZOO_EXPIRES_UNIX: String(unix),
       OPENZOO_NO_TUNNEL: '1',           // the runpod proxy already fronts it
       OPENZOO_BIND: '0.0.0.0',          // else the runpod proxy can't reach :8402
@@ -203,13 +236,16 @@ export async function spawnBox({ name = 'bot', days = 1, vcpu = 2, walletJson, p
       OZ_PODAGENT_B64: podAgentB64(),
     },
   };
-  // ENFORCE on the actual payload, not on a literal we just wrote.
+  // GPU ONLY ON A GPU TIER. A cpu tier must never carry GPU fields — that would
+  // be a silent 100x. Enforced on the serialized payload, not a literal.
   const wire = JSON.stringify(body);
-  if (/"gpu(Count|TypeIds)"/.test(wire)) throw new Error('refusing to spawn: GPU fields present');
+  if (spec.compute === 'CPU' && /"gpu(Count|TypeIds)"/.test(wire)) {
+    throw new Error('refusing to spawn: GPU fields on a CPU tier');
+  }
 
   const created = await rp('/pods', { method: 'POST', body: wire });
   if (!created.ok) return { ok: false, error: created.data?.error || `spawn ${created.status}` };
-  return { ok: true, box: serializeBox(created.data), expiresAt: expiresAt.toISOString() };
+  return { ok: true, tier, box: serializeBox(created.data), expiresAt: expiresAt.toISOString() };
 }
 
 /** Poll until the box answers on its proxy — npx has to fetch the shim first. */

package/lib/podagent.mjs

@@ -44,9 +44,12 @@ let probedOnce = false;
  *  us the real schema, which is the whole point. */
 function pushExec(cmd) {
   const id = `oz-${Date.now().toString(36)}`;
-  // Try the most likely shapes the daemon will accept; it will 400/echo the
-  // one it understands, which the capture records.
-  const frame = { frames: [{ kind: 'exec', id, command: cmd, cwd: '/tmp', supervised: true }] };
+  // THE COMMAND FRAME IS kind:"shell", NOT "exec". Decoded from the app bundle:
+  // the daemon's receive-union has kind "shell" (run), "sequence", "abort"; the
+  // proto is {command: scalar, args, cwd, env}. Our first probe used "exec"
+  // (which appears once in the bundle) and the daemon silently ignored it,
+  // sending only pings. "shell" is what it actually runs.
+  const frame = { frames: [{ kind: 'shell', id, command: cmd, cwd: '/tmp', supervised: true }] };
   const payload = `data: ${JSON.stringify(frame)}\n\n`;
   for (const res of execStreams) { try { res.write(payload); } catch { /* dead stream */ } }
   record({ t: new Date().toISOString(), port: 1340, method: 'SSE-PUSH', path: '/local-exec/requests',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openzoo",
-  "version": "0.39.4",
+  "version": "0.40.0",
   "description": "Local x402-paying proxy + MCP server for openzoo.fun — point any OpenAI-compatible harness (Cursor, Claude Code, aider, SDKs) at localhost and it pays per call from a local burner wallet. Solana and Base rails live; Robinhood experimental.",
   "license": "MIT",
   "type": "module",