@react-grab/opencode 0.0.88 → 0.0.90

package/dist/cli.cjs

@@ -7138,7 +7138,7 @@ var import_picocolors = __toESM(require_picocolors());
 var DEFAULT_PORT = 6567;
 
 // src/cli.ts
-var VERSION = "0.0.88";
+var VERSION = "0.0.90";
 var serverPath = path2.join(__dirname, "server.cjs");
 execa(process.execPath, [serverPath], {
   detached: true,

package/dist/cli.js

@@ -7130,7 +7130,7 @@ var import_picocolors = __toESM(require_picocolors());
 var DEFAULT_PORT = 6567;
 
 // src/cli.ts
-var VERSION = "0.0.88";
+var VERSION = "0.0.90";
 var serverPath = join(__dirname, "server.cjs");
 execa(process.execPath, [serverPath], {
   detached: true,

package/dist/client.cjs

@@ -12,7 +12,7 @@ var parseSSEEvent = (eventBlock) => {
   }
   return { eventType, data };
 };
-async function* streamSSE(stream, signal) {
+var streamSSE = async function* (stream, signal) {
   const reader = stream.getReader();
   const decoder = new TextDecoder();
   let buffer = "";
@@ -51,28 +51,54 @@ async function* streamSSE(stream, signal) {
     } catch {
     }
   }
-}
-
-// src/constants.ts
-var DEFAULT_PORT = 6567;
-var COMPLETED_STATUS = "Completed successfully";
-
-// src/client.ts
-var DEFAULT_SERVER_URL = `http://localhost:${DEFAULT_PORT}`;
-var streamFromServer = async function* (serverUrl, context, signal) {
+};
+var isRecord = (value) => typeof value === "object" && value !== null;
+var getStoredAgentContext = (storage, sessionId, storageKey = STORAGE_KEY) => {
+  const rawSessions = storage.getItem(storageKey);
+  if (!rawSessions) throw new Error("No sessions to resume");
+  let parsed;
+  try {
+    parsed = JSON.parse(rawSessions);
+  } catch {
+    throw new Error("Failed to parse stored sessions");
+  }
+  if (!isRecord(parsed)) throw new Error("Invalid stored sessions");
+  const storedSession = parsed[sessionId];
+  if (!isRecord(storedSession)) {
+    throw new Error(`Session ${sessionId} not found`);
+  }
+  const context = storedSession.context;
+  if (!isRecord(context)) throw new Error(`Session ${sessionId} is invalid`);
+  const content = context.content;
+  const prompt = context.prompt;
+  if (typeof content !== "string" || typeof prompt !== "string") {
+    throw new Error(`Session ${sessionId} is invalid`);
+  }
+  const options = context.options;
+  const storedSessionId = context.sessionId;
+  return {
+    content,
+    prompt,
+    options,
+    sessionId: typeof storedSessionId === "string" ? storedSessionId : void 0
+  };
+};
+var streamAgentStatusFromServer = async function* (options, context, signal) {
   const startTime = Date.now();
   const sessionId = context.sessionId;
+  const pollIntervalMs = options.pollIntervalMs ?? 100;
+  const agentUrl = `${options.serverUrl}${options.agentPath ?? "/agent"}`;
   const handleAbort = () => {
-    if (sessionId) {
-      fetch(`${serverUrl}/abort/${sessionId}`, { method: "POST" }).catch(
-        () => {
-        }
-      );
-    }
+    if (!sessionId) return;
+    const abortPath = options.abortPath?.(sessionId) ?? `/abort/${sessionId}`;
+    fetch(`${options.serverUrl}${abortPath}`, { method: "POST" }).catch(
+      () => {
+      }
+    );
   };
   signal.addEventListener("abort", handleAbort);
   try {
-    const response = await fetch(`${serverUrl}/agent`, {
+    const response = await fetch(agentUrl, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify(context),
@@ -85,29 +111,29 @@ var streamFromServer = async function* (serverUrl, context, signal) {
       throw new Error("No response body");
     }
     const iterator = streamSSE(response.body, signal)[Symbol.asyncIterator]();
-    let done = false;
+    let isDone = false;
     let pendingNext = iterator.next();
     let lastStatus = null;
-    while (!done) {
+    while (!isDone) {
       const result = await Promise.race([
         pendingNext.then((iteratorResult) => ({
           type: "status",
           iteratorResult
         })),
         new Promise(
-          (resolve) => setTimeout(() => resolve({ type: "timeout" }), 100)
+          (resolve) => setTimeout(() => resolve({ type: "timeout" }), pollIntervalMs)
         )
       ]);
       const elapsedSeconds = (Date.now() - startTime) / 1e3;
       if (result.type === "status") {
         const iteratorResult = result.iteratorResult;
-        done = iteratorResult.done ?? false;
-        if (!done && iteratorResult.value) {
+        isDone = iteratorResult.done ?? false;
+        if (!isDone && iteratorResult.value) {
           lastStatus = iteratorResult.value;
           pendingNext = iterator.next();
         }
       }
-      if (lastStatus === COMPLETED_STATUS) {
+      if (lastStatus === options.completedStatus) {
         yield `Completed in ${elapsedSeconds.toFixed(1)}s`;
       } else if (lastStatus) {
         yield `${lastStatus} ${elapsedSeconds.toFixed(1)}s`;
@@ -119,56 +145,73 @@ var streamFromServer = async function* (serverUrl, context, signal) {
     signal.removeEventListener("abort", handleAbort);
   }
 };
+var createCachedConnectionChecker = (checkConnection, ttlMs = CONNECTION_CHECK_TTL_MS) => {
+  let cache = null;
+  return async () => {
+    const now = Date.now();
+    if (cache && now - cache.timestamp < ttlMs) return cache.result;
+    try {
+      const result = await checkConnection();
+      cache = { result, timestamp: now };
+      return result;
+    } catch {
+      cache = { result: false, timestamp: now };
+      return false;
+    }
+  };
+};
+
+// src/constants.ts
+var DEFAULT_PORT = 6567;
+var COMPLETED_STATUS = "Completed successfully";
+
+// src/client.ts
+var DEFAULT_SERVER_URL = `http://localhost:${DEFAULT_PORT}`;
+var isReactGrabApi = (value) => typeof value === "object" && value !== null && "setAgent" in value;
 var createOpenCodeAgentProvider = (options = {}) => {
   const { serverUrl = DEFAULT_SERVER_URL, getOptions } = options;
-  let connectionCache = null;
   const mergeOptions = (contextOptions) => ({
     ...getOptions?.() ?? {},
     ...contextOptions ?? {}
   });
+  const checkConnection = createCachedConnectionChecker(async () => {
+    const response = await fetch(`${serverUrl}/health`, { method: "GET" });
+    return response.ok;
+  }, CONNECTION_CHECK_TTL_MS);
   return {
     send: async function* (context, signal) {
       const combinedContext = {
         ...context,
         options: mergeOptions(context.options)
       };
-      yield* streamFromServer(serverUrl, combinedContext, signal);
+      yield* streamAgentStatusFromServer(
+        { serverUrl, completedStatus: COMPLETED_STATUS },
+        combinedContext,
+        signal
+      );
     },
     resume: async function* (sessionId, signal, storage) {
-      const storedSessions = storage.getItem(STORAGE_KEY);
-      if (!storedSessions) {
-        throw new Error("No sessions to resume");
-      }
-      const parsedSessions = JSON.parse(storedSessions);
-      const session = parsedSessions[sessionId];
-      if (!session) {
-        throw new Error(`Session ${sessionId} not found`);
-      }
-      const context = session.context;
+      const storedContext = getStoredAgentContext(storage, sessionId);
+      const context = {
+        content: storedContext.content,
+        prompt: storedContext.prompt,
+        options: storedContext.options,
+        sessionId: storedContext.sessionId ?? sessionId
+      };
       const combinedContext = {
         ...context,
         options: mergeOptions(context.options)
       };
       yield "Resuming...";
-      yield* streamFromServer(serverUrl, combinedContext, signal);
+      yield* streamAgentStatusFromServer(
+        { serverUrl, completedStatus: COMPLETED_STATUS },
+        combinedContext,
+        signal
+      );
     },
     supportsResume: true,
     supportsFollowUp: true,
-    checkConnection: async () => {
-      const now = Date.now();
-      if (connectionCache && now - connectionCache.timestamp < CONNECTION_CHECK_TTL_MS) {
-        return connectionCache.result;
-      }
-      try {
-        const response = await fetch(`${serverUrl}/health`, { method: "GET" });
-        const result = response.ok;
-        connectionCache = { result, timestamp: now };
-        return result;
-      } catch {
-        connectionCache = { result: false, timestamp: now };
-        return false;
-      }
-    },
+    checkConnection,
     undo: async () => {
       try {
         await fetch(`${serverUrl}/undo`, { method: "POST" });
@@ -180,24 +223,25 @@ var createOpenCodeAgentProvider = (options = {}) => {
 var attachAgent = async () => {
   if (typeof window === "undefined") return;
   const provider = createOpenCodeAgentProvider();
-  const attach = (api2) => {
-    api2.setAgent({ provider, storage: sessionStorage });
+  const attach = (api) => {
+    api.setAgent({ provider, storage: sessionStorage });
   };
-  const api = window.__REACT_GRAB__;
-  if (api) {
-    attach(api);
+  const existingApi = window.__REACT_GRAB__;
+  if (isReactGrabApi(existingApi)) {
+    attach(existingApi);
     return;
   }
   window.addEventListener(
     "react-grab:init",
     (event) => {
-      const customEvent = event;
-      attach(customEvent.detail);
+      if (!(event instanceof CustomEvent)) return;
+      if (!isReactGrabApi(event.detail)) return;
+      attach(event.detail);
     },
     { once: true }
   );
   const apiAfterListener = window.__REACT_GRAB__;
-  if (apiAfterListener) {
+  if (isReactGrabApi(apiAfterListener)) {
     attach(apiAfterListener);
   }
 };

package/dist/client.global.js

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

package/dist/client.js

@@ -10,7 +10,7 @@ var parseSSEEvent = (eventBlock) => {
   }
   return { eventType, data };
 };
-async function* streamSSE(stream, signal) {
+var streamSSE = async function* (stream, signal) {
   const reader = stream.getReader();
   const decoder = new TextDecoder();
   let buffer = "";
@@ -49,28 +49,54 @@ async function* streamSSE(stream, signal) {
     } catch {
     }
   }
-}
-
-// src/constants.ts
-var DEFAULT_PORT = 6567;
-var COMPLETED_STATUS = "Completed successfully";
-
-// src/client.ts
-var DEFAULT_SERVER_URL = `http://localhost:${DEFAULT_PORT}`;
-var streamFromServer = async function* (serverUrl, context, signal) {
+};
+var isRecord = (value) => typeof value === "object" && value !== null;
+var getStoredAgentContext = (storage, sessionId, storageKey = STORAGE_KEY) => {
+  const rawSessions = storage.getItem(storageKey);
+  if (!rawSessions) throw new Error("No sessions to resume");
+  let parsed;
+  try {
+    parsed = JSON.parse(rawSessions);
+  } catch {
+    throw new Error("Failed to parse stored sessions");
+  }
+  if (!isRecord(parsed)) throw new Error("Invalid stored sessions");
+  const storedSession = parsed[sessionId];
+  if (!isRecord(storedSession)) {
+    throw new Error(`Session ${sessionId} not found`);
+  }
+  const context = storedSession.context;
+  if (!isRecord(context)) throw new Error(`Session ${sessionId} is invalid`);
+  const content = context.content;
+  const prompt = context.prompt;
+  if (typeof content !== "string" || typeof prompt !== "string") {
+    throw new Error(`Session ${sessionId} is invalid`);
+  }
+  const options = context.options;
+  const storedSessionId = context.sessionId;
+  return {
+    content,
+    prompt,
+    options,
+    sessionId: typeof storedSessionId === "string" ? storedSessionId : void 0
+  };
+};
+var streamAgentStatusFromServer = async function* (options, context, signal) {
   const startTime = Date.now();
   const sessionId = context.sessionId;
+  const pollIntervalMs = options.pollIntervalMs ?? 100;
+  const agentUrl = `${options.serverUrl}${options.agentPath ?? "/agent"}`;
   const handleAbort = () => {
-    if (sessionId) {
-      fetch(`${serverUrl}/abort/${sessionId}`, { method: "POST" }).catch(
-        () => {
-        }
-      );
-    }
+    if (!sessionId) return;
+    const abortPath = options.abortPath?.(sessionId) ?? `/abort/${sessionId}`;
+    fetch(`${options.serverUrl}${abortPath}`, { method: "POST" }).catch(
+      () => {
+      }
+    );
   };
   signal.addEventListener("abort", handleAbort);
   try {
-    const response = await fetch(`${serverUrl}/agent`, {
+    const response = await fetch(agentUrl, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify(context),
@@ -83,29 +109,29 @@ var streamFromServer = async function* (serverUrl, context, signal) {
       throw new Error("No response body");
     }
     const iterator = streamSSE(response.body, signal)[Symbol.asyncIterator]();
-    let done = false;
+    let isDone = false;
     let pendingNext = iterator.next();
     let lastStatus = null;
-    while (!done) {
+    while (!isDone) {
       const result = await Promise.race([
         pendingNext.then((iteratorResult) => ({
           type: "status",
           iteratorResult
         })),
         new Promise(
-          (resolve) => setTimeout(() => resolve({ type: "timeout" }), 100)
+          (resolve) => setTimeout(() => resolve({ type: "timeout" }), pollIntervalMs)
         )
       ]);
       const elapsedSeconds = (Date.now() - startTime) / 1e3;
       if (result.type === "status") {
         const iteratorResult = result.iteratorResult;
-        done = iteratorResult.done ?? false;
-        if (!done && iteratorResult.value) {
+        isDone = iteratorResult.done ?? false;
+        if (!isDone && iteratorResult.value) {
           lastStatus = iteratorResult.value;
           pendingNext = iterator.next();
         }
       }
-      if (lastStatus === COMPLETED_STATUS) {
+      if (lastStatus === options.completedStatus) {
         yield `Completed in ${elapsedSeconds.toFixed(1)}s`;
       } else if (lastStatus) {
         yield `${lastStatus} ${elapsedSeconds.toFixed(1)}s`;
@@ -117,56 +143,73 @@ var streamFromServer = async function* (serverUrl, context, signal) {
     signal.removeEventListener("abort", handleAbort);
   }
 };
+var createCachedConnectionChecker = (checkConnection, ttlMs = CONNECTION_CHECK_TTL_MS) => {
+  let cache = null;
+  return async () => {
+    const now = Date.now();
+    if (cache && now - cache.timestamp < ttlMs) return cache.result;
+    try {
+      const result = await checkConnection();
+      cache = { result, timestamp: now };
+      return result;
+    } catch {
+      cache = { result: false, timestamp: now };
+      return false;
+    }
+  };
+};
+
+// src/constants.ts
+var DEFAULT_PORT = 6567;
+var COMPLETED_STATUS = "Completed successfully";
+
+// src/client.ts
+var DEFAULT_SERVER_URL = `http://localhost:${DEFAULT_PORT}`;
+var isReactGrabApi = (value) => typeof value === "object" && value !== null && "setAgent" in value;
 var createOpenCodeAgentProvider = (options = {}) => {
   const { serverUrl = DEFAULT_SERVER_URL, getOptions } = options;
-  let connectionCache = null;
   const mergeOptions = (contextOptions) => ({
     ...getOptions?.() ?? {},
     ...contextOptions ?? {}
   });
+  const checkConnection = createCachedConnectionChecker(async () => {
+    const response = await fetch(`${serverUrl}/health`, { method: "GET" });
+    return response.ok;
+  }, CONNECTION_CHECK_TTL_MS);
   return {
     send: async function* (context, signal) {
       const combinedContext = {
         ...context,
         options: mergeOptions(context.options)
       };
-      yield* streamFromServer(serverUrl, combinedContext, signal);
+      yield* streamAgentStatusFromServer(
+        { serverUrl, completedStatus: COMPLETED_STATUS },
+        combinedContext,
+        signal
+      );
     },
     resume: async function* (sessionId, signal, storage) {
-      const storedSessions = storage.getItem(STORAGE_KEY);
-      if (!storedSessions) {
-        throw new Error("No sessions to resume");
-      }
-      const parsedSessions = JSON.parse(storedSessions);
-      const session = parsedSessions[sessionId];
-      if (!session) {
-        throw new Error(`Session ${sessionId} not found`);
-      }
-      const context = session.context;
+      const storedContext = getStoredAgentContext(storage, sessionId);
+      const context = {
+        content: storedContext.content,
+        prompt: storedContext.prompt,
+        options: storedContext.options,
+        sessionId: storedContext.sessionId ?? sessionId
+      };
       const combinedContext = {
         ...context,
         options: mergeOptions(context.options)
       };
       yield "Resuming...";
-      yield* streamFromServer(serverUrl, combinedContext, signal);
+      yield* streamAgentStatusFromServer(
+        { serverUrl, completedStatus: COMPLETED_STATUS },
+        combinedContext,
+        signal
+      );
     },
     supportsResume: true,
     supportsFollowUp: true,
-    checkConnection: async () => {
-      const now = Date.now();
-      if (connectionCache && now - connectionCache.timestamp < CONNECTION_CHECK_TTL_MS) {
-        return connectionCache.result;
-      }
-      try {
-        const response = await fetch(`${serverUrl}/health`, { method: "GET" });
-        const result = response.ok;
-        connectionCache = { result, timestamp: now };
-        return result;
-      } catch {
-        connectionCache = { result: false, timestamp: now };
-        return false;
-      }
-    },
+    checkConnection,
     undo: async () => {
       try {
         await fetch(`${serverUrl}/undo`, { method: "POST" });
@@ -178,24 +221,25 @@ var createOpenCodeAgentProvider = (options = {}) => {
 var attachAgent = async () => {
   if (typeof window === "undefined") return;
   const provider = createOpenCodeAgentProvider();
-  const attach = (api2) => {
-    api2.setAgent({ provider, storage: sessionStorage });
+  const attach = (api) => {
+    api.setAgent({ provider, storage: sessionStorage });
   };
-  const api = window.__REACT_GRAB__;
-  if (api) {
-    attach(api);
+  const existingApi = window.__REACT_GRAB__;
+  if (isReactGrabApi(existingApi)) {
+    attach(existingApi);
     return;
   }
   window.addEventListener(
     "react-grab:init",
     (event) => {
-      const customEvent = event;
-      attach(customEvent.detail);
+      if (!(event instanceof CustomEvent)) return;
+      if (!isReactGrabApi(event.detail)) return;
+      attach(event.detail);
     },
     { once: true }
   );
   const apiAfterListener = window.__REACT_GRAB__;
-  if (apiAfterListener) {
+  if (isReactGrabApi(apiAfterListener)) {
     attach(apiAfterListener);
   }
 };

package/dist/server.cjs

@@ -7343,9 +7343,11 @@ var COMPLETED_STATUS = "Completed successfully";
 
 // ../utils/dist/server.js
 var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-var VERSION = "0.0.88";
+var VERSION = "0.0.90";
 try {
-  fetch(`https://www.react-grab.com/api/version?source=opencode&t=${Date.now()}`).catch(() => {
+  fetch(
+    `https://www.react-grab.com/api/version?source=opencode&t=${Date.now()}`
+  ).catch(() => {
   });
 } catch {
 }
@@ -7412,7 +7414,10 @@ var executeOpenCodePrompt = async (prompt, options, onStatus, reactGrabSessionId
       const part = eventData.properties.part;
       if (part.sessionID !== opencodeSessionId) continue;
       if (part.messageID) {
-        lastMessageInfo = { sessionId: opencodeSessionId, messageId: part.messageID };
+        lastMessageInfo = {
+          sessionId: opencodeSessionId,
+          messageId: part.messageID
+        };
       }
       if (part.type === "text" && part.text) {
         const truncatedText = part.text.length > 100 ? `${part.text.slice(0, 100)}...` : part.text;
@@ -7425,6 +7430,94 @@ var executeOpenCodePrompt = async (prompt, options, onStatus, reactGrabSessionId
   }
   return opencodeSessionId;
 };
+var runAgent = async function* (prompt, options) {
+  const sessionId = options?.sessionId;
+  const signal = { aborted: false };
+  const isAborted = () => {
+    if (options?.signal?.aborted) {
+      signal.aborted = true;
+      return true;
+    }
+    if (sessionId && abortedSessions.has(sessionId)) {
+      signal.aborted = true;
+      return true;
+    }
+    return false;
+  };
+  const messageQueue = [];
+  let resolveWait = null;
+  const enqueueMessage = (message) => {
+    messageQueue.push(message);
+    if (resolveWait) {
+      resolveWait();
+      resolveWait = null;
+    }
+  };
+  try {
+    const executePromise = executeOpenCodePrompt(
+      prompt,
+      options,
+      (text) => {
+        if (!isAborted()) {
+          enqueueMessage({ type: "status", content: text });
+        }
+      },
+      sessionId,
+      signal
+    );
+    let isDone = false;
+    executePromise.then(() => {
+      if (!isAborted()) {
+        enqueueMessage({ type: "status", content: COMPLETED_STATUS });
+        enqueueMessage({ type: "done", content: "" });
+      }
+      isDone = true;
+      if (resolveWait) {
+        resolveWait();
+        resolveWait = null;
+      }
+    }).catch((error) => {
+      if (!isAborted()) {
+        const errorMessage = error instanceof Error ? error.message : "Unknown error";
+        const stderr = error instanceof Error && "stderr" in error ? String(error.stderr) : void 0;
+        const fullError = stderr && stderr.trim() ? `${errorMessage}
+
+stderr:
+${stderr.trim()}` : errorMessage;
+        enqueueMessage({ type: "error", content: fullError });
+        enqueueMessage({ type: "done", content: "" });
+      }
+      isDone = true;
+      if (resolveWait) {
+        resolveWait();
+        resolveWait = null;
+      }
+    });
+    while (true) {
+      if (isAborted()) {
+        return;
+      }
+      if (messageQueue.length > 0) {
+        const message = messageQueue.shift();
+        if (message.type === "done") {
+          yield message;
+          return;
+        }
+        yield message;
+      } else if (isDone) {
+        return;
+      } else {
+        await new Promise((resolve) => {
+          resolveWait = resolve;
+        });
+      }
+    }
+  } finally {
+    if (sessionId) {
+      abortedSessions.delete(sessionId);
+    }
+  }
+};
 var createServer = () => {
   const honoApplication = new Hono2();
   honoApplication.use("*", cors());
@@ -7439,53 +7532,17 @@ Context:
 ${content}
 `;
     return streamSSE(context, async (stream2) => {
-      const signal = { aborted: false };
-      const isAborted = () => {
-        if (sessionId && abortedSessions.has(sessionId)) {
-          signal.aborted = true;
-          return true;
-        }
-        return false;
-      };
-      try {
-        await executeOpenCodePrompt(
-          formattedPrompt,
-          options,
-          (text) => {
-            if (isAborted()) return;
-            stream2.writeSSE({
-              data: text,
-              event: "status"
-            }).catch(() => {
-            });
-          },
-          sessionId,
-          signal
-        );
-        if (!isAborted()) {
+      for await (const message of runAgent(formattedPrompt, {
+        ...options,
+        sessionId
+      })) {
+        if (message.type === "error") {
           await stream2.writeSSE({
-            data: COMPLETED_STATUS,
-            event: "status"
-          });
-          await stream2.writeSSE({ data: "", event: "done" });
-        }
-      } catch (error) {
-        if (!isAborted()) {
-          const errorMessage = error instanceof Error ? error.message : "Unknown error";
-          const stderr = error instanceof Error && "stderr" in error ? String(error.stderr) : void 0;
-          const fullError = stderr && stderr.trim() ? `${errorMessage}
-
-stderr:
-${stderr.trim()}` : errorMessage;
-          await stream2.writeSSE({
-            data: `Error: ${fullError}`,
+            data: `Error: ${message.content}`,
             event: "error"
           });
-          await stream2.writeSSE({ data: "", event: "done" });
-        }
-      } finally {
-        if (sessionId) {
-          abortedSessions.delete(sessionId);
+        } else {
+          await stream2.writeSSE({ data: message.content, event: message.type });
         }
       }
     });
@@ -7532,4 +7589,5 @@ if ((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filen
 }
 
 exports.createServer = createServer;
+exports.runAgent = runAgent;
 exports.startServer = startServer;

package/dist/server.js

@@ -7332,9 +7332,11 @@ var COMPLETED_STATUS = "Completed successfully";
 
 // ../utils/dist/server.js
 var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-var VERSION = "0.0.88";
+var VERSION = "0.0.90";
 try {
-  fetch(`https://www.react-grab.com/api/version?source=opencode&t=${Date.now()}`).catch(() => {
+  fetch(
+    `https://www.react-grab.com/api/version?source=opencode&t=${Date.now()}`
+  ).catch(() => {
   });
 } catch {
 }
@@ -7401,7 +7403,10 @@ var executeOpenCodePrompt = async (prompt, options, onStatus, reactGrabSessionId
       const part = eventData.properties.part;
       if (part.sessionID !== opencodeSessionId) continue;
       if (part.messageID) {
-        lastMessageInfo = { sessionId: opencodeSessionId, messageId: part.messageID };
+        lastMessageInfo = {
+          sessionId: opencodeSessionId,
+          messageId: part.messageID
+        };
       }
       if (part.type === "text" && part.text) {
         const truncatedText = part.text.length > 100 ? `${part.text.slice(0, 100)}...` : part.text;
@@ -7414,6 +7419,94 @@ var executeOpenCodePrompt = async (prompt, options, onStatus, reactGrabSessionId
   }
   return opencodeSessionId;
 };
+var runAgent = async function* (prompt, options) {
+  const sessionId = options?.sessionId;
+  const signal = { aborted: false };
+  const isAborted = () => {
+    if (options?.signal?.aborted) {
+      signal.aborted = true;
+      return true;
+    }
+    if (sessionId && abortedSessions.has(sessionId)) {
+      signal.aborted = true;
+      return true;
+    }
+    return false;
+  };
+  const messageQueue = [];
+  let resolveWait = null;
+  const enqueueMessage = (message) => {
+    messageQueue.push(message);
+    if (resolveWait) {
+      resolveWait();
+      resolveWait = null;
+    }
+  };
+  try {
+    const executePromise = executeOpenCodePrompt(
+      prompt,
+      options,
+      (text) => {
+        if (!isAborted()) {
+          enqueueMessage({ type: "status", content: text });
+        }
+      },
+      sessionId,
+      signal
+    );
+    let isDone = false;
+    executePromise.then(() => {
+      if (!isAborted()) {
+        enqueueMessage({ type: "status", content: COMPLETED_STATUS });
+        enqueueMessage({ type: "done", content: "" });
+      }
+      isDone = true;
+      if (resolveWait) {
+        resolveWait();
+        resolveWait = null;
+      }
+    }).catch((error) => {
+      if (!isAborted()) {
+        const errorMessage = error instanceof Error ? error.message : "Unknown error";
+        const stderr = error instanceof Error && "stderr" in error ? String(error.stderr) : void 0;
+        const fullError = stderr && stderr.trim() ? `${errorMessage}
+
+stderr:
+${stderr.trim()}` : errorMessage;
+        enqueueMessage({ type: "error", content: fullError });
+        enqueueMessage({ type: "done", content: "" });
+      }
+      isDone = true;
+      if (resolveWait) {
+        resolveWait();
+        resolveWait = null;
+      }
+    });
+    while (true) {
+      if (isAborted()) {
+        return;
+      }
+      if (messageQueue.length > 0) {
+        const message = messageQueue.shift();
+        if (message.type === "done") {
+          yield message;
+          return;
+        }
+        yield message;
+      } else if (isDone) {
+        return;
+      } else {
+        await new Promise((resolve) => {
+          resolveWait = resolve;
+        });
+      }
+    }
+  } finally {
+    if (sessionId) {
+      abortedSessions.delete(sessionId);
+    }
+  }
+};
 var createServer = () => {
   const honoApplication = new Hono2();
   honoApplication.use("*", cors());
@@ -7428,53 +7521,17 @@ Context:
 ${content}
 `;
     return streamSSE(context, async (stream2) => {
-      const signal = { aborted: false };
-      const isAborted = () => {
-        if (sessionId && abortedSessions.has(sessionId)) {
-          signal.aborted = true;
-          return true;
-        }
-        return false;
-      };
-      try {
-        await executeOpenCodePrompt(
-          formattedPrompt,
-          options,
-          (text) => {
-            if (isAborted()) return;
-            stream2.writeSSE({
-              data: text,
-              event: "status"
-            }).catch(() => {
-            });
-          },
-          sessionId,
-          signal
-        );
-        if (!isAborted()) {
+      for await (const message of runAgent(formattedPrompt, {
+        ...options,
+        sessionId
+      })) {
+        if (message.type === "error") {
           await stream2.writeSSE({
-            data: COMPLETED_STATUS,
-            event: "status"
-          });
-          await stream2.writeSSE({ data: "", event: "done" });
-        }
-      } catch (error) {
-        if (!isAborted()) {
-          const errorMessage = error instanceof Error ? error.message : "Unknown error";
-          const stderr = error instanceof Error && "stderr" in error ? String(error.stderr) : void 0;
-          const fullError = stderr && stderr.trim() ? `${errorMessage}
-
-stderr:
-${stderr.trim()}` : errorMessage;
-          await stream2.writeSSE({
-            data: `Error: ${fullError}`,
+            data: `Error: ${message.content}`,
             event: "error"
           });
-          await stream2.writeSSE({ data: "", event: "done" });
-        }
-      } finally {
-        if (sessionId) {
-          abortedSessions.delete(sessionId);
+        } else {
+          await stream2.writeSSE({ data: message.content, event: message.type });
         }
       }
     });
@@ -7520,4 +7577,4 @@ if (import.meta.url === pathToFileURL(process.argv[1]).href) {
   startServer(DEFAULT_PORT).catch(console.error);
 }
 
-export { createServer, startServer };
+export { createServer, runAgent, startServer };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-grab/opencode",
-  "version": "0.0.88",
+  "version": "0.0.90",
   "type": "module",
   "bin": {
     "react-grab-opencode": "./dist/cli.cjs"
@@ -26,7 +26,7 @@
   "devDependencies": {
     "@types/node": "^22.10.7",
     "tsup": "^8.4.0",
-    "@react-grab/utils": "0.0.88"
+    "@react-grab/utils": "0.0.90"
   },
   "dependencies": {
     "@hono/node-server": "^1.19.6",
@@ -35,7 +35,7 @@
     "fkill": "^9.0.0",
     "hono": "^4.0.0",
     "picocolors": "^1.1.1",
-    "react-grab": "0.0.88"
+    "react-grab": "0.0.90"
   },
   "scripts": {
     "dev": "tsup --watch",