Skip to content

Merge AI sessions steps 5-6 and Generate Spec into main - #30

Merged
Suharshit merged 10 commits into
mainfrom
chore/merge-ai-stack-into-main
Sep 15, 2026
Merged

Suharshit merged 10 commits into
mainfrom
chore/merge-ai-stack-into-main

Conversation

@Suharshit

Copy link
Copy Markdown
Owner

Why

#26 (step 5), #27 (step 6 docs) and #28 (Generate Spec) were merged into stacked base branches, so their changes never reached main. #29 has now brought step 4 onto main. This PR brings the rest.

Merging the stacked branches directly conflicts. main has squash commits of steps 1–4, while the stack has the original commits, and both change the same files.

How the conflicts are resolved

Nothing is force-pushed. The head of this PR is a merge commit with two parents:

The merge keeps the stack's content unchanged. That is safe because main's content is exactly step 4 (the tree diff against the step 4 branch is empty), and the stack is step 4 plus steps 5, 6 and the spec feature. Nothing on main is lost.

What this brings to main

The code is identical to what #26, #27 and #28 were reviewed with. Their verification applies unchanged:

  • typecheck and lint
  • the offline, database and live Trigger runs described in those PRs

Deploy notes

  • Merging to main triggers the deploy-trigger CI job, which deploys the new spec-agent task and the updated design-agent.
  • CRON_SECRET must be set in Vercel for the AI session cleanup cron (from feat(ai-sessions): persistent storage for AI design sessions #21).
  • The production Gemini model comes from GOOGLE_GENERATIVE_AI_MODEL in Vercel and Trigger.dev.

🤖 Generated with Claude Code

Suharshit and others added 10 commits September 15, 2026 22:16
The AI sidebar kept its chat in React state only, so a reload lost the
transcript and any in-flight run. This adds the storage layer the
multi-turn design agent will build on (not wired to the UI yet).

- AiSession / AiMessage Prisma models + additive migration; sessions
  cascade with their project, messages cascade with their session
- lib/ai/session-store.ts: 7-day sliding expiry, 10 sessions per user
  per project, 60 messages per session; reads ignore expired rows
- GET/POST /api/projects/[projectId]/ai-sessions and
  GET/DELETE /api/projects/[projectId]/ai-sessions/[sessionId],
  private to the session's creator
- Daily Vercel Cron cleanup at /api/cron/ai-sessions/cleanup,
  gated by CRON_SECRET (public in proxy.ts)

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
A reload no longer loses the chat or an in-flight run. Generation is
still one-shot; this changes persistence and resume only.

- POST /api/projects/[projectId]/ai-sessions/[sessionId]/turns stores
  the prompt and a PENDING reply carrying the run id (replaces
  POST /api/ai/design, which is removed)
- Replies are settled from runs.retrieve whenever a session is read, so
  a turn is saved even if the tab closed mid-run; concurrent reads
  settle once
- useAiSession replaces useDesignAgent: reopens the last chat, resumes
  pending runs via Realtime with a 4s polling fallback, stores new chats
  lazily on the first message
- Sidebar session bar with saved-chat history (delete, expiry) and
  New chat
- Limits moved to lib/ai/session-limits.ts for client use;
  formatRelativeTime extracted to lib/relative-time.ts

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Each turn is still one design-agent run, but the agent now keeps a
requirements brief, asks up to 3 rounds of clarifying questions when
an unknown would change the architecture, proposes a plan (components,
flows, decisions with rationale and alternatives, assumptions), and
only draws the diagram once the plan is approved.

- lib/ai/agent-schema.ts: brief, question, plan, turn-analysis and
  run-result schemas; list limits trimmed in code rather than enforced
  as maxItems, which models don't reliably honour
- lib/ai/prompts.ts, lib/ai/design-agent-engine.ts: analyze/plan/
  generate on generateText + Output.object; code-enforced decision
  rules; per-step thinking level (Gemini 3) or budget (Gemini 2.x);
  one retry on schema mismatch; per-call timeouts
- design-agent task: single attempt, maxDuration 300s
- Turns route accepts message, answers, generate and skip; stored
  replies are validated run output (QUESTIONS / PLAN / RESULT) and run
  failures are shown as friendly messages

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
The AI Architect chat now renders the design agent's turns as cards
instead of plain text, so users answer, skip and approve with buttons.

- QuestionsCard: option chips and a free-text answer per question,
  Send answers and Skip; read-only with the chosen answers once sent
- PlanCard: summary, highlighted key decisions with rationale and
  alternatives, components (folded after 6), flows, assumptions, and
  Draw this plan
- ResultCard: canvas summary with collapsible decisions
- Only the newest non-failed reply is interactive, and only while no
  turn is pending, mirroring the server's rules
- useAiSession.sendTurn sends message, answers, generate and skip,
  with optimistic user text matching what the server stores
- TurnInput, the generate/skip texts and payload readers now live in
  the client-safe agent-schema and are shared with the server; question
  and plan payloads also store the agent's reply

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
…epair

The design agent now sees what is already on the canvas, so follow-up
requests extend the existing design instead of redrawing it, and
generated diagrams match the starter templates' visual conventions.

- lib/ai/canvas-summary.ts: compact canvas listing with refs (ex-N),
  kinds, used connection points, connections and notes, passed to the
  analyze, plan and generate steps
- Generation schema: role + kicker instead of legacy dark colorId,
  sync/async delivery (async edges dashed); edges may reference
  existing components by ref
- buildCanvasGraph: resolves refs, folds redrawn or repeated components
  into the existing/first node, drops unknown and duplicate links, and
  assigns connection points counting existing edges
- lib/ai/graph-validation.ts + one repair call: duplicate/redrawn
  components, unknown refs, self loops, repeated links, >4 connections,
  unconnected components, missing plan components
- Shared NODE_ROLES / getRoleFill and SHAPE_KICKERS in types/canvas.ts
  (starter templates use them)
- Plan text no longer shows internal canvas refs

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
…EADME

Brings the tracked docs in line with AI sessions steps 1-5. Docs only.
docs.md is gitignored, so its matching refresh stays local.

- context/architecture-context.md: AI Design Agent section (turn = run,
  turn steps, code-enforced rules, settle on read, reliability, model
  config) and invariants 5-9
- context/project-overview.md: canvas snapshots in Vercel Blob (was
  "filesystem"); chat cards and canvas-aware generation
- context/ui-context.md: AI sidebar session bar, saved chats and cards
  follow the paper conventions
- context/progress-tracker.md: step 6 entry and current goal
- README.md: local AI design agent setup

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
The Specs tab now turns the current canvas into a Markdown technical
spec that downloads automatically: an overview, key decisions
highlighted as callouts, one Mermaid diagram section per group of
connected components, a component reference, connections, and risks.

- spec-agent Trigger task: reads the room, builds the spec graph in
  code, makes one structured model call for the prose (sanitised
  against the graph, internal refs stripped), renders the Markdown in
  code; aborts on an empty or oversized canvas
- Stored on read like AI turns: GET /api/projects/[id]/spec uploads a
  finished run to private Vercel Blob and records it on Project
  (guarded on the run id); POST starts a run (409 while one is
  pending); GET .../spec/markdown downloads the file
- Decisions recorded in the user's AI design sessions are included and
  tagged as recorded
- Migration: TaskRun.kind (DESIGN or SPEC) and Project spec fields
- useSpecGenerator and SpecPanel replace the placeholder Specs tab
- Shared lib/ai/model.ts, lib/ai/run-failure.ts and lib/canvas-room.ts
  used by both agents

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
GitHub main has steps 1-3 only; steps 4-6 were merged into stacked base branches. Content matches local exactly; a stacked merge into main conflicts in 11 files, so main needs a sync commit whose tree is the stack head.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Resolves the conflicts with the squash-merged history on main. main's content equals step 4, which the stack already contains, so the stack's content is kept unchanged.

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

vercel Bot commented Sep 15, 2026 •

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated
draftly Ready Ready Preview Sep 15, 2026 8:18pm UTC

@coderabbitai

coderabbitai Bot commented Sep 15, 2026

Copy link
Copy Markdown

Important

  • 🔍 Trigger review

This repository does not receive automatic reviews because it has fewer than 10 stars.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Advanced

Run ID: 6dd5a267-5804-4c6c-8525-9b1274b6d1e5


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@Suharshit
Suharshit merged commit e7a3ef3 into main Sep 15, 2026
3 checks passed
@Suharshit
Suharshit deleted the chore/merge-ai-stack-into-main branch September 16, 2026 18:24

This branch was successfully deployed

1 active deployment
Preview — e7168946 Deployed Sep 15, 2026 by vercel[bot]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant