fix(app): enforce durable prompt intent admission

Author: deepagent-ai

packages/app/src/components/prompt-input/submit.test.ts

@@ -27,7 +27,15 @@ const preparedDrafts: Array<{
   outputLanguage?: string
   text?: string
 }> = []
-const sentPromptAsync: Array<{ directory: string; metadata?: unknown; text?: string }> = []
+const preparedIntents: Array<{ intentID?: string; source?: string }> = []
+const sentPromptAsync: Array<{
+  directory: string
+  metadata?: unknown
+  text?: string
+  intentID?: string
+  intentSource?: string
+  intentVariant?: string
+}> = []
 const promptPrepareEvents: string[] = []
 const promptPrepareProgress: string[] = []
 
@@ -61,11 +69,20 @@ const clientFor = (directory: string) => {
         return { data: undefined }
       },
       prompt: async () => ({ data: undefined }),
-      promptAsync: async (payload?: { metadata?: unknown; parts?: Array<{ type: string; text?: string }> }) => {
+      promptAsync: async (payload?: {
+        metadata?: unknown
+        parts?: Array<{ type: string; text?: string }>
+        intentID?: string
+        intentSource?: string
+        intentVariant?: string
+      }) => {
         const sent = {
           directory,
           metadata: payload?.metadata,
           text: payload?.parts?.find((part) => part.type === "text")?.text,
+          intentID: payload?.intentID,
+          intentSource: payload?.intentSource,
+          intentVariant: payload?.intentVariant,
         }
         sentPromptAsync.push(sent)
         if (sent.text === "prompt waits after admission") {
@@ -82,7 +99,13 @@ const clientFor = (directory: string) => {
       request: async (payload: {
         url?: string
         path?: { sessionID?: string }
-        body?: { mode?: string; output_language?: string; parts?: Array<{ type: string; text?: string }> }
+        body?: {
+          mode?: string
+          output_language?: string
+          intent_id?: string
+          intent_source?: string
+          parts?: Array<{ type: string; text?: string }>
+        }
         signal?: AbortSignal
       }) => {
         const text = payload.body?.parts?.find((part) => part.type === "text")?.text
@@ -93,6 +116,7 @@ const clientFor = (directory: string) => {
           outputLanguage: payload.body?.output_language,
           text,
         })
+        preparedIntents.push({ intentID: payload.body?.intent_id, source: payload.body?.intent_source })
         if (text === "prepare fails") {
           throw new Error("POST /session/ses_1/prompt_prepare returned 400", {
             cause: {
@@ -122,6 +146,7 @@ const clientFor = (directory: string) => {
           route: text === "hello" ? "general" : "code",
           goal: "Prepared goal",
           preview: "# Prepared prompt",
+          intent_id: payload.body?.intent_id,
         }
         return {
           data: new ReadableStream<Uint8Array>({
@@ -318,6 +343,7 @@ beforeEach(() => {
   sentShell.length = 0
   syncedDirectories.length = 0
   preparedDrafts.length = 0
+  preparedIntents.length = 0
   sentPromptAsync.length = 0
   promptPrepareEvents.length = 0
   promptPrepareProgress.length = 0
@@ -496,6 +522,10 @@ describe("prompt submit worktree selection", () => {
       { directory: "/repo/main", sessionID: "session-1", mode: "intelligence", outputLanguage: "english", text: "ls" },
     ])
     expect(sentPromptAsync[0]?.text).toBe("Edited prepared goal")
+    expect(preparedIntents[0]?.intentID).toBe(sentPromptAsync[0]?.intentID)
+    expect(preparedIntents[0]?.source).toBe("intelligence")
+    expect(sentPromptAsync[0]?.intentSource).toBe("intelligence")
+    expect(sentPromptAsync[0]?.intentVariant).toBe("rewritten")
     expect(sentPromptAsync[0]?.metadata).toEqual({
       deepagent: {
         prompt_pipeline: {
@@ -586,6 +616,8 @@ describe("prompt submit worktree selection", () => {
       },
     ])
     expect(sentPromptAsync[0]?.text).toBe("hello")
+    expect(preparedIntents[0]?.intentID).toBe(sentPromptAsync[0]?.intentID)
+    expect(sentPromptAsync[0]?.intentVariant).toBe("original")
     expect(sentPromptAsync[0]?.metadata).toEqual({
       deepagent: {
         agent_mode_override: "general",

packages/app/src/components/prompt-input/submit.ts

@@ -57,6 +57,7 @@ export type DeepAgentPromptPrepareResult = {
   route: "code" | "general"
   goal: string
   preview: string
+  intent_id?: string
 }
 
 export type DeepAgentPromptConfirmResult = { editedGoal: string }
@@ -94,6 +95,8 @@ type FollowupSendInput = {
   sync: ReturnType<typeof useSync>
   draft: FollowupDraft
   messageID?: string
+  intentID?: string
+  intentSource?: "composer" | "intelligence" | "followup" | "rewrite"
   optimisticBusy?: boolean
   before?: () => Promise<boolean> | boolean
   onBeforeSubmit?: () => void
@@ -121,6 +124,8 @@ async function prepareDeepAgentPromptDraft(input: {
   mode: DeepAgentPromptModeForConfirmation
   outputLanguage: DeepAgentPromptOutputLanguage
   parts: SessionPromptAsyncInput["parts"]
+  intentID: string
+  intentSource: "composer" | "intelligence" | "followup" | "rewrite"
   signal?: AbortSignal
   onProgress?: (preview: string) => void
 }) {
@@ -132,6 +137,8 @@ async function prepareDeepAgentPromptDraft(input: {
     body: {
       mode: input.mode,
       output_language: input.outputLanguage,
+      intent_id: input.intentID,
+      intent_source: input.intentSource,
       parts: input.parts,
     },
     headers: {
@@ -253,6 +260,7 @@ export async function sendFollowupDraft(input: FollowupSendInput) {
   }
 
   const messageID = input.messageID ?? Identifier.ascending("message")
+  const intentID = input.intentID ?? Identifier.ascending("message")
   const buildParts = (promptText: string) =>
     buildRequestParts({
       prompt: input.draft.prompt,
@@ -287,9 +295,14 @@ export async function sendFollowupDraft(input: FollowupSendInput) {
         mode,
         outputLanguage: input.promptOutputLanguage ?? "english",
         parts: preparedParts.requestParts,
+        intentID,
+        intentSource: input.intentSource ?? "intelligence",
         signal: input.promptPrepareSignal,
         onProgress: input.onPromptPrepareProgress,
       })
+      if (prepared.intent_id && prepared.intent_id !== intentID) {
+        throw new Error("Prompt draft prepare returned a different intent")
+      }
     } catch (err) {
       setIdle()
       input.onPromptPrepareEnd?.()
@@ -370,6 +383,9 @@ export async function sendFollowupDraft(input: FollowupSendInput) {
       agent: input.draft.agent,
       model: input.draft.model,
       messageID,
+      intentID,
+      intentSource: input.intentSource ?? (mode ? "intelligence" : "composer"),
+      intentVariant: confirmedDraft ? "rewritten" : "original",
       parts: submittedParts.requestParts,
       variant: input.draft.variant,
       metadata,
@@ -763,6 +779,7 @@ export function createPromptSubmit(input: PromptSubmitInput) {
 
     const commentItems = context.filter((item) => item.type === "file" && !!item.comment?.trim())
     const messageID = Identifier.ascending("message")
+    const intentID = Identifier.ascending("message")
     const preparesPromptDraft = promptPipelineMode(draft.metadata) === "intelligence"
     const controller = new AbortController()
 
@@ -851,6 +868,8 @@ export function createPromptSubmit(input: PromptSubmitInput) {
       serverSync,
       draft,
       messageID,
+      intentID,
+      intentSource: preparesPromptDraft ? "intelligence" : "composer",
       optimisticBusy: sessionDirectory === projectDirectory,
       before: waitForWorktree,
       onBeforeSubmit: () => {

packages/app/src/pages/session.tsx

@@ -1457,6 +1457,8 @@ export default function Page() {
         sync,
         serverSync,
         draft: item,
+        intentID: item.id,
+        intentSource: "followup",
         optimisticBusy: item.sessionDirectory === sdk.directory,
         confirmPromptDraft,
       }).catch((err) => {

packages/core/src/database/migration.gen.ts

@@ -0,0 +1,35 @@
+import { Effect } from "effect"
+import type { DatabaseMigration } from "../migration"
+
+export default {
+  id: "20260806051000_session_prompt_intent",
+  up(tx) {
+    return Effect.gen(function* () {
+      yield* tx.run(`
+        CREATE TABLE session_intent (
+          intent_id TEXT PRIMARY KEY,
+          session_id TEXT NOT NULL REFERENCES session(id) ON DELETE CASCADE,
+          source TEXT NOT NULL CHECK (source IN ('composer', 'intelligence', 'followup', 'rewrite')),
+          state TEXT NOT NULL CHECK (state IN ('preparing', 'admitting', 'admitted', 'canceled', 'superseded', 'failed')),
+          selected_variant TEXT CHECK (selected_variant IN ('original', 'rewritten')),
+          selected_payload_hash TEXT,
+          delivery TEXT CHECK (delivery IN ('turn', 'steer', 'queue', 'goal_steer')),
+          admitted_message_id TEXT,
+          correlation_id TEXT,
+          owner_token TEXT,
+          lease_expires_at INTEGER,
+          version INTEGER NOT NULL DEFAULT 0,
+          time_created INTEGER NOT NULL,
+          time_selected INTEGER,
+          time_admitted INTEGER,
+          time_updated INTEGER NOT NULL,
+          UNIQUE (session_id, intent_id)
+        )
+      `)
+      yield* tx.run(`
+        CREATE INDEX session_intent_session_state_idx
+        ON session_intent (session_id, state, time_created)
+      `)
+    })
+  },
+} satisfies DatabaseMigration.Migration

packages/core/src/database/migration/20260806051000_session_prompt_intent.ts

@@ -212,6 +212,37 @@ export const SessionSteerTable = sqliteTable(
   ],
 )
 
+export const SessionIntentTable = sqliteTable(
+  "session_intent",
+  {
+    intent_id: text().primaryKey(),
+    session_id: text()
+      .$type<SessionSchema.ID>()
+      .notNull()
+      .references(() => SessionTable.id, { onDelete: "cascade" }),
+    source: text().$type<"composer" | "intelligence" | "followup" | "rewrite">().notNull(),
+    state: text()
+      .$type<"preparing" | "admitting" | "admitted" | "canceled" | "superseded" | "failed">()
+      .notNull(),
+    selected_variant: text().$type<"original" | "rewritten">(),
+    selected_payload_hash: text(),
+    delivery: text().$type<"turn" | SessionInput.Delivery>(),
+    admitted_message_id: text(),
+    correlation_id: text(),
+    owner_token: text(),
+    lease_expires_at: integer(),
+    version: integer().notNull().default(0),
+    time_created: integer().notNull(),
+    time_selected: integer(),
+    time_admitted: integer(),
+    time_updated: integer().notNull(),
+  },
+  (table) => [
+    uniqueIndex("session_intent_session_intent_idx").on(table.session_id, table.intent_id),
+    index("session_intent_session_state_idx").on(table.session_id, table.state, table.time_created),
+  ],
+)
+
 export const SessionContextEpochTable = sqliteTable("session_context_epoch", {
   session_id: text()
     .$type<SessionSchema.ID>()

packages/core/src/session/sql.ts

@@ -20,7 +20,7 @@ import {
   WorkspaceRoutingQuery,
   WorkspaceRoutingQueryFields,
 } from "../middleware/workspace-routing"
-import { ApiNotFoundError, InvalidRequestError, PermissionNotFoundError, SessionBusyError } from "../errors"
+import { ApiNotFoundError, ConflictError, InvalidRequestError, PermissionNotFoundError, SessionBusyError } from "../errors"
 import { described } from "./metadata"
 import { QueryBoolean } from "./query"
 import { ProviderV2 } from "@deepagent-code/core/provider"
@@ -77,6 +77,8 @@ export const PromptPreparePayload = Schema.Struct({
   // normalizes internally. Do NOT drop "wish" from this union.
   mode: Schema.Literals(["wish", "intelligence"]),
   output_language: Schema.optional(Schema.Literals(["chinese", "english"])),
+  intent_id: Schema.optional(Schema.String),
+  intent_source: Schema.optional(Schema.Literals(["composer", "intelligence", "followup", "rewrite"])),
   parts: SessionPrompt.PromptInput.fields.parts,
 })
 export const PromptPrepareResult = Schema.Struct({
@@ -88,6 +90,7 @@ export const PromptPrepareResult = Schema.Struct({
   route: Schema.Union([Schema.Literal("code"), Schema.Literal("general")]),
   goal: Schema.String,
   preview: Schema.String,
+  intent_id: Schema.optional(Schema.String),
 })
 // A3 macro-round: the latest persisted next-round suggestion for human approval. `null` body when
 // no suggestion exists yet.
@@ -495,7 +498,7 @@ export const SessionApi = HttpApi.make("session")
           query: WorkspaceRoutingQuery,
           payload: PromptPreparePayload,
           success: described(PromptPrepareResult, "Prepared prompt draft"),
-          error: [HttpApiError.BadRequest, InvalidRequestError, ApiNotFoundError],
+          error: [HttpApiError.BadRequest, ConflictError, InvalidRequestError, ApiNotFoundError],
         }).annotateMerge(
           OpenApi.annotations({
             identifier: "session.prompt_prepare",
@@ -508,7 +511,7 @@ export const SessionApi = HttpApi.make("session")
           query: WorkspaceRoutingQuery,
           payload: PromptPreparePayload,
           success: Schema.String,
-          error: [HttpApiError.BadRequest, InvalidRequestError, ApiNotFoundError],
+          error: [HttpApiError.BadRequest, ConflictError, InvalidRequestError, ApiNotFoundError],
         }).annotateMerge(
           OpenApi.annotations({
             identifier: "session.prompt_prepare_stream",
@@ -535,7 +538,7 @@ export const SessionApi = HttpApi.make("session")
           query: WorkspaceRoutingQuery,
           payload: PromptPayload,
           success: described(HttpApiSchema.NoContent, "Prompt accepted"),
-          error: [HttpApiError.BadRequest, ApiNotFoundError],
+          error: [HttpApiError.BadRequest, ConflictError, ApiNotFoundError],
         }).annotateMerge(
           OpenApi.annotations({
             identifier: "session.prompt_async",