@react-grab/gemini 0.0.81 → 0.0.83

package/dist/cli.cjs

@@ -1,10 +1,8 @@
 #!/usr/bin/env node
 'use strict';
 
-var url = require('url');
 var path = require('path');
 
-var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -605,10 +603,8 @@ var import_picocolors = __toESM(require_picocolors());
 var DEFAULT_PORT = 8567;
 
 // src/cli.ts
-var VERSION = "0.0.81";
-var __filename$1 = url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('cli.cjs', document.baseURI).href)));
-var __dirname$1 = path.dirname(__filename$1);
-var serverPath = path.join(__dirname$1, "server.js");
+var VERSION = "0.0.83";
+var serverPath = path.join(__dirname, "server.cjs");
 (0, import_cross_spawn.default)(process.execPath, [serverPath], {
   detached: true,
   stdio: "ignore"

package/dist/cli.js

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
-import { fileURLToPath } from 'url';
-import { dirname, join } from 'path';
+import { join } from 'path';
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -602,10 +601,8 @@ var import_picocolors = __toESM(require_picocolors());
 var DEFAULT_PORT = 8567;
 
 // src/cli.ts
-var VERSION = "0.0.81";
-var __filename = fileURLToPath(import.meta.url);
-var __dirname = dirname(__filename);
-var serverPath = join(__dirname, "server.js");
+var VERSION = "0.0.83";
+var serverPath = join(__dirname, "server.cjs");
 (0, import_cross_spawn.default)(process.execPath, [serverPath], {
   detached: true,
   stdio: "ignore"

package/dist/client.cjs

@@ -1,11 +1,7 @@
 'use strict';
 
-// src/constants.ts
-var DEFAULT_PORT = 8567;
+// ../utils/dist/client.js
 var CONNECTION_CHECK_TTL_MS = 5e3;
-
-// src/client.ts
-var DEFAULT_SERVER_URL = `http://localhost:${DEFAULT_PORT}`;
 var STORAGE_KEY = "react-grab:agent-sessions";
 var parseSSEEvent = (eventBlock) => {
   let eventType = "";
@@ -56,7 +52,14 @@ async function* streamSSE(stream, signal) {
     }
   }
 }
+
+// src/constants.ts
+var DEFAULT_PORT = 8567;
+
+// src/client.ts
+var DEFAULT_SERVER_URL = `http://localhost:${DEFAULT_PORT}`;
 async function* streamFromServer(serverUrl, context, signal) {
+  const startTime = Date.now();
   const sessionId = context.sessionId;
   const handleAbort = () => {
     if (sessionId) {
@@ -80,7 +83,37 @@ async function* streamFromServer(serverUrl, context, signal) {
     if (!response.body) {
       throw new Error("No response body");
     }
-    yield* streamSSE(response.body, signal);
+    const iterator = streamSSE(response.body, signal)[Symbol.asyncIterator]();
+    let done = false;
+    let pendingNext = iterator.next();
+    while (!done) {
+      const result = await Promise.race([
+        pendingNext.then((iteratorResult) => ({
+          type: "status",
+          iteratorResult
+        })),
+        new Promise(
+          (resolve) => setTimeout(() => resolve({ type: "timeout" }), 100)
+        )
+      ]);
+      if (result.type === "timeout") {
+        const elapsedSeconds = (Date.now() - startTime) / 1e3;
+        yield `Working\u2026 ${elapsedSeconds.toFixed(1)}s`;
+      } else {
+        const iteratorResult = result.iteratorResult;
+        done = iteratorResult.done ?? false;
+        if (!done && iteratorResult.value) {
+          const status = iteratorResult.value;
+          if (status === "Completed successfully") {
+            const totalSeconds = ((Date.now() - startTime) / 1e3).toFixed(1);
+            yield `Completed in ${totalSeconds}s`;
+          } else {
+            yield status;
+          }
+          pendingNext = iterator.next();
+        }
+      }
+    }
   } finally {
     signal.removeEventListener("abort", handleAbort);
   }

package/dist/client.global.js

@@ -1,4 +1,5 @@
-var ReactGrabGemini=(function(exports){'use strict';var u=`http://localhost:${8567}`,E="react-grab:agent-sessions",b=s=>{let t="",o="";for(let n of s.split(`
-`))n.startsWith("event:")?t=n.slice(6).trim():n.startsWith("data:")&&(o=n.slice(5).trim());return {eventType:t,data:o}};async function*y(s,t){let o=s.getReader(),n=new TextDecoder,r="",e=false,a=()=>{e=true,o.cancel().catch(()=>{});};t.addEventListener("abort",a);try{if(t.aborted)throw new DOMException("Aborted","AbortError");for(;;){let i=await o.read();if(e||t.aborted)throw new DOMException("Aborted","AbortError");let{done:p,value:m}=i;m&&(r+=n.decode(m,{stream:!0}));let c;for(;(c=r.indexOf(`
+var ReactGrabGemini=(function(exports){'use strict';var u=5e3,f="react-grab:agent-sessions",y=c=>{let t="",o="";for(let n of c.split(`
+`))n.startsWith("event:")?t=n.slice(6).trim():n.startsWith("data:")&&(o=n.slice(5).trim());return {eventType:t,data:o}};async function*g(c,t){let o=c.getReader(),n=new TextDecoder,r="",e=false,i=()=>{e=true,o.cancel().catch(()=>{});};t.addEventListener("abort",i);try{if(t.aborted)throw new DOMException("Aborted","AbortError");for(;;){let a=await o.read();if(e||t.aborted)throw new DOMException("Aborted","AbortError");let{done:l,value:m}=a;m&&(r+=n.decode(m,{stream:!0}));let d;for(;(d=r.indexOf(`
 
-`))!==-1;){let{eventType:d,data:l}=b(r.slice(0,c));if(r=r.slice(c+2),d==="done")return;if(d==="error")throw new Error(l||"Agent error");l&&(yield l);}if(p)break}}finally{t.removeEventListener("abort",a);try{o.releaseLock();}catch{}}}async function*g(s,t,o){let n=t.sessionId,r=()=>{n&&fetch(`${s}/abort/${n}`,{method:"POST"}).catch(()=>{});};o.addEventListener("abort",r);try{let e=await fetch(`${s}/agent`,{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify(t),signal:o});if(!e.ok)throw new Error(`Server error: ${e.status}`);if(!e.body)throw new Error("No response body");yield*y(e.body,o);}finally{o.removeEventListener("abort",r);}}var h=(s={})=>{let{serverUrl:t=u,getOptions:o}=s,n=null,r=e=>({...o?.()??{},...e??{}});return {send:async function*(e,a){let i={...e,options:r(e.options)};yield*g(t,i,a);},resume:async function*(e,a,i){let p=i.getItem(E);if(!p)throw new Error("No sessions to resume");let c=JSON.parse(p)[e];if(!c)throw new Error(`Session ${e} not found`);let d=c.context,l={...d,options:r(d.options)};yield "Resuming...",yield*g(t,l,a);},supportsResume:true,supportsFollowUp:true,checkConnection:async()=>{let e=Date.now();if(n&&e-n.timestamp<5e3)return n.result;try{let i=(await fetch(`${t}/health`,{method:"GET"})).ok;return n={result:i,timestamp:e},i}catch{return n={result:false,timestamp:e},false}},abort:async e=>{try{await fetch(`${t}/abort/${e}`,{method:"POST"});}catch{}}}},w=async()=>{if(typeof window>"u")return;let s=h(),t=r=>{r.setAgent({provider:s,storage:sessionStorage});},o=window.__REACT_GRAB__;if(o){t(o);return}window.addEventListener("react-grab:init",r=>{t(r.detail);},{once:true});let n=window.__REACT_GRAB__;n&&t(n);};w();exports.attachAgent=w;exports.createGeminiAgentProvider=h;return exports;})({});
+`))!==-1;){let{eventType:s,data:p}=y(r.slice(0,d));if(r=r.slice(d+2),s==="done")return;if(s==="error")throw new Error(p||"Agent error");p&&(yield p);}if(l)break}}finally{t.removeEventListener("abort",i);try{o.releaseLock();}catch{}}}var E=`http://localhost:${8567}`;async function*A(c,t,o){let n=Date.now(),r=t.sessionId,e=()=>{r&&fetch(`${c}/abort/${r}`,{method:"POST"}).catch(()=>{});};o.addEventListener("abort",e);try{let i=await fetch(`${c}/agent`,{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify(t),signal:o});if(!i.ok)throw new Error(`Server error: ${i.status}`);if(!i.body)throw new Error("No response body");let a=g(i.body,o)[Symbol.asyncIterator](),l=!1,m=a.next();for(;!l;){let d=await Promise.race([m.then(s=>({type:"status",iteratorResult:s})),new Promise(s=>setTimeout(()=>s({type:"timeout"}),100))]);if(d.type==="timeout")yield `Working\u2026 ${((Date.now()-n)/1e3).toFixed(1)}s`;else {let s=d.iteratorResult;if(l=s.done??!1,!l&&s.value){let p=s.value;p==="Completed successfully"?yield `Completed in ${((Date.now()-n)/1e3).toFixed(1)}s`:yield p,m=a.next();}}}}finally{o.removeEventListener("abort",e);}}var b=(c={})=>{let{serverUrl:t=E,getOptions:o}=c,n=null,r=e=>({...o?.()??{},...e??{}});return {send:async function*(e,i){let a={...e,options:r(e.options)};yield*A(t,a,i);},resume:async function*(e,i,a){let l=a.getItem(f);if(!l)throw new Error("No sessions to resume");let d=JSON.parse(l)[e];if(!d)throw new Error(`Session ${e} not found`);let s=d.context,p={...s,options:r(s.options)};yield "Resuming...",yield*A(t,p,i);},supportsResume:true,supportsFollowUp:true,checkConnection:async()=>{let e=Date.now();if(n&&e-n.timestamp<u)return n.result;try{let a=(await fetch(`${t}/health`,{method:"GET"})).ok;return n={result:a,timestamp:e},a}catch{return n={result:false,timestamp:e},false}},abort:async e=>{try{await fetch(`${t}/abort/${e}`,{method:"POST"});}catch{}}}},h=async()=>{if(typeof window>"u")return;let c=b(),t=r=>{r.setAgent({provider:c,storage:sessionStorage});},o=window.__REACT_GRAB__;if(o){t(o);return}window.addEventListener("react-grab:init",r=>{t(r.detail);},{once:true});let n=window.__REACT_GRAB__;n&&t(n);};h();
+exports.attachAgent=h;exports.createGeminiAgentProvider=b;return exports;})({});

package/dist/client.js

@@ -1,9 +1,5 @@
-// src/constants.ts
-var DEFAULT_PORT = 8567;
+// ../utils/dist/client.js
 var CONNECTION_CHECK_TTL_MS = 5e3;
-
-// src/client.ts
-var DEFAULT_SERVER_URL = `http://localhost:${DEFAULT_PORT}`;
 var STORAGE_KEY = "react-grab:agent-sessions";
 var parseSSEEvent = (eventBlock) => {
   let eventType = "";
@@ -54,7 +50,14 @@ async function* streamSSE(stream, signal) {
     }
   }
 }
+
+// src/constants.ts
+var DEFAULT_PORT = 8567;
+
+// src/client.ts
+var DEFAULT_SERVER_URL = `http://localhost:${DEFAULT_PORT}`;
 async function* streamFromServer(serverUrl, context, signal) {
+  const startTime = Date.now();
   const sessionId = context.sessionId;
   const handleAbort = () => {
     if (sessionId) {
@@ -78,7 +81,37 @@ async function* streamFromServer(serverUrl, context, signal) {
     if (!response.body) {
       throw new Error("No response body");
     }
-    yield* streamSSE(response.body, signal);
+    const iterator = streamSSE(response.body, signal)[Symbol.asyncIterator]();
+    let done = false;
+    let pendingNext = iterator.next();
+    while (!done) {
+      const result = await Promise.race([
+        pendingNext.then((iteratorResult) => ({
+          type: "status",
+          iteratorResult
+        })),
+        new Promise(
+          (resolve) => setTimeout(() => resolve({ type: "timeout" }), 100)
+        )
+      ]);
+      if (result.type === "timeout") {
+        const elapsedSeconds = (Date.now() - startTime) / 1e3;
+        yield `Working\u2026 ${elapsedSeconds.toFixed(1)}s`;
+      } else {
+        const iteratorResult = result.iteratorResult;
+        done = iteratorResult.done ?? false;
+        if (!done && iteratorResult.value) {
+          const status = iteratorResult.value;
+          if (status === "Completed successfully") {
+            const totalSeconds = ((Date.now() - startTime) / 1e3).toFixed(1);
+            yield `Completed in ${totalSeconds}s`;
+          } else {
+            yield status;
+          }
+          pendingNext = iterator.next();
+        }
+      }
+    }
   } finally {
     signal.removeEventListener("abort", handleAbort);
   }

package/dist/server.cjs

@@ -5830,8 +5830,11 @@ var import_picocolors = __toESM(require_picocolors());
 // src/constants.ts
 var DEFAULT_PORT = 8567;
 
+// ../utils/dist/server.js
+var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+
 // src/server.ts
-var VERSION = "0.0.81";
+var VERSION = "0.0.83";
 var geminiSessionMap = /* @__PURE__ */ new Map();
 var activeProcesses = /* @__PURE__ */ new Map();
 var parseStreamLine = (line) => {
@@ -5855,19 +5858,14 @@ var createServer = () => {
 
 ${content}`;
     return streamSSE(context, async (stream2) => {
-      const geminiArgs = [
-        "--prompt",
-        userPrompt,
-        "--output-format",
-        "stream-json",
-        "--yolo"
-      ];
+      const geminiArgs = ["--output-format", "stream-json", "--yolo"];
       if (options?.model) {
         geminiArgs.push("--model", options.model);
       }
       if (options?.includeDirectories) {
         geminiArgs.push("--include-directories", options.includeDirectories);
       }
+      geminiArgs.push(userPrompt);
       let geminiProcess;
       let stderrBuffer = "";
       try {
@@ -6012,6 +6010,7 @@ ${stderrContent}` : errorMessage;
 var startServer = async (port = DEFAULT_PORT) => {
   await fkill(`:${port}`, { force: true, silent: true }).catch(() => {
   });
+  await sleep(100);
   const app = createServer();
   serve({ fetch: app.fetch, port });
   console.log(`${import_picocolors.default.magenta("\u269B")} ${import_picocolors.default.bold("React Grab")} ${import_picocolors.default.gray(VERSION)} ${import_picocolors.default.dim("(Gemini)")}`);

package/dist/server.js

@@ -5819,8 +5819,11 @@ var import_picocolors = __toESM(require_picocolors());
 // src/constants.ts
 var DEFAULT_PORT = 8567;
 
+// ../utils/dist/server.js
+var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+
 // src/server.ts
-var VERSION = "0.0.81";
+var VERSION = "0.0.83";
 var geminiSessionMap = /* @__PURE__ */ new Map();
 var activeProcesses = /* @__PURE__ */ new Map();
 var parseStreamLine = (line) => {
@@ -5844,19 +5847,14 @@ var createServer = () => {
 
 ${content}`;
     return streamSSE(context, async (stream2) => {
-      const geminiArgs = [
-        "--prompt",
-        userPrompt,
-        "--output-format",
-        "stream-json",
-        "--yolo"
-      ];
+      const geminiArgs = ["--output-format", "stream-json", "--yolo"];
       if (options?.model) {
         geminiArgs.push("--model", options.model);
       }
       if (options?.includeDirectories) {
         geminiArgs.push("--include-directories", options.includeDirectories);
       }
+      geminiArgs.push(userPrompt);
       let geminiProcess;
       let stderrBuffer = "";
       try {
@@ -6001,6 +5999,7 @@ ${stderrContent}` : errorMessage;
 var startServer = async (port = DEFAULT_PORT) => {
   await fkill(`:${port}`, { force: true, silent: true }).catch(() => {
   });
+  await sleep(100);
   const app = createServer();
   serve({ fetch: app.fetch, port });
   console.log(`${import_picocolors.default.magenta("\u269B")} ${import_picocolors.default.bold("React Grab")} ${import_picocolors.default.gray(VERSION)} ${import_picocolors.default.dim("(Gemini)")}`);

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@react-grab/gemini",
-  "version": "0.0.81",
+  "version": "0.0.83",
   "type": "module",
   "bin": {
-    "react-grab-gemini": "./dist/cli.js"
+    "react-grab-gemini": "./dist/cli.cjs"
   },
   "exports": {
     "./client": {
@@ -25,7 +25,8 @@
   ],
   "devDependencies": {
     "@types/cross-spawn": "^6.0.6",
-    "tsup": "^8.4.0"
+    "tsup": "^8.4.0",
+    "@react-grab/utils": "0.0.83"
   },
   "dependencies": {
     "@hono/node-server": "^1.19.6",
@@ -33,7 +34,7 @@
     "fkill": "^9.0.0",
     "hono": "^4.0.0",
     "picocolors": "^1.1.1",
-    "react-grab": "0.0.81"
+    "react-grab": "0.0.83"
   },
   "scripts": {
     "dev": "tsup --watch",