openzoo 0.50.19 → 0.50.21

package/bin/openzoo.js

@@ -89,6 +89,10 @@ const HELP = `openzoo — local x402-paying proxy + MCP server for openzoo.fun
 usage:
   npx openzoo            start the proxy: http://localhost:8402/v1 (keyless) PLUS a
                          public HTTPS url for cloud IDEs (key required, printed at start)
+  npx openzoo bot             Grok Bot.app on the zoo. Starts :8402 + aiserver on
+                              :8443, then launches the app with
+                              CURSOR_API_BASE_URL=https://127.0.0.1:8443
+                              (no sudo, no /etc/hosts). Leave it running.
   npx openzoo cursor [dir]    start proxy+tunnel, write MCP config + every model
                               into the picker, and LAUNCH Cursor on [dir]
                               (defaults to the current directory; ~ works;
@@ -164,6 +168,9 @@ async function main() {
     case 'start':
       await (await import('../lib/proxy.js')).startProxy({ autoTunnel: true });
       break;
+    case 'bot':
+      await (await import('../lib/grokcli.js')).runBot(process.argv.slice(3));
+      break;
     case 'editor':
     case 'cursor':
     case 'vscode':

package/lib/cursorapi.js

@@ -177,6 +177,11 @@ export function encodeForMethod(method, models) {
         return encodeEnsureSandBox(pod);
       } catch { return null; }
     }
+    case 'GetGrokBotSendStatus':
+      // Empty body decodes status=UNSPECIFIED → UI "Failed to send".
+      // ACCEPTED=2 (aiserver.v1.GrokBotSendStatus). echo_entry_id (field 2)
+      // must echo the request's message_id or the overlay never reconciles.
+      return encodeGetGrokBotSendStatus();
     case 'GetPlanInfo': return encodeGetPlanInfo();
     case 'GetMe': return encodeGetMe();
     case 'GetDefaultModel': return encodeGetDefaultModel(models);
@@ -204,10 +209,80 @@ export function encodeForMethod(method, models) {
  * those. This encoder is the redirect; whether the box satisfies the protocol
  * is a separate, unfinished problem — point it at a logging box first.
  */
-export function encodeEnsureSandBox({ region = 'us1', accountId, podId, token, agent, vnc, p1340, p6081 }) {
+/** GetGrokBotSendStatusResponse { status=ACCEPTED, echo_entry_id, accepted_at_ms } */
+export function encodeGetGrokBotSendStatus(echoId = `oz-${Date.now()}`) {
+  return new Buf()
+    .int(1, 2)                 // GROK_BOT_SEND_STATUS_ACCEPTED
+    .str(2, echoId)
+    .int(4, Date.now())
+    .done();
+}
+
+/** Strip Connect-RPC 5-byte envelope if present (flags=0, big-endian length). */
+export function unwrapConnect(buf) {
+  const b = Buffer.isBuffer(buf) ? buf : Buffer.from(buf || []);
+  if (b.length >= 5 && (b[0] === 0 || b[0] === 2)) {
+    const n = b.readUInt32BE(1);
+    if (n > 0 && 5 + n <= b.length) return b.subarray(5, 5 + n);
+  }
+  return b;
+}
+
+/** Bare protobuf → {fieldNumber: string|number}. Enough for GetGrokBotSendStatusRequest
+ *  {1 agent_id, 2 message_id} (measured body=76b = two uuid strings). */
+export function decodeProtoFields(buf) {
+  const b = unwrapConnect(buf);
+  const out = {};
+  let i = 0;
+  while (i < b.length) {
+    let key = 0;
+    let shift = 0;
+    while (i < b.length) {
+      const v = b[i++];
+      key |= (v & 0x7f) << shift;
+      if (!(v & 0x80)) break;
+      shift += 7;
+      if (shift > 28) return out;
+    }
+    const field = key >>> 3;
+    const wire = key & 7;
+    if (wire === 0) {
+      let n = 0;
+      shift = 0;
+      while (i < b.length) {
+        const v = b[i++];
+        n |= (v & 0x7f) << shift;
+        if (!(v & 0x80)) break;
+        shift += 7;
+      }
+      out[field] = n;
+    } else if (wire === 2) {
+      let len = 0;
+      shift = 0;
+      while (i < b.length) {
+        const v = b[i++];
+        len |= (v & 0x7f) << shift;
+        if (!(v & 0x80)) break;
+        shift += 7;
+      }
+      if (i + len > b.length) break;
+      out[field] = b.subarray(i, i + len).toString('utf8');
+      i += len;
+    } else {
+      break;
+    }
+  }
+  return out;
+}
+
+export function encodeEnsureSandBox({ region = 'us1', accountId, podId, token, accessToken, agent, vnc, vncPath, p1340, p6081 }) {
   // per-port URLs — field 6 is the agent (1337), field 7 the VNC desktop
   // (6080), matching the live cursorvm response. RunPod fronts each port at
   // https://<id>-<port>.proxy.runpod.net, so agent !== vnc.
+  // Field 4 = network_token (nto-…); field 11 = agent HTTP bearer. Mixing
+  // them 401s /api/* on the real pod (measured sniff 2026-08-29).
+  const auth = accessToken || token;
+  const vncUrl = vncPath || `${vnc}/vnc.html?network_token=${token}&resume_lower_s=900&resume_upper_s=18000&path=websockify%3Fnetwork_token%3D${token}`;
   return new Buf()
     .str(1, region)
     .str(2, accountId)
@@ -215,11 +290,11 @@ export function encodeEnsureSandBox({ region = 'us1', accountId, podId, token, a
     .str(4, token)
     .str(5, 'local')
     .str(6, agent)
-    .str(7, `${vnc}/vnc.html?network_token=${token}&resume_lower_s=900&resume_upper_s=18000&path=websockify%3Fnetwork_token%3D${token}`)
+    .str(7, vncUrl)
     .str(8, '/workspace/terminals')
     .int(9, 1)
     .str(10, p1340 || agent)
-    .str(11, token)
+    .str(11, auth)
     .str(12, p6081 || vnc)
     .done();
 }