@getpochi/cli 0.5.66 → 0.5.68

package/dist/cli.js

@@ -104731,8 +104731,8 @@ var require_connection = __commonJS((exports, module) => {
           return;
         }
         const secWSAccept = response.headersList.get("Sec-WebSocket-Accept");
-        const digest = crypto7.createHash("sha1").update(keyValue + uid).digest("base64");
-        if (secWSAccept !== digest) {
+        const digest2 = crypto7.createHash("sha1").update(keyValue + uid).digest("base64");
+        if (secWSAccept !== digest2) {
           failWebsocketConnection(handler2, 1002, "Incorrect hash received in Sec-WebSocket-Accept header.");
           return;
         }
@@ -109298,8 +109298,8 @@ var require_websocket2 = __commonJS((exports, module) => {
         abortHandshake(websocket, socket, "Invalid Upgrade header");
         return;
       }
-      const digest = createHash5("sha1").update(key2 + GUID).digest("base64");
-      if (res.headers["sec-websocket-accept"] !== digest) {
+      const digest2 = createHash5("sha1").update(key2 + GUID).digest("base64");
+      if (res.headers["sec-websocket-accept"] !== digest2) {
         abortHandshake(websocket, socket, "Invalid Sec-WebSocket-Accept header");
         return;
       }
@@ -109879,12 +109879,12 @@ var require_websocket_server = __commonJS((exports, module) => {
       }
       if (this._state > RUNNING)
         return abortHandshake(socket, 503);
-      const digest = createHash5("sha1").update(key2 + GUID).digest("base64");
+      const digest2 = createHash5("sha1").update(key2 + GUID).digest("base64");
       const headers = [
         "HTTP/1.1 101 Switching Protocols",
         "Upgrade: websocket",
         "Connection: Upgrade",
-        `Sec-WebSocket-Accept: ${digest}`
+        `Sec-WebSocket-Accept: ${digest2}`
       ];
       const ws = new this.options.WebSocket(null, undefined, this.options);
       if (protocols.size) {
@@ -113615,8 +113615,8 @@ var require_websocket3 = __commonJS((exports, module) => {
         abortHandshake(websocket, socket, "Invalid Upgrade header");
         return;
       }
-      const digest = createHash5("sha1").update(key2 + GUID).digest("base64");
-      if (res.headers["sec-websocket-accept"] !== digest) {
+      const digest2 = createHash5("sha1").update(key2 + GUID).digest("base64");
+      if (res.headers["sec-websocket-accept"] !== digest2) {
         abortHandshake(websocket, socket, "Invalid Sec-WebSocket-Accept header");
         return;
       }
@@ -114196,12 +114196,12 @@ var require_websocket_server2 = __commonJS((exports, module) => {
       }
       if (this._state > RUNNING)
         return abortHandshake(socket, 503);
-      const digest = createHash5("sha1").update(key2 + GUID).digest("base64");
+      const digest2 = createHash5("sha1").update(key2 + GUID).digest("base64");
       const headers = [
         "HTTP/1.1 101 Switching Protocols",
         "Upgrade: websocket",
         "Connection: Upgrade",
-        `Sec-WebSocket-Accept: ${digest}`
+        `Sec-WebSocket-Accept: ${digest2}`
       ];
       const ws = new this.options.WebSocket(null, undefined, this.options);
       if (protocols.size) {
@@ -287061,7 +287061,7 @@ var require_previous_map = __commonJS((exports, module) => {
   var { existsSync: existsSync4, readFileSync: readFileSync3 } = __require("fs");
   var { dirname: dirname8, join: join18 } = __require("path");
   var { SourceMapConsumer, SourceMapGenerator } = require_source_map();
-  function fromBase64(str) {
+  function fromBase642(str) {
     if (Buffer) {
       return Buffer.from(str, "base64").toString();
     } else {
@@ -287102,7 +287102,7 @@ var require_previous_map = __commonJS((exports, module) => {
       }
       let baseUriMatch = text19.match(baseCharsetUri) || text19.match(baseUri);
       if (baseUriMatch) {
-        return fromBase64(text19.substr(baseUriMatch[0].length));
+        return fromBase642(text19.substr(baseUriMatch[0].length));
       }
       let encoding = text19.match(/data:application\/json;([^,]+),/)[1];
       throw new Error("Unsupported source map encoding " + encoding);
@@ -321597,8 +321597,8 @@ Error: ${e$1.message}`);
           abortHandshake$1(websocket, socket, "Invalid Upgrade header");
           return;
         }
-        const digest = createHash$1("sha1").update(key2 + GUID$1).digest("base64");
-        if (res.headers["sec-websocket-accept"] !== digest) {
+        const digest2 = createHash$1("sha1").update(key2 + GUID$1).digest("base64");
+        if (res.headers["sec-websocket-accept"] !== digest2) {
           abortHandshake$1(websocket, socket, "Invalid Sec-WebSocket-Accept header");
           return;
         }
@@ -375096,7 +375096,7 @@ var {
 // package.json
 var package_default = {
   name: "@getpochi/cli",
-  version: "0.5.66",
+  version: "0.5.68",
   type: "module",
   bin: {
     pochi: "src/cli.ts"
@@ -388882,6 +388882,92 @@ var makeBlobQuery = (checksum) => queryDb(() => tables.blobs.where("checksum", "
   label: "blobs",
   deps: [checksum]
 });
+// ../livekit/src/store-blob.ts
+async function processContentOutput(store, output2, signal2) {
+  const parsed = ContentOutput.safeParse(output2);
+  if (parsed.success) {
+    const content3 = parsed.data.content.map(async (item) => {
+      if (item.type === "text") {
+        return item;
+      }
+      if (item.type === "image") {
+        return {
+          type: "image",
+          mimeType: item.mimeType,
+          data: await findBlobUrl(store, item.mimeType, item.data, signal2)
+        };
+      }
+      return item;
+    });
+    return {
+      ...parsed.data,
+      content: await Promise.all(content3)
+    };
+  }
+  return output2;
+}
+var ContentOutput = zod_default.object({
+  content: zod_default.array(zod_default.discriminatedUnion("type", [
+    zod_default.object({
+      type: zod_default.literal("text"),
+      text: zod_default.string()
+    }),
+    zod_default.object({
+      type: zod_default.literal("image"),
+      mimeType: zod_default.string(),
+      data: zod_default.string()
+    })
+  ]))
+});
+async function fileToUri(store, file5, signal2) {
+  if ("POCHI_CORS_PROXY_PORT" in globalThis) {
+    return fileToRemoteUri(file5, signal2);
+  }
+  const data = new Uint8Array(await file5.arrayBuffer());
+  const checksum = await digest(data);
+  const blob3 = store.query(makeBlobQuery(checksum));
+  const url3 = `${StoreBlobProtocol}${checksum}`;
+  if (blob3) {
+    return url3;
+  }
+  store.commit(events.blobInserted({
+    checksum,
+    data,
+    createdAt: new Date,
+    mimeType: file5.type
+  }));
+  return url3;
+}
+async function findBlobUrl(store, mimeType, base643, signal2) {
+  const file5 = new File([fromBase64(base643)], "file", {
+    type: mimeType
+  });
+  return fileToUri(store, file5, signal2);
+}
+var fromBase64 = (base643) => Uint8Array.from(atob(base643), (v2) => v2.charCodeAt(0));
+async function digest(data) {
+  const hashBuffer = await crypto.subtle.digest("SHA-256", data);
+  const hashArray = Array.from(new Uint8Array(hashBuffer));
+  return hashArray.map((b2) => b2.toString(16).padStart(2, "0")).join("");
+}
+async function fileToRemoteUri(file5, signal2) {
+  const formData4 = new FormData;
+  formData4.append("file", file5);
+  const response = await fetch(`${getServerBaseUrl()}/api/upload`, {
+    method: "POST",
+    body: formData4,
+    signal: signal2
+  });
+  if (!response.ok) {
+    throw new Error(`Upload failed: ${response.statusText}`);
+  }
+  const data = await response.json();
+  if (!data.url) {
+    throw new Error("Failed to upload attachment");
+  }
+  return data.url;
+}
+
 // ../livekit/src/index.ts
 var StoreBlobProtocol = "store-blob:";
 
@@ -414275,8 +414361,8 @@ function findTodos(message) {
   return todos;
 }
 // ../../node_modules/eventemitter3/index.mjs
-var import__5 = __toESM(require_eventemitter3(), 1);
-var eventemitter3_default = import__5.default;
+var import__6 = __toESM(require_eventemitter3(), 1);
+var eventemitter3_default = import__6.default;
 
 // ../../node_modules/colorette/index.js
 import * as tty3 from "tty";
@@ -416821,79 +416907,6 @@ async function process16({
     }));
   }
 }
-// ../livekit/src/chat/chat-with-hook.ts
-function makeChatWithHookClass(store, chatClass) {
-  const chatWithHook = class extends chatClass {
-    constructor(...args2) {
-      super(...args2);
-      const addToolResult = this.addToolResult.bind(this);
-      this.addToolResult = async (options6) => {
-        const parsed = ContentOutput.safeParse(options6.output);
-        if (parsed.success) {
-          const content3 = parsed.data.content.map(async (item) => {
-            if (item.type === "text") {
-              return item;
-            }
-            if (item.type === "image") {
-              return {
-                type: "image",
-                mimeType: item.mimeType,
-                data: await findBlobUrl(store, item.mimeType, item.data)
-              };
-            }
-            return item;
-          });
-          const output2 = {
-            ...options6.output,
-            content: await Promise.all(content3)
-          };
-          return addToolResult({
-            ...options6,
-            output: output2
-          });
-        }
-        return addToolResult(options6);
-      };
-    }
-  };
-  return chatWithHook;
-}
-var ContentOutput = zod_default.object({
-  content: zod_default.array(zod_default.discriminatedUnion("type", [
-    zod_default.object({
-      type: zod_default.literal("text"),
-      text: zod_default.string()
-    }),
-    zod_default.object({
-      type: zod_default.literal("image"),
-      mimeType: zod_default.string(),
-      data: zod_default.string()
-    })
-  ]))
-});
-async function findBlobUrl(store, mimeType, base643) {
-  const data = fromBase64(base643);
-  const checksum = await digest(data);
-  const blob3 = store.query(makeBlobQuery(checksum));
-  const url3 = `${StoreBlobProtocol}${checksum}`;
-  if (blob3) {
-    return url3;
-  }
-  store.commit(events.blobInserted({
-    checksum,
-    data,
-    createdAt: new Date,
-    mimeType
-  }));
-  return url3;
-}
-var fromBase64 = (base643) => Uint8Array.from(atob(base643), (v11) => v11.charCodeAt(0));
-async function digest(data) {
-  const hashBuffer = await crypto.subtle.digest("SHA-256", data);
-  const hashArray = Array.from(new Uint8Array(hashBuffer));
-  return hashArray.map((b11) => b11.toString(16).padStart(2, "0")).join("");
-}
-
 // ../livekit/src/chat/llm/repair-tool-call.ts
 var makeRepairToolCall = (taskId, model2) => async ({ toolCall, inputSchema: inputSchema2, error: error46 }) => {
   if (NoSuchToolError.isInstance(error46)) {
@@ -417029,7 +417042,7 @@ function parseMcpTool(store, _name, mcpTool) {
           if (item.type === "text") {
             return item;
           }
-          const blob3 = findBlob(store, new URL(item.data));
+          const blob3 = findBlob(store, new URL(item.data), item.mimeType);
           if (!blob3) {
             return {
               type: "text",
@@ -417054,7 +417067,7 @@ function toBase642(bytes) {
   const base643 = btoa(binString);
   return base643;
 }
-function findBlob(store, url3) {
+function findBlob(store, url3, mediaType) {
   if (url3.protocol === StoreBlobProtocol) {
     const blob3 = store.query(makeBlobQuery(url3.pathname));
     if (blob3) {
@@ -417063,6 +417076,11 @@ function findBlob(store, url3) {
         mediaType: blob3.mimeType
       };
     }
+  } else {
+    return {
+      data: fetch(url3).then((x11) => x11.blob()).then((blob3) => blob3.arrayBuffer()).then((data) => toBase642(new Uint8Array(data))),
+      mediaType
+    };
   }
 }
 
@@ -418086,12 +418104,13 @@ class FlexibleChatTransport {
       return true;
     });
     const preparedMessages = await prepareMessages(messages2, environment2);
+    const modelMessages = await resolvePromise(convertToModelMessages(formatters.llm(preparedMessages), { tools }));
     const stream12 = streamText({
       headers: {
         [PochiTaskIdHeader]: chatId
       },
       system: prompts.system(environment2?.info?.customRules, this.customAgent, mcpInfo?.instructions),
-      messages: convertToModelMessages(formatters.llm(preparedMessages), { tools }),
+      messages: modelMessages,
       model: wrapLanguageModel({
         model: model2,
         middleware: middlewares
@@ -418178,6 +418197,19 @@ function estimateTotalTokens(messages2) {
   }
   return Math.ceil(totalTextLength / 4);
 }
+async function resolvePromise(o10) {
+  const resolved = await o10;
+  if (o5(resolved)) {
+    return Promise.all(resolved.map((x11) => resolvePromise(x11)));
+  }
+  if (o4(resolved)) {
+    return Object.fromEntries(await Promise.all(Object.entries(resolved).map(async ([k11, v11]) => [
+      k11,
+      await resolvePromise(v11)
+    ])));
+  }
+  return resolved;
+}
 
 // ../livekit/src/chat/live-chat-kit.ts
 var logger23 = getLogger("LiveChatKit");
@@ -418212,7 +418244,7 @@ class LiveChatKit {
       customAgent,
       outputSchema: outputSchema2
     });
-    this.chat = new (makeChatWithHookClass(store, chatClass))({
+    this.chat = new chatClass({
       ...chatInit,
       id: taskId,
       messages: this.messages,
@@ -419014,6 +419046,7 @@ async function executeToolCall(tool2, options6, cwd2, abortSignal) {
 var logger26 = getLogger("TaskRunner");
 
 class TaskRunner {
+  store;
   cwd;
   toolCallOptions;
   stepCount;
@@ -419045,6 +419078,7 @@ class TaskRunner {
       }
     };
     this.stepCount = new StepCount(options6.maxSteps, options6.maxRetries);
+    this.store = options6.store;
     this.chatKit = new LiveChatKit({
       taskId: options6.uid,
       store: options6.store,
@@ -419181,7 +419215,7 @@ class TaskRunner {
         continue;
       const toolName = getToolName(toolCall);
       logger26.trace(`Found tool call: ${toolName} with args: ${JSON.stringify(toolCall.input)}`);
-      const toolResult = await executeToolCall(toolCall, this.toolCallOptions, this.cwd);
+      const toolResult = await processContentOutput(this.store, await executeToolCall(toolCall, this.toolCallOptions, this.cwd));
       await this.chatKit.chat.addToolResult({
         tool: toolName,
         toolCallId: toolCall.toolCallId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpochi/cli",
-  "version": "0.5.66",
+  "version": "0.5.68",
   "type": "module",
   "bin": {
     "pochi": "dist/cli.js"