@react-grab/opencode 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 = 6567;
 
 // 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 = 6567;
 
 // 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,29 +1,25 @@
 'use strict';
 
-// src/constants.ts
-var DEFAULT_PORT = 6567;
+// ../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 parseServerSentEvent = (eventStringBlock) => {
+var parseSSEEvent = (eventBlock) => {
   let eventType = "";
   let data = "";
-  for (const line of eventStringBlock.split("\n")) {
+  for (const line of eventBlock.split("\n")) {
     if (line.startsWith("event:")) eventType = line.slice(6).trim();
     else if (line.startsWith("data:")) data = line.slice(5).trim();
   }
   return { eventType, data };
 };
-var streamSSE = async function* (stream, signal) {
-  const streamReader = stream.getReader();
-  const textDecoder = new TextDecoder();
-  let textBuffer = "";
+async function* streamSSE(stream, signal) {
+  const reader = stream.getReader();
+  const decoder = new TextDecoder();
+  let buffer = "";
   let aborted = false;
   const onAbort = () => {
     aborted = true;
-    streamReader.cancel().catch(() => {
+    reader.cancel().catch(() => {
     });
   };
   signal.addEventListener("abort", onAbort);
@@ -32,18 +28,16 @@ var streamSSE = async function* (stream, signal) {
       throw new DOMException("Aborted", "AbortError");
     }
     while (true) {
-      const result = await streamReader.read();
+      const result = await reader.read();
       if (aborted || signal.aborted) {
         throw new DOMException("Aborted", "AbortError");
       }
       const { done, value } = result;
-      if (value) textBuffer += textDecoder.decode(value, { stream: true });
-      let boundaryIndex;
-      while ((boundaryIndex = textBuffer.indexOf("\n\n")) !== -1) {
-        const { eventType, data } = parseServerSentEvent(
-          textBuffer.slice(0, boundaryIndex)
-        );
-        textBuffer = textBuffer.slice(boundaryIndex + 2);
+      if (value) buffer += decoder.decode(value, { stream: true });
+      let boundary;
+      while ((boundary = buffer.indexOf("\n\n")) !== -1) {
+        const { eventType, data } = parseSSEEvent(buffer.slice(0, boundary));
+        buffer = buffer.slice(boundary + 2);
         if (eventType === "done") return;
         if (eventType === "error") throw new Error(data || "Agent error");
         if (data) yield data;
@@ -53,12 +47,19 @@ var streamSSE = async function* (stream, signal) {
   } finally {
     signal.removeEventListener("abort", onAbort);
     try {
-      streamReader.releaseLock();
+      reader.releaseLock();
     } catch {
     }
   }
-};
+}
+
+// src/constants.ts
+var DEFAULT_PORT = 6567;
+
+// src/client.ts
+var DEFAULT_SERVER_URL = `http://localhost:${DEFAULT_PORT}`;
 var streamFromServer = async function* (serverUrl, context, signal) {
+  const startTime = Date.now();
   const sessionId = context.sessionId;
   const handleAbort = () => {
     if (sessionId) {
@@ -82,7 +83,37 @@ var streamFromServer = async function* (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 ReactGrabOpencode=(function(exports){'use strict';var m=`http://localhost:${6567}`,E="react-grab:agent-sessions",y=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}},O=async function*(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:l,value:g}=i;g&&(r+=n.decode(g,{stream:!0}));let c;for(;(c=r.indexOf(`
+var ReactGrabOpencode=(function(exports){'use strict';var f=5e3,m="react-grab:agent-sessions",y=c=>{let e="",n="";for(let t of c.split(`
+`))t.startsWith("event:")?e=t.slice(6).trim():t.startsWith("data:")&&(n=t.slice(5).trim());return {eventType:e,data:n}};async function*g(c,e){let n=c.getReader(),t=new TextDecoder,r="",o=false,i=()=>{o=true,n.cancel().catch(()=>{});};e.addEventListener("abort",i);try{if(e.aborted)throw new DOMException("Aborted","AbortError");for(;;){let a=await n.read();if(o||e.aborted)throw new DOMException("Aborted","AbortError");let{done:p,value:u}=a;u&&(r+=t.decode(u,{stream:!0}));let d;for(;(d=r.indexOf(`
 
-`))!==-1;){let{eventType:d,data:p}=y(r.slice(0,c));if(r=r.slice(c+2),d==="done")return;if(d==="error")throw new Error(p||"Agent error");p&&(yield p);}if(l)break}}finally{t.removeEventListener("abort",a);try{o.releaseLock();}catch{}}},A=async function*(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*O(e.body,o);}finally{o.removeEventListener("abort",r);}},b=(s={})=>{let{serverUrl:t=m,getOptions:o}=s,n=null,r=e=>({...o?.()??{},...e??{}});return {send:async function*(e,a){let i={...e,options:r(e.options)};yield*A(t,i,a);},resume:async function*(e,a,i){let l=i.getItem(E);if(!l)throw new Error("No sessions to resume");let c=JSON.parse(l)[e];if(!c)throw new Error(`Session ${e} not found`);let d=c.context,p={...d,options:r(d.options)};yield "Resuming...",yield*A(t,p,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}},undo:async()=>{try{await fetch(`${t}/undo`,{method:"POST"});}catch{}}}},S=async()=>{if(typeof window>"u")return;let s=b(),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);};S();exports.attachAgent=S;exports.createOpencodeAgentProvider=b;return exports;})({});
+`))!==-1;){let{eventType:s,data:l}=y(r.slice(0,d));if(r=r.slice(d+2),s==="done")return;if(s==="error")throw new Error(l||"Agent error");l&&(yield l);}if(p)break}}finally{e.removeEventListener("abort",i);try{n.releaseLock();}catch{}}}var E=`http://localhost:${6567}`,A=async function*(c,e,n){let t=Date.now(),r=e.sessionId,o=()=>{r&&fetch(`${c}/abort/${r}`,{method:"POST"}).catch(()=>{});};n.addEventListener("abort",o);try{let i=await fetch(`${c}/agent`,{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify(e),signal:n});if(!i.ok)throw new Error(`Server error: ${i.status}`);if(!i.body)throw new Error("No response body");let a=g(i.body,n)[Symbol.asyncIterator](),p=!1,u=a.next();for(;!p;){let d=await Promise.race([u.then(s=>({type:"status",iteratorResult:s})),new Promise(s=>setTimeout(()=>s({type:"timeout"}),100))]);if(d.type==="timeout")yield `Working\u2026 ${((Date.now()-t)/1e3).toFixed(1)}s`;else {let s=d.iteratorResult;if(p=s.done??!1,!p&&s.value){let l=s.value;l==="Completed successfully"?yield `Completed in ${((Date.now()-t)/1e3).toFixed(1)}s`:yield l,u=a.next();}}}}finally{n.removeEventListener("abort",o);}},O=(c={})=>{let{serverUrl:e=E,getOptions:n}=c,t=null,r=o=>({...n?.()??{},...o??{}});return {send:async function*(o,i){let a={...o,options:r(o.options)};yield*A(e,a,i);},resume:async function*(o,i,a){let p=a.getItem(m);if(!p)throw new Error("No sessions to resume");let d=JSON.parse(p)[o];if(!d)throw new Error(`Session ${o} not found`);let s=d.context,l={...s,options:r(s.options)};yield "Resuming...",yield*A(e,l,i);},supportsResume:true,supportsFollowUp:true,checkConnection:async()=>{let o=Date.now();if(t&&o-t.timestamp<f)return t.result;try{let a=(await fetch(`${e}/health`,{method:"GET"})).ok;return t={result:a,timestamp:o},a}catch{return t={result:false,timestamp:o},false}},undo:async()=>{try{await fetch(`${e}/undo`,{method:"POST"});}catch{}}}},S=async()=>{if(typeof window>"u")return;let c=O(),e=r=>{r.setAgent({provider:c,storage:sessionStorage});},n=window.__REACT_GRAB__;if(n){e(n);return}window.addEventListener("react-grab:init",r=>{e(r.detail);},{once:true});let t=window.__REACT_GRAB__;t&&e(t);};S();
+exports.attachAgent=S;exports.createOpencodeAgentProvider=O;return exports;})({});

package/dist/client.js

@@ -1,27 +1,23 @@
-// src/constants.ts
-var DEFAULT_PORT = 6567;
+// ../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 parseServerSentEvent = (eventStringBlock) => {
+var parseSSEEvent = (eventBlock) => {
   let eventType = "";
   let data = "";
-  for (const line of eventStringBlock.split("\n")) {
+  for (const line of eventBlock.split("\n")) {
     if (line.startsWith("event:")) eventType = line.slice(6).trim();
     else if (line.startsWith("data:")) data = line.slice(5).trim();
   }
   return { eventType, data };
 };
-var streamSSE = async function* (stream, signal) {
-  const streamReader = stream.getReader();
-  const textDecoder = new TextDecoder();
-  let textBuffer = "";
+async function* streamSSE(stream, signal) {
+  const reader = stream.getReader();
+  const decoder = new TextDecoder();
+  let buffer = "";
   let aborted = false;
   const onAbort = () => {
     aborted = true;
-    streamReader.cancel().catch(() => {
+    reader.cancel().catch(() => {
     });
   };
   signal.addEventListener("abort", onAbort);
@@ -30,18 +26,16 @@ var streamSSE = async function* (stream, signal) {
       throw new DOMException("Aborted", "AbortError");
     }
     while (true) {
-      const result = await streamReader.read();
+      const result = await reader.read();
       if (aborted || signal.aborted) {
         throw new DOMException("Aborted", "AbortError");
       }
       const { done, value } = result;
-      if (value) textBuffer += textDecoder.decode(value, { stream: true });
-      let boundaryIndex;
-      while ((boundaryIndex = textBuffer.indexOf("\n\n")) !== -1) {
-        const { eventType, data } = parseServerSentEvent(
-          textBuffer.slice(0, boundaryIndex)
-        );
-        textBuffer = textBuffer.slice(boundaryIndex + 2);
+      if (value) buffer += decoder.decode(value, { stream: true });
+      let boundary;
+      while ((boundary = buffer.indexOf("\n\n")) !== -1) {
+        const { eventType, data } = parseSSEEvent(buffer.slice(0, boundary));
+        buffer = buffer.slice(boundary + 2);
         if (eventType === "done") return;
         if (eventType === "error") throw new Error(data || "Agent error");
         if (data) yield data;
@@ -51,12 +45,19 @@ var streamSSE = async function* (stream, signal) {
   } finally {
     signal.removeEventListener("abort", onAbort);
     try {
-      streamReader.releaseLock();
+      reader.releaseLock();
     } catch {
     }
   }
-};
+}
+
+// src/constants.ts
+var DEFAULT_PORT = 6567;
+
+// src/client.ts
+var DEFAULT_SERVER_URL = `http://localhost:${DEFAULT_PORT}`;
 var streamFromServer = async function* (serverUrl, context, signal) {
+  const startTime = Date.now();
   const sessionId = context.sessionId;
   const handleAbort = () => {
     if (sessionId) {
@@ -80,7 +81,37 @@ var streamFromServer = async function* (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

@@ -951,7 +951,7 @@ var require_picocolors = __commonJS({
 // ../../node_modules/.pnpm/@opencode-ai+sdk@1.0.132/node_modules/@opencode-ai/sdk/dist/gen/core/serverSentEvents.gen.js
 var createSseClient = ({ onSseError, onSseEvent, responseTransformer, responseValidator, sseDefaultRetryDelay, sseMaxRetryAttempts, sseMaxRetryDelay, sseSleepFn, url, ...options }) => {
   let lastEventId;
-  const sleep = sseSleepFn ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+  const sleep2 = sseSleepFn ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
   const createStream = async function* () {
     let retryDelay = sseDefaultRetryDelay ?? 3e3;
     let attempt = 0;
@@ -1046,7 +1046,7 @@ var createSseClient = ({ onSseError, onSseEvent, responseTransformer, responseVa
           break;
         }
         const backoff = Math.min(retryDelay * 2 ** (attempt - 1), sseMaxRetryDelay ?? 3e4);
-        await sleep(backoff);
+        await sleep2(backoff);
       }
     }
   };
@@ -7339,16 +7339,23 @@ var import_picocolors = __toESM(require_picocolors());
 
 // src/constants.ts
 var DEFAULT_PORT = 6567;
-var VERSION = "0.0.81";
+
+// ../utils/dist/server.js
+var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+var VERSION = "0.0.83";
+var OPENCODE_SDK_PORT = 4096;
 var opencodeInstance = null;
 var sessionMap = /* @__PURE__ */ new Map();
 var abortedSessions = /* @__PURE__ */ new Set();
 var lastOpencodeSessionId;
 var getOpencodeClient = async () => {
   if (!opencodeInstance) {
+    await fkill(`:${OPENCODE_SDK_PORT}`, { force: true, silent: true }).catch(() => {
+    });
+    await sleep(100);
     const instance = await createOpencode({
       hostname: "127.0.0.1",
-      port: 4096
+      port: OPENCODE_SDK_PORT
     });
     opencodeInstance = instance;
   }
@@ -7481,6 +7488,7 @@ ${stderr.trim()}` : errorMessage;
 var startServer = async (port = DEFAULT_PORT) => {
   await fkill(`:${port}`, { force: true, silent: true }).catch(() => {
   });
+  await sleep(100);
   const honoApplication = createServer();
   serve({ fetch: honoApplication.fetch, port });
   console.log(`${import_picocolors.default.magenta("\u269B")} ${import_picocolors.default.bold("React Grab")} ${import_picocolors.default.gray(VERSION)} ${import_picocolors.default.dim("(Opencode)")}`);

package/dist/server.js

@@ -940,7 +940,7 @@ var require_picocolors = __commonJS({
 // ../../node_modules/.pnpm/@opencode-ai+sdk@1.0.132/node_modules/@opencode-ai/sdk/dist/gen/core/serverSentEvents.gen.js
 var createSseClient = ({ onSseError, onSseEvent, responseTransformer, responseValidator, sseDefaultRetryDelay, sseMaxRetryAttempts, sseMaxRetryDelay, sseSleepFn, url, ...options }) => {
   let lastEventId;
-  const sleep = sseSleepFn ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
+  const sleep2 = sseSleepFn ?? ((ms) => new Promise((resolve) => setTimeout(resolve, ms)));
   const createStream = async function* () {
     let retryDelay = sseDefaultRetryDelay ?? 3e3;
     let attempt = 0;
@@ -1035,7 +1035,7 @@ var createSseClient = ({ onSseError, onSseEvent, responseTransformer, responseVa
           break;
         }
         const backoff = Math.min(retryDelay * 2 ** (attempt - 1), sseMaxRetryDelay ?? 3e4);
-        await sleep(backoff);
+        await sleep2(backoff);
       }
     }
   };
@@ -7328,16 +7328,23 @@ var import_picocolors = __toESM(require_picocolors());
 
 // src/constants.ts
 var DEFAULT_PORT = 6567;
-var VERSION = "0.0.81";
+
+// ../utils/dist/server.js
+var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+var VERSION = "0.0.83";
+var OPENCODE_SDK_PORT = 4096;
 var opencodeInstance = null;
 var sessionMap = /* @__PURE__ */ new Map();
 var abortedSessions = /* @__PURE__ */ new Set();
 var lastOpencodeSessionId;
 var getOpencodeClient = async () => {
   if (!opencodeInstance) {
+    await fkill(`:${OPENCODE_SDK_PORT}`, { force: true, silent: true }).catch(() => {
+    });
+    await sleep(100);
     const instance = await createOpencode({
       hostname: "127.0.0.1",
-      port: 4096
+      port: OPENCODE_SDK_PORT
     });
     opencodeInstance = instance;
   }
@@ -7470,6 +7477,7 @@ ${stderr.trim()}` : errorMessage;
 var startServer = async (port = DEFAULT_PORT) => {
   await fkill(`:${port}`, { force: true, silent: true }).catch(() => {
   });
+  await sleep(100);
   const honoApplication = createServer();
   serve({ fetch: honoApplication.fetch, port });
   console.log(`${import_picocolors.default.magenta("\u269B")} ${import_picocolors.default.bold("React Grab")} ${import_picocolors.default.gray(VERSION)} ${import_picocolors.default.dim("(Opencode)")}`);

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@react-grab/opencode",
-  "version": "0.0.81",
+  "version": "0.0.83",
   "type": "module",
   "bin": {
-    "react-grab-opencode": "./dist/cli.js"
+    "react-grab-opencode": "./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",
@@ -34,7 +35,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",