diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 1e7dff54..ee835f6f 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -26,6 +26,6 @@ jobs:
 
       - name: Enable automerge
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.CI_GITHUB_TOKEN }}
           PR_URL: ${{ github.event.pull_request.html_url }}
         run: gh pr merge "$PR_URL" --auto --squash
diff --git a/src/core/git/GitHttpClient.ts b/src/core/git/GitHttpClient.ts
index 9ffe387c..c0f29cd2 100644
--- a/src/core/git/GitHttpClient.ts
+++ b/src/core/git/GitHttpClient.ts
@@ -43,7 +43,7 @@ export const gitHttpClient = {
     const res = await secureFetch(url, {
       method,
       headers,
-      body: body ? new Blob(body) : undefined,
+      body: body ? new Blob(body as BlobPart[]) : undefined,
     });
 
     const responseHeaders: Record<string, string> = {};
diff --git a/src/services/ai/openai-helpers.ts b/src/services/ai/openai-helpers.ts
index 1afcbff2..90c3919c 100644
--- a/src/services/ai/openai-helpers.ts
+++ b/src/services/ai/openai-helpers.ts
@@ -95,6 +95,8 @@ export function parseOpenAIContent(
 
   if (message.tool_calls) {
     for (const toolCall of message.tool_calls) {
+      if (toolCall.type !== 'function') continue;
+
       let parsedInput: Record<string, unknown> = {};
       try {
         parsedInput = JSON.parse(toolCall.function.arguments);