@react-grab/amp 0.0.88 → 0.0.89

package/dist/cli.cjs

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

package/dist/cli.js

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

@@ -23,9 +23,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.89";
 try {
-  fetch(`https://www.react-grab.com/api/version?source=amp&t=${Date.now()}`).catch(() => {
+  fetch(
+    `https://www.react-grab.com/api/version?source=amp&t=${Date.now()}`
+  ).catch(() => {
   });
 } catch {
 }
@@ -35,6 +37,91 @@ var lastThreadId;
 var extractTextFromContent = (content) => {
   return content.filter((item) => item.type === "text" && item.text).map((item) => item.text).join(" ").trim();
 };
+var runAgent = async function* (prompt, options) {
+  const sessionId = options?.sessionId;
+  const abortController = new AbortController();
+  if (sessionId) {
+    abortControllers.set(sessionId, abortController);
+  }
+  const isAborted = () => {
+    if (options?.signal?.aborted) return true;
+    if (abortController.signal.aborted) return true;
+    return false;
+  };
+  try {
+    yield { type: "status", content: "Thinking\u2026" };
+    const executeOptions = {
+      dangerouslyAllowAll: true
+    };
+    executeOptions.cwd = options?.cwd ?? process.env.REACT_GRAB_CWD ?? process.cwd();
+    const existingThread = sessionId ? threadMap.get(sessionId) : void 0;
+    if (existingThread) {
+      executeOptions.continue = existingThread.threadId;
+    }
+    let capturedThreadId;
+    for await (const message of ampSdk.execute({
+      prompt,
+      options: executeOptions,
+      signal: abortController.signal
+    })) {
+      if (isAborted()) break;
+      switch (message.type) {
+        case "system":
+          if (message.subtype === "init") {
+            const systemMessage = message;
+            if (systemMessage.thread_id) {
+              capturedThreadId = systemMessage.thread_id;
+            }
+            yield { type: "status", content: "Session started..." };
+          }
+          break;
+        case "assistant": {
+          const messageContent = message.message?.content;
+          if (messageContent && Array.isArray(messageContent)) {
+            const toolUse = messageContent.find(
+              (item) => item.type === "tool_use"
+            );
+            if (toolUse && "name" in toolUse) {
+              yield { type: "status", content: `Using ${toolUse.name}...` };
+            } else {
+              const textContent = extractTextFromContent(messageContent);
+              if (textContent && !isAborted()) {
+                yield { type: "status", content: textContent };
+              }
+            }
+          }
+          break;
+        }
+        case "result":
+          if (message.is_error) {
+            yield { type: "error", content: message.error || "Unknown error" };
+          } else {
+            yield { type: "status", content: COMPLETED_STATUS };
+          }
+          break;
+      }
+    }
+    if (sessionId && capturedThreadId && !isAborted()) {
+      threadMap.set(sessionId, { threadId: capturedThreadId });
+    }
+    if (capturedThreadId) {
+      lastThreadId = capturedThreadId;
+    }
+    if (!isAborted()) {
+      yield { type: "done", content: "" };
+    }
+  } catch (error) {
+    if (!isAborted()) {
+      const errorMessage = error instanceof Error ? error.message : "Unknown error";
+      yield { type: "error", content: errorMessage };
+      yield { type: "done", content: "" };
+    }
+  } finally {
+    if (sessionId) {
+      abortControllers.delete(sessionId);
+    }
+  }
+};
 var createServer = () => {
   const honoApplication = new hono.Hono();
   honoApplication.use("*", cors.cors());
@@ -47,99 +134,17 @@ var createServer = () => {
 
 ${content}`;
     return streaming.streamSSE(context, async (stream) => {
-      const abortController = new AbortController();
-      if (sessionId) {
-        abortControllers.set(sessionId, abortController);
-      }
-      const isAborted = () => abortController.signal.aborted;
-      try {
-        await stream.writeSSE({ data: "Thinking\u2026", event: "status" });
-        const executeOptions = {
-          dangerouslyAllowAll: true
-        };
-        executeOptions.cwd = options?.cwd ?? process.env.REACT_GRAB_CWD ?? process.cwd();
-        if (isFollowUp && existingThread) {
-          executeOptions.continue = existingThread.threadId;
-        }
-        let capturedThreadId;
-        for await (const message of ampSdk.execute({
-          prompt: userPrompt,
-          options: executeOptions,
-          signal: abortController.signal
-        })) {
-          if (isAborted()) break;
-          switch (message.type) {
-            case "system":
-              if (message.subtype === "init") {
-                const systemMessage = message;
-                if (systemMessage.thread_id) {
-                  capturedThreadId = systemMessage.thread_id;
-                }
-                await stream.writeSSE({
-                  data: "Session started...",
-                  event: "status"
-                });
-              }
-              break;
-            case "assistant": {
-              const messageContent = message.message?.content;
-              if (messageContent && Array.isArray(messageContent)) {
-                const toolUse = messageContent.find(
-                  (item) => item.type === "tool_use"
-                );
-                if (toolUse && "name" in toolUse) {
-                  await stream.writeSSE({
-                    data: `Using ${toolUse.name}...`,
-                    event: "status"
-                  });
-                } else {
-                  const textContent = extractTextFromContent(messageContent);
-                  if (textContent && !isAborted()) {
-                    await stream.writeSSE({
-                      data: textContent,
-                      event: "status"
-                    });
-                  }
-                }
-              }
-              break;
-            }
-            case "result":
-              if (message.is_error) {
-                await stream.writeSSE({
-                  data: `Error: ${message.error || "Unknown error"}`,
-                  event: "error"
-                });
-              } else {
-                await stream.writeSSE({
-                  data: COMPLETED_STATUS,
-                  event: "status"
-                });
-              }
-              break;
-          }
-        }
-        if (sessionId && capturedThreadId && !isAborted()) {
-          threadMap.set(sessionId, { threadId: capturedThreadId });
-        }
-        if (capturedThreadId) {
-          lastThreadId = capturedThreadId;
-        }
-        if (!isAborted()) {
-          await stream.writeSSE({ data: "", event: "done" });
-        }
-      } catch (error) {
-        if (!isAborted()) {
-          const errorMessage = error instanceof Error ? error.message : "Unknown error";
+      for await (const message of runAgent(userPrompt, {
+        ...options,
+        sessionId
+      })) {
+        if (message.type === "error") {
           await stream.writeSSE({
-            data: `Error: ${errorMessage}`,
+            data: `Error: ${message.content}`,
             event: "error"
           });
-          await stream.writeSSE({ data: "", event: "done" });
-        }
-      } finally {
-        if (sessionId) {
-          abortControllers.delete(sessionId);
+        } else {
+          await stream.writeSSE({ data: message.content, event: message.type });
         }
       }
     });
@@ -194,4 +199,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,10 +1,11 @@
 import * as hono_types from 'hono/types';
 import { Hono } from 'hono';
+import { AgentCoreOptions, AgentMessage } from '@react-grab/utils/server';
 
-interface AmpAgentOptions {
-    cwd?: string;
+interface AmpAgentOptions extends AgentCoreOptions {
 }
+declare const runAgent: (prompt: string, options?: AmpAgentOptions) => AsyncGenerator<AgentMessage>;
 declare const createServer: () => Hono<hono_types.BlankEnv, hono_types.BlankSchema, "/">;
 declare const startServer: (port?: number) => Promise<void>;
 
-export { type AmpAgentOptions, createServer, startServer };
+export { type AmpAgentOptions, createServer, runAgent, startServer };

package/dist/server.d.ts

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

package/dist/server.js

@@ -15,9 +15,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.89";
 try {
-  fetch(`https://www.react-grab.com/api/version?source=amp&t=${Date.now()}`).catch(() => {
+  fetch(
+    `https://www.react-grab.com/api/version?source=amp&t=${Date.now()}`
+  ).catch(() => {
   });
 } catch {
 }
@@ -27,6 +29,91 @@ var lastThreadId;
 var extractTextFromContent = (content) => {
   return content.filter((item) => item.type === "text" && item.text).map((item) => item.text).join(" ").trim();
 };
+var runAgent = async function* (prompt, options) {
+  const sessionId = options?.sessionId;
+  const abortController = new AbortController();
+  if (sessionId) {
+    abortControllers.set(sessionId, abortController);
+  }
+  const isAborted = () => {
+    if (options?.signal?.aborted) return true;
+    if (abortController.signal.aborted) return true;
+    return false;
+  };
+  try {
+    yield { type: "status", content: "Thinking\u2026" };
+    const executeOptions = {
+      dangerouslyAllowAll: true
+    };
+    executeOptions.cwd = options?.cwd ?? process.env.REACT_GRAB_CWD ?? process.cwd();
+    const existingThread = sessionId ? threadMap.get(sessionId) : void 0;
+    if (existingThread) {
+      executeOptions.continue = existingThread.threadId;
+    }
+    let capturedThreadId;
+    for await (const message of execute({
+      prompt,
+      options: executeOptions,
+      signal: abortController.signal
+    })) {
+      if (isAborted()) break;
+      switch (message.type) {
+        case "system":
+          if (message.subtype === "init") {
+            const systemMessage = message;
+            if (systemMessage.thread_id) {
+              capturedThreadId = systemMessage.thread_id;
+            }
+            yield { type: "status", content: "Session started..." };
+          }
+          break;
+        case "assistant": {
+          const messageContent = message.message?.content;
+          if (messageContent && Array.isArray(messageContent)) {
+            const toolUse = messageContent.find(
+              (item) => item.type === "tool_use"
+            );
+            if (toolUse && "name" in toolUse) {
+              yield { type: "status", content: `Using ${toolUse.name}...` };
+            } else {
+              const textContent = extractTextFromContent(messageContent);
+              if (textContent && !isAborted()) {
+                yield { type: "status", content: textContent };
+              }
+            }
+          }
+          break;
+        }
+        case "result":
+          if (message.is_error) {
+            yield { type: "error", content: message.error || "Unknown error" };
+          } else {
+            yield { type: "status", content: COMPLETED_STATUS };
+          }
+          break;
+      }
+    }
+    if (sessionId && capturedThreadId && !isAborted()) {
+      threadMap.set(sessionId, { threadId: capturedThreadId });
+    }
+    if (capturedThreadId) {
+      lastThreadId = capturedThreadId;
+    }
+    if (!isAborted()) {
+      yield { type: "done", content: "" };
+    }
+  } catch (error) {
+    if (!isAborted()) {
+      const errorMessage = error instanceof Error ? error.message : "Unknown error";
+      yield { type: "error", content: errorMessage };
+      yield { type: "done", content: "" };
+    }
+  } finally {
+    if (sessionId) {
+      abortControllers.delete(sessionId);
+    }
+  }
+};
 var createServer = () => {
   const honoApplication = new Hono();
   honoApplication.use("*", cors());
@@ -39,99 +126,17 @@ var createServer = () => {
 
 ${content}`;
     return streamSSE(context, async (stream) => {
-      const abortController = new AbortController();
-      if (sessionId) {
-        abortControllers.set(sessionId, abortController);
-      }
-      const isAborted = () => abortController.signal.aborted;
-      try {
-        await stream.writeSSE({ data: "Thinking\u2026", event: "status" });
-        const executeOptions = {
-          dangerouslyAllowAll: true
-        };
-        executeOptions.cwd = options?.cwd ?? process.env.REACT_GRAB_CWD ?? process.cwd();
-        if (isFollowUp && existingThread) {
-          executeOptions.continue = existingThread.threadId;
-        }
-        let capturedThreadId;
-        for await (const message of execute({
-          prompt: userPrompt,
-          options: executeOptions,
-          signal: abortController.signal
-        })) {
-          if (isAborted()) break;
-          switch (message.type) {
-            case "system":
-              if (message.subtype === "init") {
-                const systemMessage = message;
-                if (systemMessage.thread_id) {
-                  capturedThreadId = systemMessage.thread_id;
-                }
-                await stream.writeSSE({
-                  data: "Session started...",
-                  event: "status"
-                });
-              }
-              break;
-            case "assistant": {
-              const messageContent = message.message?.content;
-              if (messageContent && Array.isArray(messageContent)) {
-                const toolUse = messageContent.find(
-                  (item) => item.type === "tool_use"
-                );
-                if (toolUse && "name" in toolUse) {
-                  await stream.writeSSE({
-                    data: `Using ${toolUse.name}...`,
-                    event: "status"
-                  });
-                } else {
-                  const textContent = extractTextFromContent(messageContent);
-                  if (textContent && !isAborted()) {
-                    await stream.writeSSE({
-                      data: textContent,
-                      event: "status"
-                    });
-                  }
-                }
-              }
-              break;
-            }
-            case "result":
-              if (message.is_error) {
-                await stream.writeSSE({
-                  data: `Error: ${message.error || "Unknown error"}`,
-                  event: "error"
-                });
-              } else {
-                await stream.writeSSE({
-                  data: COMPLETED_STATUS,
-                  event: "status"
-                });
-              }
-              break;
-          }
-        }
-        if (sessionId && capturedThreadId && !isAborted()) {
-          threadMap.set(sessionId, { threadId: capturedThreadId });
-        }
-        if (capturedThreadId) {
-          lastThreadId = capturedThreadId;
-        }
-        if (!isAborted()) {
-          await stream.writeSSE({ data: "", event: "done" });
-        }
-      } catch (error) {
-        if (!isAborted()) {
-          const errorMessage = error instanceof Error ? error.message : "Unknown error";
+      for await (const message of runAgent(userPrompt, {
+        ...options,
+        sessionId
+      })) {
+        if (message.type === "error") {
           await stream.writeSSE({
-            data: `Error: ${errorMessage}`,
+            data: `Error: ${message.content}`,
             event: "error"
           });
-          await stream.writeSSE({ data: "", event: "done" });
-        }
-      } finally {
-        if (sessionId) {
-          abortControllers.delete(sessionId);
+        } else {
+          await stream.writeSSE({ data: message.content, event: message.type });
         }
       }
     });
@@ -185,4 +190,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/amp",
-  "version": "0.0.88",
+  "version": "0.0.89",
   "type": "module",
   "bin": {
     "react-grab-amp": "./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.89"
   },
   "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.89"
   },
   "scripts": {
     "dev": "tsup --watch",