@react-grab/cursor 0.0.87 → 0.0.89

package/dist/cli.cjs

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

@@ -12129,9 +12129,11 @@ Check that the command is executable: chmod +x $(which ${commandName})`;
 };
 
 // src/server.ts
-var VERSION = "0.0.87";
+var VERSION = "0.0.89";
 try {
-  fetch(`https://www.react-grab.com/api/version?source=cursor&t=${Date.now()}`).catch(() => {
+  fetch(
+    `https://www.react-grab.com/api/version?source=cursor&t=${Date.now()}`
+  ).catch(() => {
   });
 } catch {
 }
@@ -12151,6 +12153,181 @@ var extractTextFromMessage = (message) => {
   if (!message?.content) return "";
   return message.content.filter((block) => block.type === "text").map((block) => block.text).join(" ").trim();
 };
+var runAgent = async function* (prompt, options) {
+  const cursorAgentArgs = [
+    "--print",
+    "--output-format",
+    "stream-json",
+    "--force"
+  ];
+  if (options?.model) {
+    cursorAgentArgs.push("--model", options.model);
+  }
+  const workspacePath = options?.workspace ?? options?.cwd ?? process.env.REACT_GRAB_CWD ?? process.cwd();
+  const cursorChatId = options?.sessionId ? cursorSessionMap.get(options.sessionId) : void 0;
+  if (cursorChatId) {
+    cursorAgentArgs.push("--resume", cursorChatId);
+  }
+  let cursorProcess;
+  let stderrBuffer = "";
+  try {
+    yield { type: "status", content: "Thinking\u2026" };
+    cursorProcess = execa("cursor-agent", cursorAgentArgs, {
+      stdin: "pipe",
+      stdout: "pipe",
+      stderr: "pipe",
+      env: { ...process.env },
+      cwd: workspacePath
+    });
+    if (options?.sessionId) {
+      activeProcesses.set(options.sessionId, cursorProcess);
+    }
+    if (cursorProcess.stderr) {
+      cursorProcess.stderr.on("data", (chunk) => {
+        stderrBuffer += chunk.toString();
+      });
+    }
+    const messageQueue = [];
+    let resolveWait = null;
+    let processEnded = false;
+    let capturedCursorChatId;
+    const enqueueMessage = (message) => {
+      messageQueue.push(message);
+      if (resolveWait) {
+        resolveWait();
+        resolveWait = null;
+      }
+    };
+    const processLine = (line) => {
+      const event = parseStreamLine(line);
+      if (!event) return;
+      if (!capturedCursorChatId && event.session_id) {
+        capturedCursorChatId = event.session_id;
+      }
+      switch (event.type) {
+        case "assistant": {
+          const textContent = extractTextFromMessage(event.message);
+          if (textContent) {
+            enqueueMessage({ type: "status", content: textContent });
+          }
+          break;
+        }
+        case "result":
+          if (event.subtype === "success") {
+            enqueueMessage({ type: "status", content: COMPLETED_STATUS });
+          } else if (event.subtype === "error" || event.is_error) {
+            enqueueMessage({
+              type: "error",
+              content: event.result || "Unknown error"
+            });
+          } else {
+            enqueueMessage({ type: "status", content: "Task finished" });
+          }
+          break;
+      }
+    };
+    let buffer = "";
+    if (cursorProcess.stdout) {
+      cursorProcess.stdout.on("data", (chunk) => {
+        buffer += chunk.toString();
+        let newlineIndex;
+        while ((newlineIndex = buffer.indexOf("\n")) !== -1) {
+          const line = buffer.slice(0, newlineIndex);
+          buffer = buffer.slice(newlineIndex + 1);
+          processLine(line);
+        }
+      });
+    }
+    if (cursorProcess.stdin) {
+      cursorProcess.stdin.write(prompt);
+      cursorProcess.stdin.end();
+    }
+    const childProcess4 = cursorProcess;
+    childProcess4.on("close", (code) => {
+      if (options?.sessionId) {
+        activeProcesses.delete(options.sessionId);
+      }
+      if (buffer.trim()) {
+        processLine(buffer);
+      }
+      if (options?.sessionId && capturedCursorChatId) {
+        cursorSessionMap.set(options.sessionId, capturedCursorChatId);
+      }
+      if (capturedCursorChatId) {
+        lastCursorChatId = capturedCursorChatId;
+      }
+      processEnded = true;
+      if (code !== 0 && !childProcess4.killed) {
+        enqueueMessage({
+          type: "error",
+          content: `cursor-agent exited with code ${code}`
+        });
+      }
+      enqueueMessage({ type: "done", content: "" });
+      if (resolveWait) {
+        resolveWait();
+        resolveWait = null;
+      }
+    });
+    childProcess4.on("error", (error) => {
+      if (options?.sessionId) {
+        activeProcesses.delete(options.sessionId);
+      }
+      processEnded = true;
+      const isNotInstalled = "code" in error && error.code === "ENOENT";
+      if (isNotInstalled) {
+        enqueueMessage({
+          type: "error",
+          content: "cursor-agent is not installed. Please install the Cursor Agent CLI to use this provider.\n\nInstallation: https://cursor.com/docs/cli/overview"
+        });
+      } else {
+        const errorMessage = formatSpawnError(error, "cursor-agent");
+        const stderrContent = stderrBuffer.trim();
+        const fullError = stderrContent ? `${errorMessage}
+
+stderr:
+${stderrContent}` : errorMessage;
+        enqueueMessage({ type: "error", content: fullError });
+      }
+      enqueueMessage({ type: "done", content: "" });
+      if (resolveWait) {
+        resolveWait();
+        resolveWait = null;
+      }
+    });
+    while (true) {
+      if (options?.signal?.aborted) {
+        if (cursorProcess && !cursorProcess.killed) {
+          cursorProcess.kill("SIGTERM");
+        }
+        return;
+      }
+      if (messageQueue.length > 0) {
+        const message = messageQueue.shift();
+        if (message.type === "done") {
+          yield message;
+          return;
+        }
+        yield message;
+      } else if (processEnded) {
+        return;
+      } else {
+        await new Promise((resolve) => {
+          resolveWait = resolve;
+        });
+      }
+    }
+  } catch (error) {
+    const errorMessage = error instanceof Error ? formatSpawnError(error, "cursor-agent") : "Unknown error";
+    const stderrContent = stderrBuffer.trim();
+    const fullError = stderrContent ? `${errorMessage}
+
+stderr:
+${stderrContent}` : errorMessage;
+    yield { type: "error", content: fullError };
+    yield { type: "done", content: "" };
+  }
+};
 var createServer = () => {
   const app = new Hono2();
   app.use("*", cors());
@@ -12163,141 +12340,18 @@ var createServer = () => {
 
 ${content}`;
     return streamSSE(context, async (stream2) => {
-      const cursorAgentArgs = [
-        "--print",
-        "--output-format",
-        "stream-json",
-        "--force"
-      ];
-      if (options?.model) {
-        cursorAgentArgs.push("--model", options.model);
-      }
-      const workspacePath = options?.workspace ?? process.env.REACT_GRAB_CWD ?? process.cwd();
-      if (isFollowUp && cursorChatId) {
-        cursorAgentArgs.push("--resume", cursorChatId);
-      }
-      let cursorProcess;
-      let stderrBuffer = "";
-      try {
-        await stream2.writeSSE({ data: "Thinking\u2026", event: "status" });
-        cursorProcess = execa("cursor-agent", cursorAgentArgs, {
-          stdin: "pipe",
-          stdout: "pipe",
-          stderr: "pipe",
-          env: { ...process.env },
-          cwd: workspacePath
-        });
-        if (sessionId) {
-          activeProcesses.set(sessionId, cursorProcess);
-        }
-        if (cursorProcess.stderr) {
-          cursorProcess.stderr.on("data", (chunk) => {
-            stderrBuffer += chunk.toString();
-          });
-        }
-        let buffer = "";
-        let capturedCursorChatId;
-        const processLine = async (line) => {
-          const event = parseStreamLine(line);
-          if (!event) return;
-          if (!capturedCursorChatId && event.session_id) {
-            capturedCursorChatId = event.session_id;
-          }
-          switch (event.type) {
-            case "assistant": {
-              const textContent = extractTextFromMessage(event.message);
-              if (textContent) {
-                await stream2.writeSSE({ data: textContent, event: "status" });
-              }
-              break;
-            }
-            case "result":
-              if (event.subtype === "success") {
-                await stream2.writeSSE({
-                  data: COMPLETED_STATUS,
-                  event: "status"
-                });
-              } else if (event.subtype === "error" || event.is_error) {
-                await stream2.writeSSE({
-                  data: `Error: ${event.result || "Unknown error"}`,
-                  event: "error"
-                });
-              } else {
-                await stream2.writeSSE({
-                  data: "Task finished",
-                  event: "status"
-                });
-              }
-              break;
-          }
-        };
-        if (cursorProcess.stdout) {
-          cursorProcess.stdout.on("data", async (chunk) => {
-            buffer += chunk.toString();
-            let newlineIndex;
-            while ((newlineIndex = buffer.indexOf("\n")) !== -1) {
-              const line = buffer.slice(0, newlineIndex);
-              buffer = buffer.slice(newlineIndex + 1);
-              await processLine(line);
-            }
-          });
-        }
-        if (cursorProcess.stdin) {
-          cursorProcess.stdin.write(userPrompt);
-          cursorProcess.stdin.end();
-        }
-        if (cursorProcess) {
-          const childProcess4 = cursorProcess;
-          await new Promise((resolve, reject) => {
-            childProcess4.on("close", (code) => {
-              if (sessionId) {
-                activeProcesses.delete(sessionId);
-              }
-              if (code === 0 || childProcess4.killed) {
-                resolve();
-              } else {
-                reject(new Error(`cursor-agent exited with code ${code}`));
-              }
-            });
-            childProcess4.on("error", (error) => {
-              if (sessionId) {
-                activeProcesses.delete(sessionId);
-              }
-              reject(error);
-            });
-          });
-        }
-        if (buffer.trim()) {
-          await processLine(buffer);
-        }
-        if (sessionId && capturedCursorChatId) {
-          cursorSessionMap.set(sessionId, capturedCursorChatId);
-        }
-        if (capturedCursorChatId) {
-          lastCursorChatId = capturedCursorChatId;
-        }
-        await stream2.writeSSE({ data: "", event: "done" });
-      } catch (error) {
-        const isNotInstalled = error instanceof Error && "code" in error && error.code === "ENOENT";
-        if (isNotInstalled) {
+      for await (const message of runAgent(userPrompt, {
+        ...options,
+        sessionId
+      })) {
+        if (message.type === "error") {
           await stream2.writeSSE({
-            data: `Error: cursor-agent is not installed. Please install the Cursor Agent CLI to use this provider.
-
-Installation: https://cursor.com/docs/cli/overview`,
+            data: `Error: ${message.content}`,
             event: "error"
           });
-          return;
+        } else {
+          await stream2.writeSSE({ data: message.content, event: message.type });
         }
-        const errorMessage = error instanceof Error ? formatSpawnError(error, "cursor-agent") : "Unknown error";
-        const stderrContent = stderrBuffer.trim();
-        const fullError = stderrContent ? `${errorMessage}
-
-stderr:
-${stderrContent}` : errorMessage;
-        await stream2.writeSSE({
-          data: `Error: ${fullError}`,
-          event: "error"
-        });
       }
     });
   });
@@ -12363,4 +12417,5 @@ if ((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filen
 }
 
 exports.createServer = createServer;
+exports.runAgent = runAgent;
 exports.startServer = startServer;

package/dist/server.d.cts

@@ -1,7 +1,13 @@
 import * as hono_types from 'hono/types';
 import { Hono } from 'hono';
+import { AgentCoreOptions, AgentMessage } from '@react-grab/utils/server';
 
+interface CursorAgentOptions extends AgentCoreOptions {
+    model?: string;
+    workspace?: string;
+}
+declare const runAgent: (prompt: string, options?: CursorAgentOptions) => AsyncGenerator<AgentMessage>;
 declare const createServer: () => Hono<hono_types.BlankEnv, hono_types.BlankSchema, "/">;
 declare const startServer: (port?: number) => Promise<void>;
 
-export { createServer, startServer };
+export { type CursorAgentOptions, createServer, runAgent, startServer };

package/dist/server.d.ts

@@ -1,7 +1,13 @@
 import * as hono_types from 'hono/types';
 import { Hono } from 'hono';
+import { AgentCoreOptions, AgentMessage } from '@react-grab/utils/server';
 
+interface CursorAgentOptions extends AgentCoreOptions {
+    model?: string;
+    workspace?: string;
+}
+declare const runAgent: (prompt: string, options?: CursorAgentOptions) => AsyncGenerator<AgentMessage>;
 declare const createServer: () => Hono<hono_types.BlankEnv, hono_types.BlankSchema, "/">;
 declare const startServer: (port?: number) => Promise<void>;
 
-export { createServer, startServer };
+export { type CursorAgentOptions, createServer, runAgent, startServer };

package/dist/server.js

@@ -12117,9 +12117,11 @@ Check that the command is executable: chmod +x $(which ${commandName})`;
 };
 
 // src/server.ts
-var VERSION = "0.0.87";
+var VERSION = "0.0.89";
 try {
-  fetch(`https://www.react-grab.com/api/version?source=cursor&t=${Date.now()}`).catch(() => {
+  fetch(
+    `https://www.react-grab.com/api/version?source=cursor&t=${Date.now()}`
+  ).catch(() => {
   });
 } catch {
 }
@@ -12139,6 +12141,181 @@ var extractTextFromMessage = (message) => {
   if (!message?.content) return "";
   return message.content.filter((block) => block.type === "text").map((block) => block.text).join(" ").trim();
 };
+var runAgent = async function* (prompt, options) {
+  const cursorAgentArgs = [
+    "--print",
+    "--output-format",
+    "stream-json",
+    "--force"
+  ];
+  if (options?.model) {
+    cursorAgentArgs.push("--model", options.model);
+  }
+  const workspacePath = options?.workspace ?? options?.cwd ?? process.env.REACT_GRAB_CWD ?? process.cwd();
+  const cursorChatId = options?.sessionId ? cursorSessionMap.get(options.sessionId) : void 0;
+  if (cursorChatId) {
+    cursorAgentArgs.push("--resume", cursorChatId);
+  }
+  let cursorProcess;
+  let stderrBuffer = "";
+  try {
+    yield { type: "status", content: "Thinking\u2026" };
+    cursorProcess = execa("cursor-agent", cursorAgentArgs, {
+      stdin: "pipe",
+      stdout: "pipe",
+      stderr: "pipe",
+      env: { ...process.env },
+      cwd: workspacePath
+    });
+    if (options?.sessionId) {
+      activeProcesses.set(options.sessionId, cursorProcess);
+    }
+    if (cursorProcess.stderr) {
+      cursorProcess.stderr.on("data", (chunk) => {
+        stderrBuffer += chunk.toString();
+      });
+    }
+    const messageQueue = [];
+    let resolveWait = null;
+    let processEnded = false;
+    let capturedCursorChatId;
+    const enqueueMessage = (message) => {
+      messageQueue.push(message);
+      if (resolveWait) {
+        resolveWait();
+        resolveWait = null;
+      }
+    };
+    const processLine = (line) => {
+      const event = parseStreamLine(line);
+      if (!event) return;
+      if (!capturedCursorChatId && event.session_id) {
+        capturedCursorChatId = event.session_id;
+      }
+      switch (event.type) {
+        case "assistant": {
+          const textContent = extractTextFromMessage(event.message);
+          if (textContent) {
+            enqueueMessage({ type: "status", content: textContent });
+          }
+          break;
+        }
+        case "result":
+          if (event.subtype === "success") {
+            enqueueMessage({ type: "status", content: COMPLETED_STATUS });
+          } else if (event.subtype === "error" || event.is_error) {
+            enqueueMessage({
+              type: "error",
+              content: event.result || "Unknown error"
+            });
+          } else {
+            enqueueMessage({ type: "status", content: "Task finished" });
+          }
+          break;
+      }
+    };
+    let buffer = "";
+    if (cursorProcess.stdout) {
+      cursorProcess.stdout.on("data", (chunk) => {
+        buffer += chunk.toString();
+        let newlineIndex;
+        while ((newlineIndex = buffer.indexOf("\n")) !== -1) {
+          const line = buffer.slice(0, newlineIndex);
+          buffer = buffer.slice(newlineIndex + 1);
+          processLine(line);
+        }
+      });
+    }
+    if (cursorProcess.stdin) {
+      cursorProcess.stdin.write(prompt);
+      cursorProcess.stdin.end();
+    }
+    const childProcess4 = cursorProcess;
+    childProcess4.on("close", (code) => {
+      if (options?.sessionId) {
+        activeProcesses.delete(options.sessionId);
+      }
+      if (buffer.trim()) {
+        processLine(buffer);
+      }
+      if (options?.sessionId && capturedCursorChatId) {
+        cursorSessionMap.set(options.sessionId, capturedCursorChatId);
+      }
+      if (capturedCursorChatId) {
+        lastCursorChatId = capturedCursorChatId;
+      }
+      processEnded = true;
+      if (code !== 0 && !childProcess4.killed) {
+        enqueueMessage({
+          type: "error",
+          content: `cursor-agent exited with code ${code}`
+        });
+      }
+      enqueueMessage({ type: "done", content: "" });
+      if (resolveWait) {
+        resolveWait();
+        resolveWait = null;
+      }
+    });
+    childProcess4.on("error", (error) => {
+      if (options?.sessionId) {
+        activeProcesses.delete(options.sessionId);
+      }
+      processEnded = true;
+      const isNotInstalled = "code" in error && error.code === "ENOENT";
+      if (isNotInstalled) {
+        enqueueMessage({
+          type: "error",
+          content: "cursor-agent is not installed. Please install the Cursor Agent CLI to use this provider.\n\nInstallation: https://cursor.com/docs/cli/overview"
+        });
+      } else {
+        const errorMessage = formatSpawnError(error, "cursor-agent");
+        const stderrContent = stderrBuffer.trim();
+        const fullError = stderrContent ? `${errorMessage}
+
+stderr:
+${stderrContent}` : errorMessage;
+        enqueueMessage({ type: "error", content: fullError });
+      }
+      enqueueMessage({ type: "done", content: "" });
+      if (resolveWait) {
+        resolveWait();
+        resolveWait = null;
+      }
+    });
+    while (true) {
+      if (options?.signal?.aborted) {
+        if (cursorProcess && !cursorProcess.killed) {
+          cursorProcess.kill("SIGTERM");
+        }
+        return;
+      }
+      if (messageQueue.length > 0) {
+        const message = messageQueue.shift();
+        if (message.type === "done") {
+          yield message;
+          return;
+        }
+        yield message;
+      } else if (processEnded) {
+        return;
+      } else {
+        await new Promise((resolve) => {
+          resolveWait = resolve;
+        });
+      }
+    }
+  } catch (error) {
+    const errorMessage = error instanceof Error ? formatSpawnError(error, "cursor-agent") : "Unknown error";
+    const stderrContent = stderrBuffer.trim();
+    const fullError = stderrContent ? `${errorMessage}
+
+stderr:
+${stderrContent}` : errorMessage;
+    yield { type: "error", content: fullError };
+    yield { type: "done", content: "" };
+  }
+};
 var createServer = () => {
   const app = new Hono2();
   app.use("*", cors());
@@ -12151,141 +12328,18 @@ var createServer = () => {
 
 ${content}`;
     return streamSSE(context, async (stream2) => {
-      const cursorAgentArgs = [
-        "--print",
-        "--output-format",
-        "stream-json",
-        "--force"
-      ];
-      if (options?.model) {
-        cursorAgentArgs.push("--model", options.model);
-      }
-      const workspacePath = options?.workspace ?? process.env.REACT_GRAB_CWD ?? process.cwd();
-      if (isFollowUp && cursorChatId) {
-        cursorAgentArgs.push("--resume", cursorChatId);
-      }
-      let cursorProcess;
-      let stderrBuffer = "";
-      try {
-        await stream2.writeSSE({ data: "Thinking\u2026", event: "status" });
-        cursorProcess = execa("cursor-agent", cursorAgentArgs, {
-          stdin: "pipe",
-          stdout: "pipe",
-          stderr: "pipe",
-          env: { ...process.env },
-          cwd: workspacePath
-        });
-        if (sessionId) {
-          activeProcesses.set(sessionId, cursorProcess);
-        }
-        if (cursorProcess.stderr) {
-          cursorProcess.stderr.on("data", (chunk) => {
-            stderrBuffer += chunk.toString();
-          });
-        }
-        let buffer = "";
-        let capturedCursorChatId;
-        const processLine = async (line) => {
-          const event = parseStreamLine(line);
-          if (!event) return;
-          if (!capturedCursorChatId && event.session_id) {
-            capturedCursorChatId = event.session_id;
-          }
-          switch (event.type) {
-            case "assistant": {
-              const textContent = extractTextFromMessage(event.message);
-              if (textContent) {
-                await stream2.writeSSE({ data: textContent, event: "status" });
-              }
-              break;
-            }
-            case "result":
-              if (event.subtype === "success") {
-                await stream2.writeSSE({
-                  data: COMPLETED_STATUS,
-                  event: "status"
-                });
-              } else if (event.subtype === "error" || event.is_error) {
-                await stream2.writeSSE({
-                  data: `Error: ${event.result || "Unknown error"}`,
-                  event: "error"
-                });
-              } else {
-                await stream2.writeSSE({
-                  data: "Task finished",
-                  event: "status"
-                });
-              }
-              break;
-          }
-        };
-        if (cursorProcess.stdout) {
-          cursorProcess.stdout.on("data", async (chunk) => {
-            buffer += chunk.toString();
-            let newlineIndex;
-            while ((newlineIndex = buffer.indexOf("\n")) !== -1) {
-              const line = buffer.slice(0, newlineIndex);
-              buffer = buffer.slice(newlineIndex + 1);
-              await processLine(line);
-            }
-          });
-        }
-        if (cursorProcess.stdin) {
-          cursorProcess.stdin.write(userPrompt);
-          cursorProcess.stdin.end();
-        }
-        if (cursorProcess) {
-          const childProcess4 = cursorProcess;
-          await new Promise((resolve, reject) => {
-            childProcess4.on("close", (code) => {
-              if (sessionId) {
-                activeProcesses.delete(sessionId);
-              }
-              if (code === 0 || childProcess4.killed) {
-                resolve();
-              } else {
-                reject(new Error(`cursor-agent exited with code ${code}`));
-              }
-            });
-            childProcess4.on("error", (error) => {
-              if (sessionId) {
-                activeProcesses.delete(sessionId);
-              }
-              reject(error);
-            });
-          });
-        }
-        if (buffer.trim()) {
-          await processLine(buffer);
-        }
-        if (sessionId && capturedCursorChatId) {
-          cursorSessionMap.set(sessionId, capturedCursorChatId);
-        }
-        if (capturedCursorChatId) {
-          lastCursorChatId = capturedCursorChatId;
-        }
-        await stream2.writeSSE({ data: "", event: "done" });
-      } catch (error) {
-        const isNotInstalled = error instanceof Error && "code" in error && error.code === "ENOENT";
-        if (isNotInstalled) {
+      for await (const message of runAgent(userPrompt, {
+        ...options,
+        sessionId
+      })) {
+        if (message.type === "error") {
           await stream2.writeSSE({
-            data: `Error: cursor-agent is not installed. Please install the Cursor Agent CLI to use this provider.
-
-Installation: https://cursor.com/docs/cli/overview`,
+            data: `Error: ${message.content}`,
             event: "error"
           });
-          return;
+        } else {
+          await stream2.writeSSE({ data: message.content, event: message.type });
         }
-        const errorMessage = error instanceof Error ? formatSpawnError(error, "cursor-agent") : "Unknown error";
-        const stderrContent = stderrBuffer.trim();
-        const fullError = stderrContent ? `${errorMessage}
-
-stderr:
-${stderrContent}` : errorMessage;
-        await stream2.writeSSE({
-          data: `Error: ${fullError}`,
-          event: "error"
-        });
       }
     });
   });
@@ -12350,4 +12404,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/cursor",
-  "version": "0.0.87",
+  "version": "0.0.89",
   "type": "module",
   "bin": {
     "react-grab-cursor": "./dist/cli.cjs"
@@ -26,7 +26,7 @@
   "devDependencies": {
     "@types/node": "^22.10.7",
     "tsup": "^8.4.0",
-    "@react-grab/utils": "0.0.87"
+    "@react-grab/utils": "0.0.89"
   },
   "dependencies": {
     "@hono/node-server": "^1.19.6",
@@ -34,7 +34,7 @@
     "fkill": "^9.0.0",
     "hono": "^4.0.0",
     "picocolors": "^1.1.1",
-    "react-grab": "0.0.87"
+    "react-grab": "0.0.89"
   },
   "scripts": {
     "dev": "tsup --watch",