fix: rebase onto main + address CodeRabbit review feedback

- Resolve merge conflict with pagination changes (fetchAllPaginated)
- Fix type mismatch: session_id column integer→bigint to match sessions.id
- Fix dashboard fallback: don't fall back to branch heuristic when sessionId
  is set but not found (prevents attaching wrong session metadata)
- Fix CLI: main() now uses syncSessionFile() to include FK linking
- Add clobber guard: skip FK update if agent session already has sessionId
- Add FK constraint error handling in PATCH endpoint (400 vs 500)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: OAGr

apps/web/src/app/internal/agent-sessions/agent-sessions-content.tsx

@@ -64,9 +64,10 @@ async function loadFromApi(): Promise<FetchResult<AgentSessionRow[]>> {
   }
 
   const rows: AgentSessionRow[] = agentResult.data.sessions.map((s): AgentSessionRow => {
-    // Prefer FK-linked session log; fall back to branch-name heuristic for older records
-    const log = (s.sessionId != null ? logsById.get(s.sessionId) : undefined)
-      ?? logsByBranch.get(s.branch);
+    // Prefer FK-linked session log; only fall back to branch heuristic when sessionId is absent
+    const log = s.sessionId != null
+      ? logsById.get(s.sessionId)
+      : logsByBranch.get(s.branch);
     return {
       id: s.id,
       branch: s.branch,

apps/wiki-server/drizzle/0063_add_session_id_to_agent_sessions.sql

@@ -15,6 +15,6 @@
 -- pattern impossible. agent_sessions is a small table (hundreds of rows), so the
 -- brief SHARE ROW EXCLUSIVE lock is acceptable.
 
-ALTER TABLE "agent_sessions" ADD COLUMN IF NOT EXISTS "session_id" integer REFERENCES "sessions"("id") ON DELETE SET NULL;
+ALTER TABLE "agent_sessions" ADD COLUMN IF NOT EXISTS "session_id" bigint REFERENCES "sessions"("id") ON DELETE SET NULL;
 
 CREATE INDEX IF NOT EXISTS "idx_as_session_id" ON "agent_sessions" ("session_id");

apps/wiki-server/src/routes/agent-sessions.ts

@@ -141,11 +141,21 @@ const agentSessionsApp = new Hono()
     if (sessionId !== undefined) updates.sessionId = sessionId;
 
     const db = getDrizzleDb();
-    const result = await db
-      .update(agentSessions)
-      .set(updates)
-      .where(eq(agentSessions.id, id))
-      .returning();
+    let result;
+    try {
+      result = await db
+        .update(agentSessions)
+        .set(updates)
+        .where(eq(agentSessions.id, id))
+        .returning();
+    } catch (e: unknown) {
+      // Translate FK violation into a 400 response
+      const msg = e instanceof Error ? e.message : String(e);
+      if (msg.includes("foreign key") || msg.includes("violates foreign key")) {
+        return c.json({ error: "invalid_reference", message: "sessionId references a non-existent session" }, 400);
+      }
+      throw e;
+    }
 
     if (result.length === 0) {
       return c.json({ error: "not_found", message: `No session with id: ${id}` }, 404);

apps/wiki-server/src/schema.ts

@@ -762,7 +762,7 @@ export const agentSessions = pgTable(
     prUrl: text("pr_url"), // PR URL recorded when crux issues done --pr=URL is called
     prOutcome: text("pr_outcome"), // Outcome: merged | merged_with_revisions | reverted | closed_without_merge
     fixesPrUrl: text("fixes_pr_url"), // URL of the PR this session is fixing (enables fix-chain tracking)
-    sessionId: integer("session_id").references(() => sessions.id, { onDelete: "set null" }), // FK to session log — set when session completes and log is synced
+    sessionId: bigint("session_id", { mode: "number" }).references(() => sessions.id, { onDelete: "set null" }), // FK to session log — set when session completes and log is synced
     status: text("status").notNull().default("active"),
     startedAt: timestamp("started_at", { withTimezone: true })
       .notNull()

crux/wiki-server/sync-session.ts

@@ -130,7 +130,7 @@ export async function syncSessionFile(filePath: string): Promise<boolean> {
   if (entry.branch) {
     try {
       const agentSessionResult = await getAgentSessionByBranch(entry.branch);
-      if (agentSessionResult.ok) {
+      if (agentSessionResult.ok && agentSessionResult.data.sessionId == null) {
         await updateAgentSession(agentSessionResult.data.id, {
           sessionId: result.data.id,
         });
@@ -175,9 +175,9 @@ async function main() {
   console.log(`  Branch: ${entry.branch || '(none)'}`);
   console.log(`  Pages: ${entry.pages?.length || 0}`);
 
-  const result = await createSession(entry);
-  if (result.ok) {
-    console.log(`\u2713 Session synced to wiki-server (id: ${result.data.id})`);
+  const ok = await syncSessionFile(resolved);
+  if (ok) {
+    console.log(`\u2713 Session synced to wiki-server`);
   } else {
     console.log('Warning: could not sync session to wiki-server (server unavailable or error)');
     // Not a hard failure — YAML is authoritative