@shawnstack/quickforge 1.6.12 → 1.7.0

package/server/agent-manager.mjs

@@ -28,11 +28,14 @@ import {
 import { projectContextFromId, defaultGlobalWorkspaceContext, readProjectConfig } from './project-config.mjs'
 import { ensureStorage, readStore, atomicUpdate, atomicSessionMetadataUpdate, readSessionValue, writeSessionValue, deleteSessionValue, tempAgentsDir } from './storage.mjs'
 import { logger } from './utils/logger.mjs'
+import { withSessionPersistenceLock } from './session-persistence-lock.mjs'
 import { getGlobalMemoryRevision, isGlobalMemoryEnabled } from './global-memory.mjs'
 import { buildSystemPrompt, generateAiTitle, generateTitle } from './session-utils.mjs'
 import { restoreReasoningContentInPayload } from './reasoning-cache.mjs'
 import {
   compactConversation,
+  compactionMessageDetails,
+  isCompactSummaryMessage,
   parseCompactArgs,
   saveCompactBackup,
 } from './conversation-compaction.mjs'
@@ -93,6 +96,8 @@ async function createServerTools(projectId, projectContext, skillsContext, inclu
     includeMcpTools = true,
     includePluginTools = true,
     parentSessionId = null,
+    sessionId = null,
+    scope = 'global',
   } = options
   const allowedTools = allowedToolNames ? new Set(allowedToolNames) : null
   const isAllowed = (definition) => !allowedTools || allowedTools.has(definition.name)
@@ -107,7 +112,11 @@ async function createServerTools(projectId, projectContext, skillsContext, inclu
     projectSkillNames: skillsContext.projectSkillNames,
     workspaceRoot: projectContext?.workspaceRoot,
   })
-  const toolContext = { ...projectContext, ...skillToolContext }
+  const toolContext = {
+    ...projectContext,
+    ...skillToolContext,
+    ...(sessionId ? { sessionId, scope, projectId } : {}),
+  }
   const tools = skillTools
     .filter(isAllowed)
     .map((definition) => wrapToolDefinition(definition, toolContext, toolPermissions))
@@ -150,8 +159,14 @@ async function rebuildSessionTools(session) {
           includeSubagentTool: false,
           includeMcpTools: false,
           parentSessionId: session.sessionId,
+          sessionId: session.sessionId,
+          scope: session.scope,
         }
-      : { parentSessionId: session.sessionId },
+      : {
+          parentSessionId: session.sessionId,
+          sessionId: session.sessionId,
+          scope: session.scope,
+        },
   )
 }
 
@@ -329,7 +344,7 @@ function createAutoCompactApprovalPromise(session, details = {}) {
   })
 }
 
-function assistantTextMessage(text, model) {
+function assistantTextMessage(text, model, details) {
   return {
     role: 'assistant',
     content: [{ type: 'text', text }],
@@ -346,14 +361,16 @@ function assistantTextMessage(text, model) {
     },
     stopReason: 'stop',
     timestamp: Date.now(),
+    ...(details ? { details } : {}),
   }
 }
 
-function userTextMessage(text) {
+function userTextMessage(text, details) {
   return {
     role: 'user',
     content: [{ type: 'text', text }],
     timestamp: Date.now(),
+    ...(details ? { details } : {}),
   }
 }
 
@@ -523,12 +540,12 @@ async function summarySession(session, initialUserMessage, summaryOptions) {
       '<compact_summary>',
       result.summary,
       '</compact_summary>',
-    ].join('\n'))
+    ].join('\n'), compactionMessageDetails('summary'))
     const notice = assistantTextMessage([
       `已基于当前对话创建压缩后的新对话：原 ${result.originalCount} 条消息 → ${result.recentTail.length + 2} 条消息。`,
       `当前原对话已完整保留，保留最近 ${result.keepTurns} 个用户回合原文，估算新对话上下文减少约 ${reduction}%。`,
       '压缩前历史已保存到本地备份。',
-    ].join('\n'), session.model)
+    ].join('\n'), session.model, compactionMessageDetails('notice'))
 
     const compactedMessages = [summaryMessage, notice, ...result.recentTail]
     const titleSourceMessages = [summaryMessage, ...result.recentTail]
@@ -700,7 +717,8 @@ async function clearSession(session) {
   session.startedAt = null
   session.finishedAt = new Date().toISOString()
   session.title = 'New chat'
-  session.titleGenerated = false
+  session.titleSource = 'default'
+  session.titleGenerationId += 1
   session.agent.state.isStreaming = false
   session.agent.state.streamingMessage = undefined
   session.agent.state.errorMessage = undefined
@@ -776,6 +794,15 @@ async function resolveCommandState(session, userMessage, promptCommand = null) {
   if (internalResponse?.plan) {
     return planCommandState(userMessage, internalResponse.args)
   }
+  if (internalResponse?.init) {
+    if (!session.projectId) return { textResponse: 'Initialization requires an active project chat.' }
+    return {
+      userMessage,
+      commandPrompt: formatInitCommandPrompt(),
+      permissions: { allowEdit: true, allowCommands: true, allowSubagents: true },
+      commandName: 'init',
+    }
+  }
   if (internalResponse?.review) {
     return {
       userMessage,
@@ -817,6 +844,53 @@ async function resolveCommandState(session, userMessage, promptCommand = null) {
   }
 }
 
+function formatInitCommandPrompt() {
+  return `<init_command_invocation name="init">
+This /init command applies only to the current user request. Work in the current repository root. Inspect the repository as needed, then create or update the root-level \`AGENTS.md\`. If the file already exists, read it first and preserve useful repository-specific guidance while bringing it in line with the requirements below. Do not modify unrelated files.
+
+Generate a file named AGENTS.md that serves as a contributor guide for this repository.
+Your goal is to produce a clear, concise, and well-structured document with descriptive headings and actionable explanations for each section.
+Follow the outline below, but adapt as needed — add sections if relevant, and omit those that do not apply to this project.
+
+Document Requirements
+
+- Title the document "Repository Guidelines".
+- Use Markdown headings (#, ##, etc.) for structure.
+- Keep the document concise. 200-400 words is optimal.
+- Keep explanations short, direct, and specific to this repository.
+- Provide examples where helpful (commands, directory paths, naming patterns).
+- Maintain a professional, instructional tone.
+
+Recommended Sections
+
+Project Structure & Module Organization
+
+- Outline the project structure, including where the source code, tests, and assets are located.
+
+Build, Test, and Development Commands
+
+- List key commands for building, testing, and running locally (e.g., npm test, make build).
+- Briefly explain what each command does.
+
+Coding Style & Naming Conventions
+
+- Specify indentation rules, language-specific style preferences, and naming patterns.
+- Include any formatting or linting tools used.
+
+Testing Guidelines
+
+- Identify testing frameworks and coverage requirements.
+- State test naming conventions and how to run tests.
+
+Commit & Pull Request Guidelines
+
+- Summarize commit message conventions found in the project’s Git history.
+- Outline pull request requirements (descriptions, linked issues, screenshots, etc.).
+
+(Optional) Add other sections if relevant, such as Security & Configuration Tips, Architecture Overview, or Agent-Specific Instructions.
+</init_command_invocation>`
+}
+
 function formatPlanCommandPrompt(task) {
   const taskText = String(task || '').trim()
   return `<plan_command_invocation name="plan">
@@ -1247,14 +1321,7 @@ function applyActiveCapabilityPrompt(messages, capabilityPrompt) {
 
 function compactSummaryIndex(messages) {
   for (let index = messages.length - 1; index >= 0; index--) {
-    const message = messages[index]
-    const content = message?.content
-    const text = typeof content === 'string'
-      ? content
-      : Array.isArray(content)
-        ? content.filter((block) => block?.type === 'text').map((block) => block.text ?? '').join('\n')
-        : ''
-    if (message?.role === 'user' && text.includes('<compact_summary>')) return index
+    if (isCompactSummaryMessage(messages[index])) return index
   }
   return -1
 }
@@ -1372,11 +1439,13 @@ export async function createAgent(sessionId, config = {}) {
     messages = [],
     systemPrompt = null,
     title = 'New chat',
+    titleSource = title === 'New chat' ? 'default' : 'manual',
     createdAt = new Date().toISOString(),
     lastModified = null,
     contextCompaction = null,
     agentProfile = null,
     idleRetention = null,
+    stateVersion = 0,
   } = config
   const accessMode = normalizeAccessMode(rawAccessMode, yoloMode)
   const resolvedYoloMode = yoloModeFromAccessMode(accessMode)
@@ -1450,8 +1519,14 @@ export async function createAgent(sessionId, config = {}) {
           includeSubagentTool: false,
           includeMcpTools: false,
           parentSessionId: sessionId,
+          sessionId,
+          scope,
         }
-      : { parentSessionId: sessionId },
+      : {
+          parentSessionId: sessionId,
+          sessionId,
+          scope,
+        },
   )
 
   // Resolve API key
@@ -1531,6 +1606,7 @@ export async function createAgent(sessionId, config = {}) {
     thinkingLevel: resolvedThinkingLevel,
     scope,
     title,
+    titleSource,
     createdAt,
     lastModified,
     globalSkillNames: skillsContext.globalSkillNames,
@@ -1544,7 +1620,10 @@ export async function createAgent(sessionId, config = {}) {
     eventBus,
     idleTimer: null,
     persistTimer: null,
-    titleGenerated: false,
+    titleGenerationId: 0,
+    titleGenerationPromise: null,
+    titleGenerationPromiseId: null,
+    sessionCreatedEmitted: messages.length > 0,
     toolTimings: new Map(),
     getApiKey,
     contextCompaction,
@@ -1552,7 +1631,7 @@ export async function createAgent(sessionId, config = {}) {
     idleRetention,
     lastTransformedContextMessages: null,
     autoCompacting: false,
-    stateVersion: 0,
+    stateVersion: Number.isFinite(stateVersion) ? Math.max(0, stateVersion) : 0,
     lastAutoCompactAt: null,
     lastAutoCompactRejected: null,
     memoryEnabled: initialMemoryEnabled,
@@ -1623,11 +1702,17 @@ export async function createAgent(sessionId, config = {}) {
       const isInitialUserMessage = (event.message?.role === 'user' || event.message?.role === 'user-with-attachments')
         && session.agent.state.messages.length === 1
       if (isInitialUserMessage) {
-        // External ACP channels run in a separate process from the web UI. Persist
-        // the first user message immediately so the session becomes visible on
-        // disk before a long/failed agent run can exit or be restarted.
+        // Persist the first user message before announcing the session or
+        // starting the asynchronous AI title request.
         try {
-          await flushSessionPersist(session)
+          const metadata = await flushSessionPersist(session)
+          if (metadata) {
+            if (!session.sessionCreatedEmitted) {
+              session.sessionCreatedEmitted = true
+              emitSessionEvent(session, { type: 'session_created', metadata })
+            }
+            scheduleSessionTitleGeneration(session, event.message)
+          }
         } catch (err) {
           logger.error(`Failed to persist initial user message for session ${sessionId}:`, err, { sessionId })
         }
@@ -1672,8 +1757,8 @@ function sessionLastModifiedFromMessages(messages, fallback) {
 /**
  * Persist session data to storage.
  */
-async function persistSession(session) {
-  const { sessionId, agent, scope, projectId, title, createdAt, lastModified: storedLastModified, status, startedAt, finishedAt, model, thinkingLevel, accessMode, yoloMode, contextCompaction } = session
+async function persistSessionUnlocked(session) {
+  const { sessionId, agent, scope, projectId, title, titleSource, createdAt, lastModified: storedLastModified, status, startedAt, finishedAt, model, thinkingLevel, accessMode, yoloMode, contextCompaction } = session
   const messages = agent.state.messages
 
   if (messages.length === 0) {
@@ -1694,6 +1779,7 @@ async function persistSession(session) {
   const sessionData = {
     id: sessionId,
     title,
+    titleSource,
     model,
     thinkingLevel,
     accessMode,
@@ -1708,6 +1794,7 @@ async function persistSession(session) {
     taskFinishedAt: finishedAt,
     contextCompaction: contextCompaction || undefined,
     idleRetention: session.idleRetention || undefined,
+    stateVersion: Number.isFinite(session.stateVersion) ? session.stateVersion : 0,
   }
   session.lastModified = lastModified
 
@@ -1744,6 +1831,7 @@ async function persistSession(session) {
   const metadata = {
     id: sessionId,
     title,
+    titleSource,
     createdAt: createdAt || now,
     lastModified,
     messageCount: messages.length,
@@ -1788,7 +1876,14 @@ async function persistSession(session) {
     }
   } catch (err) {
     logger.error(`Failed to persist session ${sessionId}:`, err, { sessionId })
+    return null
   }
+
+  return metadata
+}
+
+async function persistSession(session) {
+  return withSessionPersistenceLock(() => persistSessionUnlocked(session))
 }
 
 export async function persistSessionState(session) {
@@ -1830,7 +1925,7 @@ async function flushSessionPersist(session) {
     clearTimeout(session.persistTimer)
     session.persistTimer = null
   }
-  await persistSession(session)
+  return persistSession(session)
 }
 
 export function rollbackStartIndexFromMessage(messages, messageIndex) {
@@ -1888,6 +1983,39 @@ export async function rollbackSessionMessages(sessionId, rollbackMessageIndex) {
   return { session: getSessionState(sessionId), rollbackIndex }
 }
 
+export function canApplyGeneratedTitle(session, generationId, expectedTitle) {
+  return session.titleGenerationId === generationId
+    && session.titleSource === 'fallback'
+    && session.title === expectedTitle
+}
+
+function scheduleSessionTitleGeneration(session, userMessage) {
+  if (session.titleSource !== 'fallback') return
+  if (session.titleGenerationPromise && session.titleGenerationPromiseId === session.titleGenerationId) return
+  const generationId = ++session.titleGenerationId
+  const expectedTitle = session.title
+  const promise = generateAiTitle([userMessage], session.model, session.thinkingLevel, session.getApiKey)
+    .then(async (aiTitle) => {
+      if (!aiTitle || aiTitle === 'New chat') return
+      if (!canApplyGeneratedTitle(session, generationId, expectedTitle)) return
+      session.title = aiTitle
+      session.titleSource = 'ai'
+      await persistSession(session)
+      emitSessionEvent(session, { type: 'title_updated', title: aiTitle, titleSource: 'ai' })
+    })
+    .catch((err) => {
+      logger.warn(`Title generation failed for session ${session.sessionId}:`, err.message || err, { sessionId: session.sessionId })
+    })
+    .finally(() => {
+      if (session.titleGenerationPromise === promise) {
+        session.titleGenerationPromise = null
+        session.titleGenerationPromiseId = null
+      }
+    })
+  session.titleGenerationPromise = promise
+  session.titleGenerationPromiseId = generationId
+}
+
 /**
  * Send a user message to the agent and start the agent loop.
  * Returns immediately; events are streamed via the event bus.
@@ -1940,24 +2068,14 @@ export async function runPrompt(sessionId, message, selectedCapabilities = [], p
     return compactSession(session, initialUserMessage, commandState.compact)
   }
 
-  // AI title generation on first user message (fire-and-forget, before agent runs)
-  if (!session.titleGenerated && session.title === 'New chat') {
-    // Set a simple fallback title immediately so the sidebar shows something
-    // meaningful even if AI title generation fails or is slow.
+  // Set a meaningful fallback immediately. The AI title request starts only
+  // after the first user message has been persisted by the message_end handler.
+  if (session.titleSource === 'default' && session.title === 'New chat') {
     const simpleTitle = generateTitle([userMessage])
+    session.titleSource = 'fallback'
     if (simpleTitle !== 'New chat') {
       session.title = simpleTitle
     }
-    session.titleGenerated = true
-    generateAiTitle([userMessage], session.model, session.thinkingLevel, session.getApiKey).then(async (aiTitle) => {
-      if (aiTitle && aiTitle !== 'New chat') {
-        session.title = aiTitle
-        await persistSession(session)
-        emitSessionEvent(session, { type: 'title_updated', title: aiTitle })
-      }
-    }).catch((err) => {
-      logger.warn(`Title generation failed for session ${sessionId}:`, err.message || err, { sessionId })
-    })
   }
 
   session.activeCommandName = commandState.commandName ?? null
@@ -2142,6 +2260,7 @@ export function getSessionState(sessionId) {
     model: session.model,
     thinkingLevel: session.thinkingLevel,
     title: session.title,
+    titleSource: session.titleSource,
     createdAt: session.createdAt,
     lastModified: session.lastModified,
     stateVersion: session.stateVersion || 0,
@@ -2289,10 +2408,12 @@ export async function restoreAgent(sessionId) {
       thinkingLevel: sessionData.thinkingLevel || 'off',
       messages: sessionData.messages || [],
       title: sessionData.title || 'New chat',
+      titleSource: sessionData.titleSource || (sessionData.title && sessionData.title !== 'New chat' ? 'ai' : 'default'),
       createdAt: sessionData.createdAt,
       lastModified: sessionData.lastModified,
       contextCompaction: sessionData.contextCompaction || null,
       idleRetention: sessionData.idleRetention || null,
+      stateVersion: sessionData.stateVersion,
     })
   } catch (err) {
     logger.error(`Failed to restore agent ${sessionId}:`, err, { sessionId })
@@ -2387,6 +2508,28 @@ export async function refreshAllSessionTools() {
   return result
 }
 
+export async function updateSessionTitle(sessionId, title) {
+  let session = agentSessions.get(sessionId)
+  if (!session) session = await restoreAgent(sessionId)
+  if (!session) {
+    throw Object.assign(new Error('Session not found'), { statusCode: 404 })
+  }
+  const normalizedTitle = typeof title === 'string' ? title.trim() : ''
+  if (!normalizedTitle) {
+    throw Object.assign(new Error('Title must not be empty'), { statusCode: 400 })
+  }
+  if (normalizedTitle.length > 200) {
+    throw Object.assign(new Error('Title is too long'), { statusCode: 400 })
+  }
+
+  session.titleGenerationId += 1
+  session.title = normalizedTitle
+  session.titleSource = 'manual'
+  await persistSession(session)
+  emitSessionEvent(session, { type: 'title_updated', title: normalizedTitle, titleSource: 'manual' })
+  return { sessionId, title: normalizedTitle, titleSource: 'manual' }
+}
+
 export async function updateSessionAccessMode(sessionId, accessMode) {
   const session = agentSessions.get(sessionId)
   if (!session) {

package/server/auto-archive.mjs

@@ -0,0 +1,137 @@
+import { atomicSessionValueUpdate, atomicUpdate, readSessionValue, readStore } from './storage.mjs'
+import { logger } from './utils/logger.mjs'
+import { withSessionPersistenceLock } from './session-persistence-lock.mjs'
+
+const defaultStorage = { atomicSessionValueUpdate, atomicUpdate, readSessionValue, readStore }
+
+export const AUTO_ARCHIVE_SETTINGS_KEY = 'auto-archive-settings'
+export const AUTO_ARCHIVE_AFTER_MS = 30 * 24 * 60 * 60 * 1000
+const AUTO_ARCHIVE_CHECK_INTERVAL_MS = 24 * 60 * 60 * 1000
+
+let autoArchiveTimer = null
+let autoArchiveRunning = false
+
+export function normalizeAutoArchiveSettings(value) {
+  if (!value || typeof value !== 'object') return { enabled: false }
+  return { enabled: value.enabled === true }
+}
+
+function parseTimestamp(value) {
+  if (typeof value === 'number' && Number.isFinite(value)) return value
+  if (typeof value !== 'string') return null
+  const normalized = value.trim()
+  if (!normalized) return null
+  const numeric = Number(normalized)
+  if (Number.isFinite(numeric)) return numeric
+  const timestamp = Date.parse(normalized)
+  return Number.isNaN(timestamp) ? null : timestamp
+}
+
+function latestMessageTimestamp(messages) {
+  if (!Array.isArray(messages)) return null
+  let latest = null
+  for (const message of messages) {
+    const timestamp = parseTimestamp(message?.timestamp)
+    if (timestamp !== null && (latest === null || timestamp > latest)) latest = timestamp
+  }
+  return latest
+}
+
+export function sessionActivityTime(...values) {
+  let latest = null
+  for (const value of values) {
+    if (!value || typeof value !== 'object') continue
+    for (const candidate of [
+      parseTimestamp(value.lastModified),
+      latestMessageTimestamp(value.messages),
+      parseTimestamp(value.createdAt),
+    ]) {
+      if (candidate !== null && (latest === null || candidate > latest)) latest = candidate
+    }
+  }
+  return latest
+}
+
+async function archiveInactiveSessionsUnlocked(options = {}) {
+  const storage = options.storage || defaultStorage
+  const settings = await storage.readStore('settings')
+  if (!normalizeAutoArchiveSettings(settings[AUTO_ARCHIVE_SETTINGS_KEY]).enabled) {
+    return { archivedCount: 0, disabled: true }
+  }
+
+  const now = Number.isFinite(options.now) ? options.now : Date.now()
+  const cutoff = now - AUTO_ARCHIVE_AFTER_MS
+  const archivedAt = new Date(now).toISOString()
+  const metadataStore = await storage.readStore('sessions-metadata')
+  const candidates = []
+
+  for (const [sessionId, metadata] of Object.entries(metadataStore)) {
+    if (!metadata || metadata.archivedAt || metadata.messageCount === 0 || metadata.taskStatus === 'running') continue
+    const session = await storage.readSessionValue(sessionId)
+    if (!session || session.archivedAt) continue
+    const activityTime = sessionActivityTime(metadata, session)
+    if (activityTime === null || activityTime >= cutoff) continue
+    candidates.push(sessionId)
+  }
+
+  const archivedSessionIds = []
+  for (const sessionId of candidates) {
+    const updatedSession = await storage.atomicSessionValueUpdate(sessionId, (session) => {
+      const activityTime = sessionActivityTime(session)
+      if (session.archivedAt || activityTime === null || activityTime >= cutoff) return session
+      return { ...session, archivedAt }
+    })
+    if (!updatedSession || updatedSession.archivedAt !== archivedAt) continue
+
+    let metadataArchived = false
+    await storage.atomicUpdate('sessions-metadata', (current) => {
+      const metadata = current[sessionId]
+      const activityTime = sessionActivityTime(metadata, updatedSession)
+      if (!metadata || metadata.archivedAt || metadata.messageCount === 0 || metadata.taskStatus === 'running' || activityTime === null || activityTime >= cutoff) {
+        return current
+      }
+      current[sessionId] = { ...metadata, archivedAt }
+      metadataArchived = true
+      return current
+    })
+
+    if (metadataArchived) {
+      archivedSessionIds.push(sessionId)
+    } else {
+      await storage.atomicSessionValueUpdate(sessionId, (session) => {
+        if (session.archivedAt !== archivedAt) return session
+        const next = { ...session }
+        delete next.archivedAt
+        return next
+      })
+    }
+  }
+
+  if (archivedSessionIds.length > 0) logger.info(`Automatically archived ${archivedSessionIds.length} inactive conversation(s).`)
+  return { archivedCount: archivedSessionIds.length, archivedSessionIds, archivedAt }
+}
+
+export async function archiveInactiveSessions(options = {}) {
+  if (autoArchiveRunning) return { archivedCount: 0, skipped: true }
+  autoArchiveRunning = true
+  try {
+    return await withSessionPersistenceLock(() => archiveInactiveSessionsUnlocked(options))
+  } finally {
+    autoArchiveRunning = false
+  }
+}
+
+export function startAutoArchiveRunner() {
+  if (autoArchiveTimer) return
+  autoArchiveTimer = setInterval(() => {
+    archiveInactiveSessions().catch((error) => logger.error('Automatic conversation archive failed:', error))
+  }, AUTO_ARCHIVE_CHECK_INTERVAL_MS)
+  autoArchiveTimer.unref?.()
+  archiveInactiveSessions().catch((error) => logger.error('Initial automatic conversation archive failed:', error))
+}
+
+export function stopAutoArchiveRunner() {
+  if (!autoArchiveTimer) return
+  clearInterval(autoArchiveTimer)
+  autoArchiveTimer = null
+}

package/server/auto-compaction.mjs

@@ -1,5 +1,11 @@
 import { readStore } from './storage.mjs'
-import { compactConversation, saveCompactBackup } from './conversation-compaction.mjs'
+import {
+  compactConversation,
+  compactionMessageDetails,
+  extractCompactSummaryText,
+  isCompactSummaryMessage,
+  saveCompactBackup,
+} from './conversation-compaction.mjs'
 import { estimateContextUsage, shouldCompactContextByPercent } from './context-usage.mjs'
 
 export const AUTO_COMPACT_SETTINGS_KEY = 'auto-compact-settings'
@@ -7,7 +13,7 @@ export const AUTO_COMPACT_SETTINGS_KEY = 'auto-compact-settings'
 export const DEFAULT_AUTO_COMPACT_SETTINGS = {
   enabled: true,
   thresholdPercent: 80,
-  keepRecentTurns: 2,
+  keepRecentTurns: 3,
   minSourceChars: 1600,
   requireConfirmation: true,
 }
@@ -66,7 +72,8 @@ function estimateMessagesChars(messages) {
 }
 
 function isUserMessage(message) {
-  return message?.role === 'user' || message?.role === 'user-with-attachments'
+  return (message?.role === 'user' || message?.role === 'user-with-attachments')
+    && !isCompactSummaryMessage(message)
 }
 
 function tailStartForRecentTurns(messages, keepRecentTurns) {
@@ -108,22 +115,12 @@ function clearAutoCompactRejected(session) {
   session.lastAutoCompactRejected = null
 }
 
-function compactSummaryText(message) {
-  const content = message?.content
-  const text = typeof content === 'string'
-    ? content
-    : Array.isArray(content)
-      ? content.filter((block) => block?.type === 'text').map((block) => block.text || '').join('\n')
-      : ''
-  const match = text.match(/<compact_summary>\s*([\s\S]*?)\s*<\/compact_summary>/)
-  return match?.[1]?.trim() || text.trim()
-}
-
-function userTextMessage(text) {
+function userTextMessage(text, details) {
   return {
     role: 'user',
     content: [{ type: 'text', text }],
     timestamp: Date.now(),
+    ...(details ? { details } : {}),
   }
 }
 
@@ -135,9 +132,9 @@ function buildCompactionSourceMessages(session, messages, tailStart) {
       'Existing rolling compact summary from earlier conversation history:',
       '',
       '<compact_summary>',
-      compactSummaryText(previousSummary),
+      extractCompactSummaryText(previousSummary),
       '</compact_summary>',
-    ].join('\n')))
+    ].join('\n'), compactionMessageDetails('summary')))
   }
   source.push(...messages.slice(session.contextCompaction?.compactedUpToIndex || 0, tailStart))
   return source
@@ -190,7 +187,7 @@ export async function compactSessionInPlace({
     '<compact_summary>',
     result.summary,
     '</compact_summary>',
-  ].join('\n'))
+  ].join('\n'), compactionMessageDetails('summary'))
   session.contextCompaction = {
     summaryMessage,
     compactedUpToIndex: tailStart,