Merge pull request 'Make Claude Code footer stripping more robust' (#25) from probablycorey/fix-claude-footer-strip into main

Reviewed-on: #25

packages/spike/README.md

@@ -10,7 +10,15 @@ Discord-Gitea bridge bot. When someone opens a PR or leaves a comment on [git.no
 4. `bun run subdomain:dev` to start the server.
 5. Visit `localhost:3000/discord/auth` to authorize the bot to your Discord server.
 6. Use [Tailscale Funnel](https://tailscale.com/kb/1223/funnel) or ngrok to expose your local server to the internet.
-7. Add a Gitea webhook at `https://git.nose.space/<org>/settings/hooks` pointing to `https://<your-tunnel>/gitea/webhook`.
+7. Add a Gitea webhook (see below).
+
+### Gitea webhook
+
+Spike needs a webhook so Gitea sends PR and comment events to it. You have two options:
+
+**System webhook (covers all repos)** — Requires Gitea admin access. Go to **Site Administration > System Webhooks > Add Webhook > Gitea**. Set the target URL to `https://spike.theworkshop.cc/gitea/webhook`. Under "Trigger On", select **Custom Events** and enable Pull Request, Issue Comment, and Pull Request Comment. This fires for every repo on the instance.
+
+**Org/repo webhook (covers one org or repo)** — Go to the org or repo settings, then **Webhooks > Add Webhook > Gitea**. Same target URL and event configuration as above. Only fires for that org or repo.
 
 ### Environment variables
 

packages/spike/src/bridge/webhook-handler.ts

@@ -112,7 +112,11 @@ class PRHandler {
   }
 
   static formatPrBody(pullRequest: Gitea.PullRequest, repositoryFullName: string): string {
-    const body = pullRequest.body || "_empty_"
+    // Strip the "🤖 Generated with Claude Code" footer that gets appended to PR bodies
+    const claudeFooter = /\n*🤖.*Claude Code[^\n]*$/
+    const body = (pullRequest.body || "_empty_")
+      .replace(claudeFooter, "")
+      .trim() || "_empty_"
     let message = `
   > ### [${pullRequest.title}](<${pullRequest.html_url}>)
   > **${repositoryFullName}**

packages/spike/src/gitea/api.ts

@@ -1,18 +1,33 @@
+import { log } from "../log"
 import type { Gitea } from "./types"
 
 const giteaUrl = "https://git.nose.space"
 
-export async function fetchPR(fullname: string, prNumber: number): Promise<Gitea.PullRequest> {
-  const url = `${giteaUrl}/api/v1/repos/${fullname}/pulls/${prNumber}`
+function tokenPrefix(): string {
+  const token = process.env.GITEA_API_TOKEN
+  if (!token) return "MISSING"
+  return `${token.slice(0, 4)}...${token.slice(-4)} (${token.length} chars)`
+}
+
+async function giteaFetch(url: string): Promise<Response> {
   const response = await fetch(url, {
     headers: {
       Authorization: `token ${process.env.GITEA_API_TOKEN}`,
     },
   })
+
   if (!response.ok) {
+    const body = await response.text()
+    log({ type: "gitea-api-error", status: response.status, url, body: body.slice(0, 500), tokenPrefix: tokenPrefix() })
     throw new Error(`Gitea API error: ${response.status} ${response.statusText}`)
   }
 
+  return response
+}
+
+export async function fetchPR(fullname: string, prNumber: number): Promise<Gitea.PullRequest> {
+  const url = `${giteaUrl}/api/v1/repos/${fullname}/pulls/${prNumber}`
+  const response = await giteaFetch(url)
   return response.json() as Promise<Gitea.PullRequest>
 }
 
@@ -20,16 +35,8 @@ export async function fetchReviewComments(
   fullname: string,
   prNumber: number
 ): Promise<Gitea.ReviewComment[]> {
-  // First, fetch all reviews
   const reviewsUrl = `${giteaUrl}/api/v1/repos/${fullname}/pulls/${prNumber}/reviews`
-  const reviewsResponse = await fetch(reviewsUrl, {
-    headers: {
-      Authorization: `token ${process.env.GITEA_API_TOKEN}`,
-    },
-  })
-  if (!reviewsResponse.ok) {
-    throw new Error(`Gitea API error: ${reviewsResponse.status} ${reviewsResponse.statusText}`)
-  }
+  const reviewsResponse = await giteaFetch(reviewsUrl)
 
   const reviews = (await reviewsResponse.json()) as Array<{
     id: number
@@ -40,21 +47,12 @@ export async function fetchReviewComments(
     comments_count: number
   }>
 
-  // For each review, fetch its comments
   const allComments: Gitea.ReviewComment[] = []
   for (const review of reviews) {
     if (review.comments_count === 0) continue
 
     const commentsUrl = `${giteaUrl}/api/v1/repos/${fullname}/pulls/${prNumber}/reviews/${review.id}/comments`
-    const commentsResponse = await fetch(commentsUrl, {
-      headers: {
-        Authorization: `token ${process.env.GITEA_API_TOKEN}`,
-      },
-    })
-
-    if (!commentsResponse.ok) {
-      throw new Error(`Gitea API error fetching review ${review.id} comments: ${commentsResponse.status} ${commentsResponse.statusText}`)
-    }
+    const commentsResponse = await giteaFetch(commentsUrl)
     const comments = (await commentsResponse.json()) as Gitea.ReviewComment[]
     allComments.push(...comments)
   }

packages/spike/src/log.ts

@@ -16,6 +16,7 @@ export type LogEvent =
   | { type: "crash-log-found" }
   | { type: "startup"; detail: string }
   | { type: "discord-ready" }
+  | { type: "gitea-api-error"; status: number; url: string; body: string; tokenPrefix: string }
   | { type: "error"; error: unknown; context?: string }
 
 export type StoredLogEvent = LogEvent & { ts: string }
@@ -47,14 +48,20 @@ mkdirSync(logsDir, { recursive: true })
 
 function createLogFile(): string {
   const timestamp = new Date().toISOString().replace(/[:.]/g, "-")
-  return `${logsDir}/${releaseSha}_${timestamp}.jsonl`
+  return `${logsDir}/${timestamp}_${releaseSha}.jsonl`
+}
+
+function extractTimestamp(filename: string): string {
+  const stem = filename.replace(".jsonl", "")
+  // New format: timestamp_sha, Old format: sha_timestamp
+  if (/^\d{4}-/.test(stem)) return stem.split("_").slice(0, -1).join("_")
+  return stem.split("_").pop() || ""
 }
 
 export function listLogFiles(): string[] {
   return readdirSync(logsDir)
     .filter((f) => f.endsWith(".jsonl"))
-    .sort()
-    .reverse()
+    .sort((a, b) => extractTimestamp(b).localeCompare(extractTimestamp(a)))
     .slice(0, 20)
 }
 

packages/spike/src/server/logs.tsx

@@ -108,27 +108,50 @@ function EventRow({ event, index }: { event: StoredLogEvent; index: number }) {
   )
 }
 
+function parseLogFilename(file: string): { sha: string; isoStr: string } {
+  const stem = file.replace(".jsonl", "")
+  // New format: timestamp_sha (e.g. 2026-03-10T18-06-23-561Z_cb10121)
+  // Old format: sha_timestamp (e.g. cb10121_2026-03-10T18-06-23-561Z)
+  const isNewFormat = /^\d{4}-/.test(stem)
+  const parts = stem.split("_")
+
+  let sha: string
+  let rawTimestamp: string
+  if (isNewFormat) {
+    sha = parts.pop() || "unknown"
+    rawTimestamp = parts.join("_")
+  } else {
+    rawTimestamp = parts.pop() || ""
+    sha = parts.join("_") || "unknown"
+  }
+
+  const isoStr = rawTimestamp.replace(/T(\d{2})-(\d{2})-(\d{2})-(\d+)Z/, "T$1:$2:$3.$4Z")
+  return { sha, isoStr }
+}
+
 function Sidebar({ files, selectedFile }: { files: string[]; selectedFile?: string }) {
-  // Group files by sha
+  // Group files by sha, sorted by most recent file in each group
   const grouped: Record<string, string[]> = {}
   for (const file of files) {
-    const sha = file.split("_")[0] || "unknown"
+    const { sha } = parseLogFilename(file)
     const list = grouped[sha] || (grouped[sha] = [])
     list.push(file)
   }
+  const sortedGroups = Object.entries(grouped).sort(([, a], [, b]) => {
+    return b[0]!.localeCompare(a[0]!)
+  })
 
   return (
     <nav style="width: 280px; min-width: 280px; background: #141414; border-right: 1px solid #2a2a2a; overflow-y: auto; padding: 16px 0">
       <div style="padding: 0 16px 12px; color: #9ca3af; font-size: 11px; text-transform: uppercase; letter-spacing: 1px">
         Log Files
       </div>
-      {Object.entries(grouped).map(([sha, shaFiles]) => (
+      {sortedGroups.map(([sha, shaFiles]) => (
         <div style="margin-bottom: 8px">
           <div style="padding: 4px 16px; color: #6b7280; font-size: 11px; font-family: monospace">{sha}</div>
           {shaFiles.map((file) => {
             const isSelected = file === selectedFile
-            // Parse ISO timestamp back from filename: sha_2026-03-10T02-56-59-938Z.jsonl
-            const isoStr = file.replace(/^[^_]+_/, "").replace(".jsonl", "").replace(/T(\d{2})-(\d{2})-(\d{2})-(\d+)Z/, "T$1:$2:$3.$4Z")
+            const { isoStr } = parseLogFilename(file)
             const bg = isSelected ? "#2a2a2a" : "transparent"
             return (
               <a