@geekbeer/minion 3.11.5 → 3.13.0

package/core/db.js

@@ -195,6 +195,7 @@ function initSchema(db) {
     -- ==================== chat_sessions ====================
     CREATE TABLE IF NOT EXISTS chat_sessions (
       session_id TEXT PRIMARY KEY,
+      workspace_id TEXT,
       turn_count INTEGER NOT NULL DEFAULT 0,
       created_at INTEGER NOT NULL,
       updated_at INTEGER NOT NULL
@@ -390,57 +391,87 @@ function migrateSchema(db) {
   }
 
   if (currentVersion < 2) {
-    console.log('[DB] Migration 2: Adding emails FTS5...')
-
-    db.exec(`
-      CREATE VIRTUAL TABLE IF NOT EXISTS emails_fts USING fts5(
-        subject,
-        body_text,
-        content=emails,
-        content_rowid=rowid,
-        tokenize='trigram'
-      );
-
-      CREATE TRIGGER IF NOT EXISTS emails_ai AFTER INSERT ON emails BEGIN
-        INSERT INTO emails_fts(rowid, subject, body_text)
-          VALUES (new.rowid, new.subject, new.body_text);
-      END;
+    try {
+      console.log('[DB] Migration 2: Adding emails FTS5...')
+
+      db.exec(`
+        CREATE VIRTUAL TABLE IF NOT EXISTS emails_fts USING fts5(
+          subject,
+          body_text,
+          content=emails,
+          content_rowid=rowid,
+          tokenize='trigram'
+        );
+
+        CREATE TRIGGER IF NOT EXISTS emails_ai AFTER INSERT ON emails BEGIN
+          INSERT INTO emails_fts(rowid, subject, body_text)
+            VALUES (new.rowid, new.subject, new.body_text);
+        END;
+
+        CREATE TRIGGER IF NOT EXISTS emails_ad AFTER DELETE ON emails BEGIN
+          INSERT INTO emails_fts(emails_fts, rowid, subject, body_text)
+            VALUES ('delete', old.rowid, old.subject, old.body_text);
+        END;
+
+        CREATE TRIGGER IF NOT EXISTS emails_au AFTER UPDATE ON emails BEGIN
+          INSERT INTO emails_fts(emails_fts, rowid, subject, body_text)
+            VALUES ('delete', old.rowid, old.subject, old.body_text);
+          INSERT INTO emails_fts(rowid, subject, body_text)
+            VALUES (new.rowid, new.subject, new.body_text);
+        END;
+
+        INSERT INTO emails_fts(emails_fts) VALUES ('rebuild');
+
+        INSERT INTO schema_version (version) VALUES (2);
+      `)
+
+      console.log('[DB] Migration 2 complete: emails FTS5 added')
+    } catch (err) {
+      console.warn(`[DB] Migration 2 skipped (emails table may not exist yet): ${err.message}`)
+      // Mark as applied so it doesn't block subsequent migrations.
+      // emails FTS will be created by initSchema on next fresh DB.
+      try { db.exec("INSERT OR IGNORE INTO schema_version (version) VALUES (2)") } catch {}
+    }
+  }
 
-      CREATE TRIGGER IF NOT EXISTS emails_ad AFTER DELETE ON emails BEGIN
-        INSERT INTO emails_fts(emails_fts, rowid, subject, body_text)
-          VALUES ('delete', old.rowid, old.subject, old.body_text);
-      END;
+  if (currentVersion < 3) {
+    try {
+      console.log('[DB] Migration 3: Adding project_id to memories...')
 
-      CREATE TRIGGER IF NOT EXISTS emails_au AFTER UPDATE ON emails BEGIN
-        INSERT INTO emails_fts(emails_fts, rowid, subject, body_text)
-          VALUES ('delete', old.rowid, old.subject, old.body_text);
-        INSERT INTO emails_fts(rowid, subject, body_text)
-          VALUES (new.rowid, new.subject, new.body_text);
-      END;
+      db.exec(`
+        ALTER TABLE memories ADD COLUMN project_id TEXT DEFAULT NULL;
 
-      INSERT INTO emails_fts(emails_fts) VALUES ('rebuild');
+        CREATE INDEX IF NOT EXISTS idx_memories_project_id ON memories(project_id);
 
-      INSERT INTO schema_version (version) VALUES (2);
-    `)
+        INSERT INTO schema_version (version) VALUES (3);
+      `)
 
-    console.log('[DB] Migration 2 complete: emails FTS5 added')
+      console.log('[DB] Migration 3 complete: memories.project_id added')
+    } catch (err) {
+      // Column may already exist (duplicate column error)
+      console.warn(`[DB] Migration 3 skipped: ${err.message}`)
+      try { db.exec("INSERT OR IGNORE INTO schema_version (version) VALUES (3)") } catch {}
+    }
   }
 
-  if (currentVersion < 3) {
-    console.log('[DB] Migration 3: Adding project_id to memories...')
+  if (currentVersion < 4) {
+    try {
+      console.log('[DB] Migration 4: Adding workspace_id to chat_sessions...')
 
-    db.exec(`
-      -- Add nullable project_id column to memories table.
-      -- NULL = universal memory (cross-project knowledge).
-      -- Set = project-scoped memory.
-      ALTER TABLE memories ADD COLUMN project_id TEXT DEFAULT NULL;
+      db.exec(`
+        ALTER TABLE chat_sessions ADD COLUMN workspace_id TEXT DEFAULT NULL;
 
-      CREATE INDEX idx_memories_project_id ON memories(project_id);
+        CREATE INDEX IF NOT EXISTS idx_chat_sessions_workspace
+          ON chat_sessions(workspace_id, updated_at DESC);
 
-      INSERT INTO schema_version (version) VALUES (3);
-    `)
+        INSERT INTO schema_version (version) VALUES (4);
+      `)
 
-    console.log('[DB] Migration 3 complete: memories.project_id added')
+      console.log('[DB] Migration 4 complete: chat_sessions.workspace_id added')
+    } catch (err) {
+      console.warn(`[DB] Migration 4 skipped: ${err.message}`)
+      try { db.exec("INSERT OR IGNORE INTO schema_version (version) VALUES (4)") } catch {}
+    }
   }
 }
 

package/core/stores/chat-store.js

@@ -1,7 +1,7 @@
 /**
  * Chat Session Store (SQLite)
  * Persists chat sessions and messages.
- * Supports multiple sessions: one active + archived past sessions.
+ * Supports multiple sessions scoped by workspace_id.
  * Claude CLI manages conversation context via --resume.
  */
 
@@ -10,14 +10,22 @@ const { getDb } = require('../db')
 const MAX_MESSAGES = 100
 
 /**
- * Load the active (most recent) chat session
+ * Load the active (most recent) chat session for a workspace.
+ * @param {string|null} workspaceId - Workspace ID to scope sessions
  * @returns {object|null} Session object or null if none exists
  */
-function load() {
+function load(workspaceId) {
   const db = getDb()
-  const session = db.prepare(
-    'SELECT * FROM chat_sessions ORDER BY updated_at DESC LIMIT 1'
-  ).get()
+  let session
+  if (workspaceId) {
+    session = db.prepare(
+      'SELECT * FROM chat_sessions WHERE workspace_id = ? ORDER BY updated_at DESC LIMIT 1'
+    ).get(workspaceId)
+  } else {
+    session = db.prepare(
+      'SELECT * FROM chat_sessions WHERE workspace_id IS NULL ORDER BY updated_at DESC LIMIT 1'
+    ).get()
+  }
   if (!session) return null
 
   const messages = db.prepare(
@@ -26,6 +34,7 @@ function load() {
 
   return {
     session_id: session.session_id,
+    workspace_id: session.workspace_id,
     messages,
     turn_count: session.turn_count,
     created_at: session.created_at,
@@ -49,6 +58,7 @@ function loadById(sessionId) {
 
   return {
     session_id: session.session_id,
+    workspace_id: session.workspace_id,
     messages,
     turn_count: session.turn_count,
     created_at: session.created_at,
@@ -57,15 +67,32 @@ function loadById(sessionId) {
 }
 
 /**
- * List all sessions (metadata only, no messages)
+ * List sessions, optionally filtered by workspace_id.
  * @param {number} limit
- * @returns {Array<{ session_id, turn_count, message_count, created_at, updated_at }>}
+ * @param {string|null} workspaceId - If provided, filter by workspace
+ * @returns {Array<{ session_id, workspace_id, turn_count, message_count, created_at, updated_at }>}
  */
-function listSessions(limit = 50) {
+function listSessions(limit = 50, workspaceId) {
   const db = getDb()
+  if (workspaceId) {
+    return db.prepare(`
+      SELECT
+        s.session_id,
+        s.workspace_id,
+        s.turn_count,
+        s.created_at,
+        s.updated_at,
+        (SELECT COUNT(*) FROM chat_messages WHERE session_id = s.session_id) as message_count
+      FROM chat_sessions s
+      WHERE s.workspace_id = ?
+      ORDER BY s.updated_at DESC
+      LIMIT ?
+    `).all(workspaceId, limit)
+  }
   return db.prepare(`
     SELECT
       s.session_id,
+      s.workspace_id,
       s.turn_count,
       s.created_at,
       s.updated_at,
@@ -88,8 +115,8 @@ function save(session) {
 
     // Insert session
     db.prepare(
-      'INSERT INTO chat_sessions (session_id, turn_count, created_at, updated_at) VALUES (?, ?, ?, ?)'
-    ).run(session.session_id, session.turn_count || 0, session.created_at, session.updated_at)
+      'INSERT INTO chat_sessions (session_id, workspace_id, turn_count, created_at, updated_at) VALUES (?, ?, ?, ?, ?)'
+    ).run(session.session_id, session.workspace_id || null, session.turn_count || 0, session.created_at, session.updated_at)
 
     // Insert messages
     const insertMsg = db.prepare(
@@ -103,14 +130,15 @@ function save(session) {
 }
 
 /**
- * Add a message to the active session.
- * Creates a new session if none exists or session_id changed.
+ * Add a message to a session.
+ * Creates a new session if none exists for the given session_id.
  * Past sessions are preserved (not deleted).
  * @param {string} sessionId - Claude CLI session ID
  * @param {{ role: string, content: string }} msg - Message to add
  * @param {number} [turnCount] - Optional turn count to add
+ * @param {string|null} [workspaceId] - Workspace ID for new sessions
  */
-function addMessage(sessionId, msg, turnCount) {
+function addMessage(sessionId, msg, turnCount, workspaceId) {
   const db = getDb()
   const existing = db.prepare('SELECT * FROM chat_sessions WHERE session_id = ?').get(sessionId)
 
@@ -118,8 +146,8 @@ function addMessage(sessionId, msg, turnCount) {
   if (!existing) {
     const now = Date.now()
     db.prepare(
-      'INSERT INTO chat_sessions (session_id, turn_count, created_at, updated_at) VALUES (?, ?, ?, ?)'
-    ).run(sessionId, 0, now, now)
+      'INSERT INTO chat_sessions (session_id, workspace_id, turn_count, created_at, updated_at) VALUES (?, ?, ?, ?, ?)'
+    ).run(sessionId, workspaceId || null, 0, now, now)
   }
 
   // Insert message
@@ -149,13 +177,21 @@ function addMessage(sessionId, msg, turnCount) {
 }
 
 /**
- * Clear the active session (remove from DB).
- * This deletes only the most recent session.
- * For reset flows, use clearActive() which preserves the session in history.
+ * Clear the active session for a workspace.
+ * @param {string|null} workspaceId - Workspace to clear session for
  */
-function clear() {
+function clear(workspaceId) {
   const db = getDb()
-  const active = db.prepare('SELECT session_id FROM chat_sessions ORDER BY updated_at DESC LIMIT 1').get()
+  let active
+  if (workspaceId) {
+    active = db.prepare(
+      'SELECT session_id FROM chat_sessions WHERE workspace_id = ? ORDER BY updated_at DESC LIMIT 1'
+    ).get(workspaceId)
+  } else {
+    active = db.prepare(
+      'SELECT session_id FROM chat_sessions WHERE workspace_id IS NULL ORDER BY updated_at DESC LIMIT 1'
+    ).get()
+  }
   if (active) {
     db.prepare('DELETE FROM chat_sessions WHERE session_id = ?').run(active.session_id)
   }

package/linux/routes/chat.js

@@ -41,20 +41,22 @@ async function chatRoutes(fastify) {
       return { success: false, error: 'Unauthorized' }
     }
 
-    const { message, session_id, context } = request.body || {}
+    const { message, session_id, context, workspace_id } = request.body || {}
 
     if (!message || typeof message !== 'string') {
       reply.code(400)
       return { success: false, error: 'message is required' }
     }
 
+    const workspaceId = workspace_id || null
+
     // Build prompt — add memory context on new sessions + page context
     const prompt = await buildContextPrefix(message, context, session_id)
 
     // Store user message
     const currentSessionId = session_id || null
     if (currentSessionId) {
-      await chatStore.addMessage(currentSessionId, { role: 'user', content: message })
+      await chatStore.addMessage(currentSessionId, { role: 'user', content: message }, undefined, workspaceId)
     }
 
     // Take over response handling from Fastify for SSE streaming
@@ -68,7 +70,7 @@ async function chatRoutes(fastify) {
     reply.raw.flushHeaders()
 
     try {
-      await streamLlmResponse(reply.raw, prompt, currentSessionId)
+      await streamLlmResponse(reply.raw, prompt, currentSessionId, workspaceId, message)
     } catch (err) {
       console.error('[Chat] stream error:', err.message)
       const errorEvent = JSON.stringify({ type: 'error', error: err.message })
@@ -78,14 +80,15 @@ async function chatRoutes(fastify) {
     reply.raw.end()
   })
 
-  // GET /api/chat/session - Get active chat session
+  // GET /api/chat/session - Get active chat session for a workspace
   fastify.get('/api/chat/session', async (request, reply) => {
     if (!verifyToken(request)) {
       reply.code(401)
       return { success: false, error: 'Unauthorized' }
     }
 
-    const session = chatStore.load()
+    const workspaceId = request.query?.workspace_id || null
+    const session = chatStore.load(workspaceId)
     if (!session) {
       return { success: true, session: null }
     }
@@ -94,6 +97,7 @@ async function chatRoutes(fastify) {
       success: true,
       session: {
         session_id: session.session_id,
+        workspace_id: session.workspace_id,
         messages: session.messages,
         turn_count: session.turn_count,
         created_at: session.created_at,
@@ -102,7 +106,7 @@ async function chatRoutes(fastify) {
     }
   })
 
-  // GET /api/chat/sessions - List all sessions (metadata only)
+  // GET /api/chat/sessions - List sessions, optionally filtered by workspace
   fastify.get('/api/chat/sessions', async (request, reply) => {
     if (!verifyToken(request)) {
       reply.code(401)
@@ -110,7 +114,8 @@ async function chatRoutes(fastify) {
     }
 
     const limit = parseInt(request.query?.limit) || 50
-    const sessions = chatStore.listSessions(limit)
+    const workspaceId = request.query?.workspace_id || undefined
+    const sessions = chatStore.listSessions(limit, workspaceId)
     return { success: true, sessions }
   })
 
@@ -130,14 +135,15 @@ async function chatRoutes(fastify) {
     return { success: true, session }
   })
 
-  // POST /api/chat/clear - Clear the active session
+  // POST /api/chat/clear - Clear the active session for a workspace
   fastify.post('/api/chat/clear', async (request, reply) => {
     if (!verifyToken(request)) {
       reply.code(401)
       return { success: false, error: 'Unauthorized' }
     }
 
-    await chatStore.clear()
+    const workspaceId = request.body?.workspace_id || null
+    await chatStore.clear(workspaceId)
     return { success: true }
   })
 
@@ -168,42 +174,57 @@ async function chatRoutes(fastify) {
     return { success: true }
   })
 
-  // POST /api/chat/reset - Summarize conversation and start fresh session
+  // POST /api/chat/reset - Carry over relevant messages and start fresh session
   fastify.post('/api/chat/reset', async (request, reply) => {
     if (!verifyToken(request)) {
       reply.code(401)
       return { success: false, error: 'Unauthorized' }
     }
 
-    const session = await chatStore.load()
+    const workspaceId = request.body?.workspace_id || null
+    const session = await chatStore.load(workspaceId)
     if (!session || session.messages.length === 0) {
-      await chatStore.clear()
-      return { success: true, summary: null }
+      await chatStore.clear(workspaceId)
+      return { success: true, carry_over: null }
     }
 
-    // Build summarization prompt from recent messages
+    // Take recent messages for topic analysis
     const recentMessages = session.messages.slice(-20)
-    const conversationText = recentMessages
-      .map(m => `${m.role === 'user' ? 'ユーザー' : 'アシスタント'}: ${m.content.substring(0, 500)}`)
-      .join('\n\n')
-
-    const summarizePrompt = `以下の会話を要約してください。重要なコンテキスト、決定事項、進行中のタスクを含めてください。200文字以内で。\n\n${conversationText}`
+    let carryOverMessages = recentMessages
 
-    let summary = null
+    // Ask LLM to find where the current topic begins
     try {
-      summary = await runQuickLlmCall(summarizePrompt)
-    } catch (err) {
-      console.error('[Chat] summarization failed:', err.message)
-      // Fallback: use last few messages as summary
-      const fallback = recentMessages.slice(-4)
-        .map(m => `${m.role === 'user' ? 'ユーザー' : 'アシスタント'}: ${m.content.substring(0, 200)}`)
+      const indexed = recentMessages
+        .map((m, i) => `[${i}] ${m.role === 'user' ? 'ユーザー' : 'アシスタント'}: ${m.content.substring(0, 300)}`)
         .join('\n')
-      summary = fallback
+
+      const analyzePrompt = `以下の会話履歴を分析し、現在進行中のトピックが始まったインデックス番号を特定してください。
+会話の流れが明確に変わったポイント（新しい質問・別の作業への切り替え等）がある場合、最後の切り替え以降のインデックスを返してください。
+全体が同じトピックの場合は 0 を返してください。
+
+数値のみを返してください（例: 5）。
+
+${indexed}`
+
+      const result = await runQuickLlmCall(analyzePrompt)
+      const breakIndex = parseInt(result.trim(), 10)
+      if (!isNaN(breakIndex) && breakIndex >= 0 && breakIndex < recentMessages.length) {
+        carryOverMessages = recentMessages.slice(breakIndex)
+        console.log(`[Chat] topic break at index ${breakIndex}, carrying over ${carryOverMessages.length}/${recentMessages.length} messages`)
+      }
+    } catch (err) {
+      console.error('[Chat] topic analysis failed, carrying over last 10:', err.message)
+      carryOverMessages = recentMessages.slice(-10)
     }
 
-    await chatStore.clear()
-    console.log(`[Chat] session reset with summary (${summary?.length || 0} chars)`)
-    return { success: true, summary }
+    // Format carry-over as conversation text
+    const carryOver = carryOverMessages
+      .map(m => `${m.role === 'user' ? 'ユーザー' : 'アシスタント'}: ${m.content}`)
+      .join('\n\n')
+
+    await chatStore.clear(workspaceId)
+    console.log(`[Chat] session reset, carrying over ${carryOverMessages.length} messages (${carryOver.length} chars)`)
+    return { success: true, carry_over: carryOver }
   })
 
   // POST /api/chat/end-of-day - Generate daily log + extract memories
@@ -341,7 +362,7 @@ function getLlmBinary() {
  * Tracks block types to correctly forward tool_use vs text events
  * and counts turns for session management.
  */
-function streamLlmResponse(res, prompt, sessionId) {
+function streamLlmResponse(res, prompt, sessionId, workspaceId, originalMessage) {
   return new Promise((resolve, reject) => {
     const binaryName = getLlmBinary()
     if (!binaryName) {
@@ -516,11 +537,11 @@ function streamLlmResponse(res, prompt, sessionId) {
       if (resolvedSessionId) {
         // If this was a new session, also store the user message now
         if (!sessionId) {
-          await chatStore.addMessage(resolvedSessionId, { role: 'user', content: prompt })
+          await chatStore.addMessage(resolvedSessionId, { role: 'user', content: originalMessage || prompt }, undefined, workspaceId)
         }
         // Store assistant response with turn count
         if (fullResponse) {
-          await chatStore.addMessage(resolvedSessionId, { role: 'assistant', content: fullResponse }, turnCount)
+          await chatStore.addMessage(resolvedSessionId, { role: 'assistant', content: fullResponse }, turnCount, workspaceId)
         }
       }
 
@@ -533,7 +554,7 @@ function streamLlmResponse(res, prompt, sessionId) {
       }
 
       // Load current turn count from session for the done event
-      const session = await chatStore.load()
+      const session = await chatStore.load(workspaceId)
       const totalTurnCount = session?.turn_count || turnCount
 
       const doneEvent = JSON.stringify({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekbeer/minion",
-  "version": "3.11.5",
+  "version": "3.13.0",
   "description": "AI Agent runtime for Minion - manages status and skill deployment on VPS",
   "main": "linux/server.js",
   "bin": {

package/win/routes/chat.js

@@ -116,17 +116,18 @@ async function chatRoutes(fastify) {
       return { success: false, error: 'Unauthorized' }
     }
 
-    const { message, session_id, context, wsl_mode } = request.body || {}
+    const { message, session_id, context, wsl_mode, workspace_id } = request.body || {}
     if (!message || typeof message !== 'string') {
       reply.code(400)
       return { success: false, error: 'message is required' }
     }
 
+    const workspaceId = workspace_id || null
     const prompt = await buildContextPrefix(message, context, session_id)
     const currentSessionId = session_id || null
 
     if (currentSessionId) {
-      await chatStore.addMessage(currentSessionId, { role: 'user', content: message })
+      await chatStore.addMessage(currentSessionId, { role: 'user', content: message }, undefined, workspaceId)
     }
 
     reply.hijack()
@@ -144,7 +145,7 @@ async function chatRoutes(fastify) {
         await proxyWslChat(reply.raw, prompt, currentSessionId)
         wslModeActive = false
       } else {
-        await streamLlmResponse(reply.raw, prompt, currentSessionId)
+        await streamLlmResponse(reply.raw, prompt, currentSessionId, workspaceId, message)
       }
     } catch (err) {
       wslModeActive = false
@@ -160,12 +161,14 @@ async function chatRoutes(fastify) {
       reply.code(401)
       return { success: false, error: 'Unauthorized' }
     }
-    const session = chatStore.load()
+    const workspaceId = request.query?.workspace_id || null
+    const session = chatStore.load(workspaceId)
     if (!session) return { success: true, session: null }
     return {
       success: true,
       session: {
         session_id: session.session_id,
+        workspace_id: session.workspace_id,
         messages: session.messages,
         turn_count: session.turn_count,
         created_at: session.created_at,
@@ -174,7 +177,7 @@ async function chatRoutes(fastify) {
     }
   })
 
-  // GET /api/chat/sessions - List all sessions (metadata only)
+  // GET /api/chat/sessions - List sessions, optionally filtered by workspace
   fastify.get('/api/chat/sessions', async (request, reply) => {
     if (!verifyToken(request)) {
       reply.code(401)
@@ -182,7 +185,8 @@ async function chatRoutes(fastify) {
     }
 
     const limit = parseInt(request.query?.limit) || 50
-    const sessions = chatStore.listSessions(limit)
+    const workspaceId = request.query?.workspace_id || undefined
+    const sessions = chatStore.listSessions(limit, workspaceId)
     return { success: true, sessions }
   })
 
@@ -207,7 +211,8 @@ async function chatRoutes(fastify) {
       reply.code(401)
       return { success: false, error: 'Unauthorized' }
     }
-    await chatStore.clear()
+    const workspaceId = request.body?.workspace_id || null
+    await chatStore.clear(workspaceId)
     return { success: true }
   })
 
@@ -239,40 +244,57 @@ async function chatRoutes(fastify) {
     return { success: true }
   })
 
-  // POST /api/chat/reset - Summarize conversation and start fresh session
+  // POST /api/chat/reset - Carry over relevant messages and start fresh session
   fastify.post('/api/chat/reset', async (request, reply) => {
     if (!verifyToken(request)) {
       reply.code(401)
       return { success: false, error: 'Unauthorized' }
     }
 
-    const session = await chatStore.load()
+    const workspaceId = request.body?.workspace_id || null
+    const session = await chatStore.load(workspaceId)
     if (!session || session.messages.length === 0) {
-      await chatStore.clear()
-      return { success: true, summary: null }
+      await chatStore.clear(workspaceId)
+      return { success: true, carry_over: null }
     }
 
+    // Take recent messages for topic analysis
     const recentMessages = session.messages.slice(-20)
-    const conversationText = recentMessages
-      .map(m => `${m.role === 'user' ? 'ユーザー' : 'アシスタント'}: ${m.content.substring(0, 500)}`)
-      .join('\n\n')
-
-    const summarizePrompt = `以下の会話を要約してください。重要なコンテキスト、決定事項、進行中のタスクを含めてください。200文字以内で。\n\n${conversationText}`
+    let carryOverMessages = recentMessages
 
-    let summary = null
+    // Ask LLM to find where the current topic begins
     try {
-      summary = await runQuickLlmCall(summarizePrompt)
-    } catch (err) {
-      console.error('[Chat] summarization failed:', err.message)
-      const fallback = recentMessages.slice(-4)
-        .map(m => `${m.role === 'user' ? 'ユーザー' : 'アシスタント'}: ${m.content.substring(0, 200)}`)
+      const indexed = recentMessages
+        .map((m, i) => `[${i}] ${m.role === 'user' ? 'ユーザー' : 'アシスタント'}: ${m.content.substring(0, 300)}`)
         .join('\n')
-      summary = fallback
+
+      const analyzePrompt = `以下の会話履歴を分析し、現在進行中のトピックが始まったインデックス番号を特定してください。
+会話の流れが明確に変わったポイント（新しい質問・別の作業への切り替え等）がある場合、最後の切り替え以降のインデックスを返してください。
+全体が同じトピックの場合は 0 を返してください。
+
+数値のみを返してください（例: 5）。
+
+${indexed}`
+
+      const result = await runQuickLlmCall(analyzePrompt)
+      const breakIndex = parseInt(result.trim(), 10)
+      if (!isNaN(breakIndex) && breakIndex >= 0 && breakIndex < recentMessages.length) {
+        carryOverMessages = recentMessages.slice(breakIndex)
+        console.log(`[Chat] topic break at index ${breakIndex}, carrying over ${carryOverMessages.length}/${recentMessages.length} messages`)
+      }
+    } catch (err) {
+      console.error('[Chat] topic analysis failed, carrying over last 10:', err.message)
+      carryOverMessages = recentMessages.slice(-10)
     }
 
-    await chatStore.clear()
-    console.log(`[Chat] session reset with summary (${summary?.length || 0} chars)`)
-    return { success: true, summary }
+    // Format carry-over as conversation text
+    const carryOver = carryOverMessages
+      .map(m => `${m.role === 'user' ? 'ユーザー' : 'アシスタント'}: ${m.content}`)
+      .join('\n\n')
+
+    await chatStore.clear(workspaceId)
+    console.log(`[Chat] session reset, carrying over ${carryOverMessages.length} messages (${carryOver.length} chars)`)
+    return { success: true, carry_over: carryOver }
   })
 
   // POST /api/chat/end-of-day - Generate daily log + extract memories
@@ -394,7 +416,7 @@ function getLlmBinary() {
  * Tracks block types to correctly forward tool_use vs text events
  * and counts turns for session management.
  */
-function streamLlmResponse(res, prompt, sessionId) {
+function streamLlmResponse(res, prompt, sessionId, workspaceId, originalMessage) {
   return new Promise((resolve, reject) => {
     const binaryName = getLlmBinary()
     if (!binaryName) {
@@ -542,10 +564,10 @@ function streamLlmResponse(res, prompt, sessionId) {
       activeChatChild = null
       if (resolvedSessionId) {
         if (!sessionId) {
-          await chatStore.addMessage(resolvedSessionId, { role: 'user', content: prompt })
+          await chatStore.addMessage(resolvedSessionId, { role: 'user', content: originalMessage || prompt }, undefined, workspaceId)
         }
         if (fullResponse) {
-          await chatStore.addMessage(resolvedSessionId, { role: 'assistant', content: fullResponse }, turnCount)
+          await chatStore.addMessage(resolvedSessionId, { role: 'assistant', content: fullResponse }, turnCount, workspaceId)
         }
       }
       if (code !== 0 && !fullResponse) {
@@ -553,7 +575,7 @@ function streamLlmResponse(res, prompt, sessionId) {
         res.write(`data: ${JSON.stringify({ type: 'error', error: errorMsg })}\n\n`)
       }
 
-      const session = await chatStore.load()
+      const session = await chatStore.load(workspaceId)
       const totalTurnCount = session?.turn_count || turnCount
 
       res.write(`data: ${JSON.stringify({ type: 'done', session_id: resolvedSessionId, turn_count: totalTurnCount })}\n\n`)