backlog-mcp 0.30.0 → 0.31.0

package/dist/operations/storage.mjs

@@ -43,9 +43,10 @@ var OperationStorage = class {
 	* Query operations with optional filtering.
 	*/
 	query(filter = {}) {
-		const { taskId, limit = 50 } = filter;
+		const { taskId, date, limit = 50 } = filter;
 		let entries = this.readAll();
 		if (taskId) entries = entries.filter((e) => e.resourceId === taskId);
+		if (date) entries = entries.filter((e) => e.ts.startsWith(date));
 		return entries.reverse().slice(0, limit);
 	}
 	/**

package/dist/operations/storage.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"storage.mjs","names":[],"sources":["../../src/operations/storage.ts"],"sourcesContent":["/**\n * JSONL storage for operation entries.\n * Single responsibility: read/write operations to disk.\n */\n\nimport { appendFileSync, existsSync, mkdirSync, readFileSync } from 'node:fs';\nimport { dirname, join } from 'node:path';\nimport { paths } from '@/utils/paths.js';\nimport type { OperationEntry, OperationFilter } from './types.js';\n\nexport class OperationStorage {\n  private logPath: string;\n\n  constructor() {\n    this.logPath = join(paths.backlogDataDir, '.internal', 'operations.jsonl');\n  }\n\n  /**\n   * Append an operation entry to the log file.\n   */\n  append(entry: OperationEntry): void {\n    try {\n      const dir = dirname(this.logPath);\n      if (!existsSync(dir)) {\n        mkdirSync(dir, { recursive: true });\n      }\n      appendFileSync(this.logPath, JSON.stringify(entry) + '\\n', 'utf-8');\n    } catch {\n      // Fail silently - logging should not break tool execution\n    }\n  }\n\n  /**\n   * Read all operations from the log file.\n   */\n  readAll(): OperationEntry[] {\n    if (!existsSync(this.logPath)) return [];\n\n    try {\n      const content = readFileSync(this.logPath, 'utf-8');\n      const lines = content.trim().split('\\n').filter(Boolean);\n      \n      return lines\n        .map(line => {\n          try {\n            return JSON.parse(line) as OperationEntry;\n          } catch {\n            return null;\n          }\n        })\n        .filter((e): e is OperationEntry => e !== null);\n    } catch {\n      return [];\n    }\n  }\n\n  /**\n   * Query operations with optional filtering.\n   */\n  query(filter: OperationFilter = {}): OperationEntry[] {\n    const { taskId, limit = 50 } = filter;\n    \n    let entries = this.readAll();\n\n    if (taskId) {\n      entries = entries.filter(e => e.resourceId === taskId);\n    }\n\n    // Return most recent first, limited\n    return entries.reverse().slice(0, limit);\n  }\n\n  /**\n   * Count operations for a specific task.\n   */\n  countForTask(taskId: string): number {\n    return this.query({ taskId, limit: 1000 }).length;\n  }\n}\n"],"mappings":";;;;;;;;;AAUA,IAAa,mBAAb,MAA8B;CAC5B,AAAQ;CAER,cAAc;AACZ,OAAK,UAAU,KAAK,MAAM,gBAAgB,aAAa,mBAAmB;;;;;CAM5E,OAAO,OAA6B;AAClC,MAAI;GACF,MAAM,MAAM,QAAQ,KAAK,QAAQ;AACjC,OAAI,CAAC,WAAW,IAAI,CAClB,WAAU,KAAK,EAAE,WAAW,MAAM,CAAC;AAErC,kBAAe,KAAK,SAAS,KAAK,UAAU,MAAM,GAAG,MAAM,QAAQ;UAC7D;;;;;CAQV,UAA4B;AAC1B,MAAI,CAAC,WAAW,KAAK,QAAQ,CAAE,QAAO,EAAE;AAExC,MAAI;AAIF,UAHgB,aAAa,KAAK,SAAS,QAAQ,CAC7B,MAAM,CAAC,MAAM,KAAK,CAAC,OAAO,QAAQ,CAGrD,KAAI,SAAQ;AACX,QAAI;AACF,YAAO,KAAK,MAAM,KAAK;YACjB;AACN,YAAO;;KAET,CACD,QAAQ,MAA2B,MAAM,KAAK;UAC3C;AACN,UAAO,EAAE;;;;;;CAOb,MAAM,SAA0B,EAAE,EAAoB;EACpD,MAAM,EAAE,QAAQ,QAAQ,OAAO;EAE/B,IAAI,UAAU,KAAK,SAAS;AAE5B,MAAI,OACF,WAAU,QAAQ,QAAO,MAAK,EAAE,eAAe,OAAO;AAIxD,SAAO,QAAQ,SAAS,CAAC,MAAM,GAAG,MAAM;;;;;CAM1C,aAAa,QAAwB;AACnC,SAAO,KAAK,MAAM;GAAE;GAAQ,OAAO;GAAM,CAAC,CAAC"}
+{"version":3,"file":"storage.mjs","names":[],"sources":["../../src/operations/storage.ts"],"sourcesContent":["/**\n * JSONL storage for operation entries.\n * Single responsibility: read/write operations to disk.\n */\n\nimport { appendFileSync, existsSync, mkdirSync, readFileSync } from 'node:fs';\nimport { dirname, join } from 'node:path';\nimport { paths } from '@/utils/paths.js';\nimport type { OperationEntry, OperationFilter } from './types.js';\n\nexport class OperationStorage {\n  private logPath: string;\n\n  constructor() {\n    this.logPath = join(paths.backlogDataDir, '.internal', 'operations.jsonl');\n  }\n\n  /**\n   * Append an operation entry to the log file.\n   */\n  append(entry: OperationEntry): void {\n    try {\n      const dir = dirname(this.logPath);\n      if (!existsSync(dir)) {\n        mkdirSync(dir, { recursive: true });\n      }\n      appendFileSync(this.logPath, JSON.stringify(entry) + '\\n', 'utf-8');\n    } catch {\n      // Fail silently - logging should not break tool execution\n    }\n  }\n\n  /**\n   * Read all operations from the log file.\n   */\n  readAll(): OperationEntry[] {\n    if (!existsSync(this.logPath)) return [];\n\n    try {\n      const content = readFileSync(this.logPath, 'utf-8');\n      const lines = content.trim().split('\\n').filter(Boolean);\n      \n      return lines\n        .map(line => {\n          try {\n            return JSON.parse(line) as OperationEntry;\n          } catch {\n            return null;\n          }\n        })\n        .filter((e): e is OperationEntry => e !== null);\n    } catch {\n      return [];\n    }\n  }\n\n  /**\n   * Query operations with optional filtering.\n   */\n  query(filter: OperationFilter = {}): OperationEntry[] {\n    const { taskId, date, limit = 50 } = filter;\n    \n    let entries = this.readAll();\n\n    if (taskId) {\n      entries = entries.filter(e => e.resourceId === taskId);\n    }\n\n    if (date) {\n      // Filter by date (YYYY-MM-DD matches start of ISO timestamp)\n      entries = entries.filter(e => e.ts.startsWith(date));\n    }\n\n    // Return most recent first, limited\n    return entries.reverse().slice(0, limit);\n  }\n\n  /**\n   * Count operations for a specific task.\n   */\n  countForTask(taskId: string): number {\n    return this.query({ taskId, limit: 1000 }).length;\n  }\n}\n"],"mappings":";;;;;;;;;AAUA,IAAa,mBAAb,MAA8B;CAC5B,AAAQ;CAER,cAAc;AACZ,OAAK,UAAU,KAAK,MAAM,gBAAgB,aAAa,mBAAmB;;;;;CAM5E,OAAO,OAA6B;AAClC,MAAI;GACF,MAAM,MAAM,QAAQ,KAAK,QAAQ;AACjC,OAAI,CAAC,WAAW,IAAI,CAClB,WAAU,KAAK,EAAE,WAAW,MAAM,CAAC;AAErC,kBAAe,KAAK,SAAS,KAAK,UAAU,MAAM,GAAG,MAAM,QAAQ;UAC7D;;;;;CAQV,UAA4B;AAC1B,MAAI,CAAC,WAAW,KAAK,QAAQ,CAAE,QAAO,EAAE;AAExC,MAAI;AAIF,UAHgB,aAAa,KAAK,SAAS,QAAQ,CAC7B,MAAM,CAAC,MAAM,KAAK,CAAC,OAAO,QAAQ,CAGrD,KAAI,SAAQ;AACX,QAAI;AACF,YAAO,KAAK,MAAM,KAAK;YACjB;AACN,YAAO;;KAET,CACD,QAAQ,MAA2B,MAAM,KAAK;UAC3C;AACN,UAAO,EAAE;;;;;;CAOb,MAAM,SAA0B,EAAE,EAAoB;EACpD,MAAM,EAAE,QAAQ,MAAM,QAAQ,OAAO;EAErC,IAAI,UAAU,KAAK,SAAS;AAE5B,MAAI,OACF,WAAU,QAAQ,QAAO,MAAK,EAAE,eAAe,OAAO;AAGxD,MAAI,KAEF,WAAU,QAAQ,QAAO,MAAK,EAAE,GAAG,WAAW,KAAK,CAAC;AAItD,SAAO,QAAQ,SAAS,CAAC,MAAM,GAAG,MAAM;;;;;CAM1C,aAAa,QAAwB;AACnC,SAAO,KAAK,MAAM;GAAE;GAAQ,OAAO;GAAM,CAAC,CAAC"}

package/dist/operations/types.d.mts

@@ -19,6 +19,7 @@ interface OperationEntry {
 }
 interface OperationFilter {
   taskId?: string;
+  date?: string;
   limit?: number;
 }
 declare const WRITE_TOOLS: ToolName[];

package/dist/operations/types.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"types.mjs","names":[],"sources":["../../src/operations/types.ts"],"sourcesContent":["/**\n * Types for operation logging.\n */\n\nexport interface Actor {\n  type: 'user' | 'agent';\n  name: string;\n  delegatedBy?: string;\n  taskContext?: string;\n}\n\nexport type ToolName = 'backlog_create' | 'backlog_update' | 'backlog_delete' | 'write_resource';\n\nexport interface OperationEntry {\n  ts: string;\n  tool: string;\n  params: Record<string, unknown>;\n  result: unknown;\n  resourceId?: string;\n  actor: Actor;\n}\n\nexport interface OperationFilter {\n  taskId?: string;\n  limit?: number;\n}\n\nexport const WRITE_TOOLS: ToolName[] = ['backlog_create', 'backlog_update', 'backlog_delete', 'write_resource'];\n"],"mappings":";AA2BA,MAAa,cAA0B;CAAC;CAAkB;CAAkB;CAAkB;CAAiB"}
+{"version":3,"file":"types.mjs","names":[],"sources":["../../src/operations/types.ts"],"sourcesContent":["/**\n * Types for operation logging.\n */\n\nexport interface Actor {\n  type: 'user' | 'agent';\n  name: string;\n  delegatedBy?: string;\n  taskContext?: string;\n}\n\nexport type ToolName = 'backlog_create' | 'backlog_update' | 'backlog_delete' | 'write_resource';\n\nexport interface OperationEntry {\n  ts: string;\n  tool: string;\n  params: Record<string, unknown>;\n  result: unknown;\n  resourceId?: string;\n  actor: Actor;\n}\n\nexport interface OperationFilter {\n  taskId?: string;\n  date?: string; // YYYY-MM-DD - filter by date\n  limit?: number;\n}\n\nexport const WRITE_TOOLS: ToolName[] = ['backlog_create', 'backlog_update', 'backlog_delete', 'write_resource'];\n"],"mappings":";AA4BA,MAAa,cAA0B;CAAC;CAAkB;CAAkB;CAAkB;CAAiB"}

package/dist/server/viewer-routes.mjs

@@ -142,10 +142,11 @@ function registerViewerRoutes(app) {
 		return reply.redirect(`/?resource=${encodeURIComponent(uri)}`);
 	});
 	app.get("/operations", async (request) => {
-		const { limit, task } = request.query;
+		const { limit, task, date } = request.query;
 		const operations = operationLogger.read({
-			limit: limit ? parseInt(limit) : 50,
-			taskId: task || void 0
+			limit: limit ? parseInt(limit) : date ? 1e3 : 50,
+			taskId: task || void 0,
+			date: date || void 0
 		});
 		const taskCache = /* @__PURE__ */ new Map();
 		const epicCache = /* @__PURE__ */ new Map();

package/dist/server/viewer-routes.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"viewer-routes.mjs","names":[],"sources":["../../src/server/viewer-routes.ts"],"sourcesContent":["import type { FastifyInstance } from 'fastify';\nimport fastifyStatic from '@fastify/static';\nimport { exec } from 'node:child_process';\nimport { existsSync, readFileSync } from 'node:fs';\nimport matter from 'gray-matter';\nimport { storage } from '../storage/backlog-service.js';\nimport { resourceManager } from '../resources/manager.js';\nimport { paths } from '../utils/paths.js';\nimport { operationLogger } from '../operations/index.js';\n\nexport function registerViewerRoutes(app: FastifyInstance) {\n  // Static files - serve from dist/viewer (built assets)\n  app.register(fastifyStatic, {\n    root: paths.viewerDist,\n    prefix: '/',\n  });\n\n  // List tasks\n  app.get('/tasks', async (request) => {\n    const { filter, limit, q } = request.query as { filter?: string; limit?: string; q?: string };\n    \n    const statusMap: Record<string, any> = {\n      active: { status: ['open', 'in_progress', 'blocked'] },\n      completed: { status: ['done', 'cancelled'] },\n      all: {},\n    };\n    \n    const filterConfig = statusMap[filter || 'active'] || statusMap.active;\n    const tasks = await storage.list({ \n      ...filterConfig, \n      query: q || undefined,\n      limit: limit ? parseInt(limit) : 10000 \n    });\n    \n    return tasks;\n  });\n\n  // Unified search API - returns proper SearchResult[] with item, score, type\n  app.get('/search', async (request, reply) => {\n    const { q, types, limit, sort } = request.query as { q?: string; types?: string; limit?: string; sort?: string };\n    \n    if (!q) {\n      return reply.code(400).send({ error: 'Missing required query parameter: q' });\n    }\n    \n    const typeFilter = types \n      ? types.split(',').filter((t): t is 'task' | 'epic' | 'resource' => \n          t === 'task' || t === 'epic' || t === 'resource')\n      : undefined;\n    \n    const sortMode = sort === 'recent' ? 'recent' : 'relevant';\n    \n    const results = await storage.searchUnified(q, {\n      types: typeFilter?.length ? typeFilter : undefined,\n      limit: limit ? parseInt(limit) : 20,\n      sort: sortMode,\n    });\n    \n    return results;\n  });\n\n  // Get single task\n  app.get('/tasks/:id', async (request, reply) => {\n    const { id } = request.params as { id: string };\n    const task = storage.get(id);\n    \n    if (!task) {\n      return reply.code(404).send({ error: 'Task not found' });\n    }\n    \n    // Include raw markdown for copy button\n    const raw = storage.getMarkdown(id);\n    \n    return { ...task, raw };\n  });\n\n  // System status\n  app.get('/api/status', async () => {\n    const tasks = await storage.list({ limit: 10000 });\n    const address = app.server.address();\n    const port = typeof address === 'object' && address ? address.port : 3030;\n    \n    return {\n      version: paths.getVersion(),\n      port,\n      dataDir: paths.backlogDataDir,\n      taskCount: tasks.length,\n      uptime: Math.floor(process.uptime())\n    };\n  });\n\n  // Open task in editor\n  app.get('/open/:id', async (request, reply) => {\n    const { id } = request.params as { id: string };\n    const filePath = storage.getFilePath(id);\n    \n    if (!filePath) {\n      return reply.code(404).send({ error: 'Task not found' });\n    }\n    \n    exec(`open \"${filePath}\"`);\n    return { status: 'Opening...' };\n  });\n\n  // Resource proxy\n  app.get('/resource', async (request, reply) => {\n    const { path: filePath } = request.query as { path?: string };\n    \n    if (!filePath) {\n      return reply.code(400).send({ error: 'Missing path parameter' });\n    }\n    \n    if (!existsSync(filePath)) {\n      return reply.code(404).send({ error: 'File not found', path: filePath });\n    }\n    \n    try {\n      const content = readFileSync(filePath, 'utf-8');\n      const ext = filePath.split('.').pop()?.toLowerCase() || 'txt';\n      const mimeMap: Record<string, string> = {\n        md: 'text/markdown',\n        ts: 'text/typescript',\n        js: 'text/javascript',\n        json: 'application/json',\n        txt: 'text/plain',\n      };\n      \n      let frontmatter = {};\n      let bodyContent = content;\n      \n      // Parse frontmatter for markdown files\n      if (ext === 'md') {\n        const parsed = matter(content);\n        frontmatter = parsed.data;\n        bodyContent = parsed.content;\n      }\n      \n      return {\n        content: bodyContent,\n        frontmatter,\n        type: mimeMap[ext] || 'text/plain',\n        path: filePath,\n        fileUri: `file://${filePath}`,\n        mcpUri: resourceManager.toUri(filePath),\n        ext\n      };\n    } catch (error: any) {\n      return reply.code(500).send({ error: 'Failed to read file', message: error.message });\n    }\n  });\n\n  // MCP resource proxy\n  app.get('/mcp/resource', async (request, reply) => {\n    const { uri } = request.query as { uri?: string };\n    \n    if (!uri || !uri.startsWith('mcp://backlog/')) {\n      return reply.code(400).send({ error: 'Invalid MCP URI' });\n    }\n    \n    try {\n      const resource = resourceManager.read(uri);\n      const filePath = resourceManager.resolve(uri);\n      const ext = filePath.split('.').pop()?.toLowerCase() || 'txt';\n      \n      return {\n        content: resource.content,\n        frontmatter: resource.frontmatter || {},\n        type: resource.mimeType,\n        path: filePath,\n        fileUri: `file://${filePath}`,\n        mcpUri: uri,\n        ext\n      };\n    } catch (error: any) {\n      return reply.code(404).send({ error: 'Resource not found', uri, message: error.message });\n    }\n  });\n\n  // Open resource in viewer\n  app.get('/open', async (request, reply) => {\n    const { uri } = request.query as { uri?: string };\n    \n    if (!uri) {\n      return reply.code(400).send({ error: 'Missing uri parameter' });\n    }\n    \n    return reply.redirect(`/?resource=${encodeURIComponent(uri)}`);\n  });\n\n  // Operations API - recent activity (enriched with task titles and epic info)\n  app.get('/operations', async (request) => {\n    const { limit, task } = request.query as { limit?: string; task?: string };\n    \n    const operations = operationLogger.read({\n      limit: limit ? parseInt(limit) : 50,\n      taskId: task || undefined,\n    });\n    \n    // Enrich operations with task titles and epic info\n    // Use in-request cache to avoid duplicate storage lookups\n    const taskCache = new Map<string, { title?: string; epicId?: string }>();\n    const epicCache = new Map<string, string | undefined>();\n    \n    const enriched = operations.map(op => {\n      if (op.resourceId) {\n        if (!taskCache.has(op.resourceId)) {\n          const taskData = storage.get(op.resourceId);\n          taskCache.set(op.resourceId, {\n            title: taskData?.title,\n            epicId: taskData?.epic_id,\n          });\n        }\n        const cached = taskCache.get(op.resourceId)!;\n        \n        // Resolve epic title if task has an epic\n        let epicTitle: string | undefined;\n        if (cached.epicId) {\n          if (!epicCache.has(cached.epicId)) {\n            const epicData = storage.get(cached.epicId);\n            epicCache.set(cached.epicId, epicData?.title);\n          }\n          epicTitle = epicCache.get(cached.epicId);\n        }\n        \n        return { ...op, resourceTitle: cached.title, epicId: cached.epicId, epicTitle };\n      }\n      return op;\n    });\n    \n    return enriched;\n  });\n\n  // Operation count for a specific task (for badge)\n  app.get('/operations/count/:taskId', async (request) => {\n    const { taskId } = request.params as { taskId: string };\n    return { count: operationLogger.countForTask(taskId) };\n  });\n}\n"],"mappings":"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"}
+{"version":3,"file":"viewer-routes.mjs","names":[],"sources":["../../src/server/viewer-routes.ts"],"sourcesContent":["import type { FastifyInstance } from 'fastify';\nimport fastifyStatic from '@fastify/static';\nimport { exec } from 'node:child_process';\nimport { existsSync, readFileSync } from 'node:fs';\nimport matter from 'gray-matter';\nimport { storage } from '../storage/backlog-service.js';\nimport { resourceManager } from '../resources/manager.js';\nimport { paths } from '../utils/paths.js';\nimport { operationLogger } from '../operations/index.js';\n\nexport function registerViewerRoutes(app: FastifyInstance) {\n  // Static files - serve from dist/viewer (built assets)\n  app.register(fastifyStatic, {\n    root: paths.viewerDist,\n    prefix: '/',\n  });\n\n  // List tasks\n  app.get('/tasks', async (request) => {\n    const { filter, limit, q } = request.query as { filter?: string; limit?: string; q?: string };\n    \n    const statusMap: Record<string, any> = {\n      active: { status: ['open', 'in_progress', 'blocked'] },\n      completed: { status: ['done', 'cancelled'] },\n      all: {},\n    };\n    \n    const filterConfig = statusMap[filter || 'active'] || statusMap.active;\n    const tasks = await storage.list({ \n      ...filterConfig, \n      query: q || undefined,\n      limit: limit ? parseInt(limit) : 10000 \n    });\n    \n    return tasks;\n  });\n\n  // Unified search API - returns proper SearchResult[] with item, score, type\n  app.get('/search', async (request, reply) => {\n    const { q, types, limit, sort } = request.query as { q?: string; types?: string; limit?: string; sort?: string };\n    \n    if (!q) {\n      return reply.code(400).send({ error: 'Missing required query parameter: q' });\n    }\n    \n    const typeFilter = types \n      ? types.split(',').filter((t): t is 'task' | 'epic' | 'resource' => \n          t === 'task' || t === 'epic' || t === 'resource')\n      : undefined;\n    \n    const sortMode = sort === 'recent' ? 'recent' : 'relevant';\n    \n    const results = await storage.searchUnified(q, {\n      types: typeFilter?.length ? typeFilter : undefined,\n      limit: limit ? parseInt(limit) : 20,\n      sort: sortMode,\n    });\n    \n    return results;\n  });\n\n  // Get single task\n  app.get('/tasks/:id', async (request, reply) => {\n    const { id } = request.params as { id: string };\n    const task = storage.get(id);\n    \n    if (!task) {\n      return reply.code(404).send({ error: 'Task not found' });\n    }\n    \n    // Include raw markdown for copy button\n    const raw = storage.getMarkdown(id);\n    \n    return { ...task, raw };\n  });\n\n  // System status\n  app.get('/api/status', async () => {\n    const tasks = await storage.list({ limit: 10000 });\n    const address = app.server.address();\n    const port = typeof address === 'object' && address ? address.port : 3030;\n    \n    return {\n      version: paths.getVersion(),\n      port,\n      dataDir: paths.backlogDataDir,\n      taskCount: tasks.length,\n      uptime: Math.floor(process.uptime())\n    };\n  });\n\n  // Open task in editor\n  app.get('/open/:id', async (request, reply) => {\n    const { id } = request.params as { id: string };\n    const filePath = storage.getFilePath(id);\n    \n    if (!filePath) {\n      return reply.code(404).send({ error: 'Task not found' });\n    }\n    \n    exec(`open \"${filePath}\"`);\n    return { status: 'Opening...' };\n  });\n\n  // Resource proxy\n  app.get('/resource', async (request, reply) => {\n    const { path: filePath } = request.query as { path?: string };\n    \n    if (!filePath) {\n      return reply.code(400).send({ error: 'Missing path parameter' });\n    }\n    \n    if (!existsSync(filePath)) {\n      return reply.code(404).send({ error: 'File not found', path: filePath });\n    }\n    \n    try {\n      const content = readFileSync(filePath, 'utf-8');\n      const ext = filePath.split('.').pop()?.toLowerCase() || 'txt';\n      const mimeMap: Record<string, string> = {\n        md: 'text/markdown',\n        ts: 'text/typescript',\n        js: 'text/javascript',\n        json: 'application/json',\n        txt: 'text/plain',\n      };\n      \n      let frontmatter = {};\n      let bodyContent = content;\n      \n      // Parse frontmatter for markdown files\n      if (ext === 'md') {\n        const parsed = matter(content);\n        frontmatter = parsed.data;\n        bodyContent = parsed.content;\n      }\n      \n      return {\n        content: bodyContent,\n        frontmatter,\n        type: mimeMap[ext] || 'text/plain',\n        path: filePath,\n        fileUri: `file://${filePath}`,\n        mcpUri: resourceManager.toUri(filePath),\n        ext\n      };\n    } catch (error: any) {\n      return reply.code(500).send({ error: 'Failed to read file', message: error.message });\n    }\n  });\n\n  // MCP resource proxy\n  app.get('/mcp/resource', async (request, reply) => {\n    const { uri } = request.query as { uri?: string };\n    \n    if (!uri || !uri.startsWith('mcp://backlog/')) {\n      return reply.code(400).send({ error: 'Invalid MCP URI' });\n    }\n    \n    try {\n      const resource = resourceManager.read(uri);\n      const filePath = resourceManager.resolve(uri);\n      const ext = filePath.split('.').pop()?.toLowerCase() || 'txt';\n      \n      return {\n        content: resource.content,\n        frontmatter: resource.frontmatter || {},\n        type: resource.mimeType,\n        path: filePath,\n        fileUri: `file://${filePath}`,\n        mcpUri: uri,\n        ext\n      };\n    } catch (error: any) {\n      return reply.code(404).send({ error: 'Resource not found', uri, message: error.message });\n    }\n  });\n\n  // Open resource in viewer\n  app.get('/open', async (request, reply) => {\n    const { uri } = request.query as { uri?: string };\n    \n    if (!uri) {\n      return reply.code(400).send({ error: 'Missing uri parameter' });\n    }\n    \n    return reply.redirect(`/?resource=${encodeURIComponent(uri)}`);\n  });\n\n  // Operations API - recent activity (enriched with task titles and epic info)\n  app.get('/operations', async (request) => {\n    const { limit, task, date } = request.query as { limit?: string; task?: string; date?: string };\n    \n    const operations = operationLogger.read({\n      limit: limit ? parseInt(limit) : (date ? 1000 : 50), // Higher limit when filtering by date\n      taskId: task || undefined,\n      date: date || undefined,\n    });\n    \n    // Enrich operations with task titles and epic info\n    // Use in-request cache to avoid duplicate storage lookups\n    const taskCache = new Map<string, { title?: string; epicId?: string }>();\n    const epicCache = new Map<string, string | undefined>();\n    \n    const enriched = operations.map(op => {\n      if (op.resourceId) {\n        if (!taskCache.has(op.resourceId)) {\n          const taskData = storage.get(op.resourceId);\n          taskCache.set(op.resourceId, {\n            title: taskData?.title,\n            epicId: taskData?.epic_id,\n          });\n        }\n        const cached = taskCache.get(op.resourceId)!;\n        \n        // Resolve epic title if task has an epic\n        let epicTitle: string | undefined;\n        if (cached.epicId) {\n          if (!epicCache.has(cached.epicId)) {\n            const epicData = storage.get(cached.epicId);\n            epicCache.set(cached.epicId, epicData?.title);\n          }\n          epicTitle = epicCache.get(cached.epicId);\n        }\n        \n        return { ...op, resourceTitle: cached.title, epicId: cached.epicId, epicTitle };\n      }\n      return op;\n    });\n    \n    return enriched;\n  });\n\n  // Operation count for a specific task (for badge)\n  app.get('/operations/count/:taskId', async (request) => {\n    const { taskId } = request.params as { taskId: string };\n    return { count: operationLogger.countForTask(taskId) };\n  });\n}\n"],"mappings":"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"}

package/dist/viewer/main.css

@@ -1409,6 +1409,15 @@ copy-button {
   color: #d4d4d4;
   flex-shrink: 0;
 }
+.activity-merged-badge {
+  font-size: 11px;
+  font-weight: 500;
+  color: #58a6ff;
+  background: rgba(88, 166, 255, 0.15);
+  padding: 2px 6px;
+  border-radius: 4px;
+  margin-left: 6px;
+}
 .activity-resource {
   flex: 1;
   color: #8b949e;
@@ -1562,22 +1571,37 @@ copy-button {
   border-radius: 6px;
   overflow: hidden;
   margin-top: 8px;
+  position: relative;
 }
 .activity-diff .d2h-file-header {
   display: none;
 }
 .activity-diff .d2h-file-wrapper {
   margin-bottom: 0;
+  border: none;
 }
 .activity-diff .d2h-diff-table {
   font-size: 12px;
 }
+.activity-diff .d2h-code-linenumber {
+  position: sticky;
+  left: 0;
+}
+.activity-diff-stack {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+.activity-diff-stack .activity-diff {
+  margin-top: 0;
+}
 .activity-day-separator {
   display: flex;
   align-items: center;
   gap: 8px;
-  padding: 12px 12px 10px;
-  margin-top: 16px;
+  padding: 12px 12px;
+  margin-top: 20px;
+  margin-bottom: 12px;
   position: sticky;
   top: 0;
   background: #252526;
@@ -1587,7 +1611,6 @@ copy-button {
 }
 .activity-day-separator:first-child {
   margin-top: 0;
-  padding-top: 12px;
 }
 .activity-day-label {
   font-weight: 700;
@@ -1757,19 +1780,23 @@ copy-button {
   flex: 1;
   overflow-y: auto;
   padding: 12px;
+  padding-bottom: 24px;
 }
 .activity-journal-section {
-  margin-bottom: 20px;
+  margin-bottom: 24px;
+  background: #1e1e1e;
+  border-radius: 8px;
+  padding: 12px;
 }
 .activity-journal-section:last-child {
-  margin-bottom: 0;
+  margin-bottom: 12px;
 }
 .activity-journal-section-title {
   font-weight: 600;
   color: #d4d4d4;
   font-size: 14px;
-  margin-bottom: 8px;
-  padding-bottom: 4px;
+  margin-bottom: 12px;
+  padding-bottom: 8px;
   border-bottom: 1px solid #30363d;
 }
 .activity-journal-list {
@@ -1781,7 +1808,16 @@ copy-button {
   display: flex;
   align-items: center;
   gap: 8px;
-  padding: 6px 0;
+  padding: 8px 0;
+  border-bottom: 1px solid #252525;
+  flex-wrap: nowrap;
+  min-width: 0;
+}
+.activity-journal-item:last-child {
+  border-bottom: none;
+}
+.activity-journal-item task-badge {
+  flex-shrink: 0;
 }
 .activity-journal-title {
   color: #8b949e;
@@ -1789,6 +1825,8 @@ copy-button {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  flex: 1;
+  min-width: 0;
 }
 .activity-journal-epic-group {
   margin-bottom: 16px;
@@ -1801,11 +1839,18 @@ copy-button {
   align-items: center;
   gap: 8px;
   padding: 8px 0 4px 0;
+  flex-wrap: nowrap;
+}
+.activity-journal-epic-header task-badge {
+  flex-shrink: 0;
 }
 .activity-journal-epic-title {
   font-weight: 500;
   color: #d4d4d4;
   font-size: 13px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 .activity-journal-epic-group .activity-journal-list {
   padding-left: 12px;
@@ -1813,7 +1858,7 @@ copy-button {
   margin-left: 4px;
 }
 .activity-journal-epic-group .activity-journal-item {
-  padding: 4px 0;
+  padding: 6px 0;
 }
 
 /* viewer/github-markdown.css */

package/dist/viewer/main.js

@@ -4151,6 +4151,10 @@ var SpotlightSearch = class extends HTMLElement {
         if (sort) this.setSortMode(sort);
       });
     });
+    this.attachTabListeners();
+  }
+  // Separate method for tab-related listeners that get re-rendered
+  attachTabListeners() {
     this.querySelectorAll(".spotlight-tab-btn").forEach((btn) => {
       btn.addEventListener("click", (e) => {
         const tab = e.target.dataset.tab;
@@ -4183,7 +4187,7 @@ var SpotlightSearch = class extends HTMLElement {
     this.activeTab = tab;
     this.selectedIndex = 0;
     this.renderDefaultTabs();
-    this.attachEventListeners();
+    this.attachTabListeners();
   }
   selectTabItem(id, type) {
     if (type === "resource") {
@@ -4215,7 +4219,7 @@ var SpotlightSearch = class extends HTMLElement {
       this.isLoadingActivity = false;
       if (this.query.length < 2) {
         this.renderDefaultTabs();
-        this.attachEventListeners();
+        this.attachTabListeners();
       }
     }
   }
@@ -6851,38 +6855,104 @@ function groupByTask(operations) {
   }
   return Array.from(groups.values()).sort((a, b2) => b2.mostRecentTs.localeCompare(a.mostRecentTs));
 }
+var MERGE_WINDOW_MS = 3e4;
+function isStrReplace(op) {
+  if (op.tool !== "write_resource") return false;
+  const operation = op.params.operation;
+  return operation?.type === "str_replace";
+}
+function mergeConsecutiveEdits(operations) {
+  if (operations.length <= 1) return operations;
+  const result = [];
+  let i = 0;
+  while (i < operations.length) {
+    const current = operations[i];
+    if (!isStrReplace(current)) {
+      result.push(current);
+      i++;
+      continue;
+    }
+    const group = [current];
+    const uri = current.params.uri;
+    let j2 = i + 1;
+    while (j2 < operations.length) {
+      const next = operations[j2];
+      if (!isStrReplace(next) || next.params.uri !== uri) break;
+      const newerTs = new Date(group[group.length - 1].ts).getTime();
+      const olderTs = new Date(next.ts).getTime();
+      if (newerTs - olderTs > MERGE_WINDOW_MS) break;
+      group.push(next);
+      j2++;
+    }
+    if (group.length === 1) {
+      result.push(current);
+    } else {
+      const newest = group[0];
+      const oldest = group[group.length - 1];
+      const merged = {
+        ...newest,
+        params: {
+          ...newest.params,
+          _mergedCount: group.length,
+          _mergedOps: group,
+          // Store all ops for stacked diff rendering
+          _mergedRange: { from: oldest.ts, to: newest.ts }
+        }
+      };
+      result.push(merged);
+    }
+    i = j2;
+  }
+  return result;
+}
 function aggregateForJournal(operations) {
   const completed = [];
   const inProgress = [];
   const created = [];
   const updated = [];
-  const seenCompleted = /* @__PURE__ */ new Set();
-  const seenInProgress = /* @__PURE__ */ new Set();
-  const seenCreated = /* @__PURE__ */ new Set();
-  const seenUpdated = /* @__PURE__ */ new Set();
+  const taskState = /* @__PURE__ */ new Map();
   for (const op of operations) {
     const resourceId = op.resourceId;
     if (!resourceId) continue;
     const title = op.resourceTitle || op.params.title || resourceId;
     const epicId = op.epicId;
     const epicTitle = op.epicTitle;
-    if (op.tool === "backlog_create") {
-      if (!seenCreated.has(resourceId)) {
-        seenCreated.add(resourceId);
-        created.push({ resourceId, title, epicId, epicTitle });
-      }
-    } else if (op.tool === "backlog_update") {
+    const entry = { title, epicId, epicTitle };
+    const existing = taskState.get(resourceId);
+    if (op.tool === "backlog_update") {
       const status = op.params.status;
-      if (status === "done" && !seenCompleted.has(resourceId)) {
-        seenCompleted.add(resourceId);
-        completed.push({ resourceId, title, epicId, epicTitle });
-      } else if (status === "in_progress" && !seenInProgress.has(resourceId)) {
-        seenInProgress.add(resourceId);
-        inProgress.push({ resourceId, title, epicId, epicTitle });
-      } else if (!seenUpdated.has(resourceId) && !seenCompleted.has(resourceId) && !seenInProgress.has(resourceId)) {
-        seenUpdated.add(resourceId);
-        updated.push({ resourceId, title, epicId, epicTitle });
+      if (status === "done") {
+        if (!existing || existing.state !== "completed") {
+          taskState.set(resourceId, { state: "completed", ...entry });
+        }
+      } else if (status === "in_progress") {
+        if (!existing || existing.state !== "completed" && existing.state !== "in_progress") {
+          taskState.set(resourceId, { state: "in_progress", ...entry });
+        }
+      } else if (!existing) {
+        taskState.set(resourceId, { state: "updated", ...entry });
       }
+    } else if (op.tool === "backlog_create") {
+      if (!existing || existing.state === "updated") {
+        taskState.set(resourceId, { state: "created", ...entry });
+      }
+    }
+  }
+  for (const [resourceId, data] of taskState) {
+    const entry = { resourceId, title: data.title, epicId: data.epicId, epicTitle: data.epicTitle };
+    switch (data.state) {
+      case "completed":
+        completed.push(entry);
+        break;
+      case "in_progress":
+        inProgress.push(entry);
+        break;
+      case "created":
+        created.push(entry);
+        break;
+      case "updated":
+        updated.push(entry);
+        break;
     }
   }
   return { completed, inProgress, created, updated };
@@ -6939,6 +7009,7 @@ var ActivityPanel = class extends HTMLElement {
   taskId = null;
   operations = [];
   expandedIndex = null;
+  // Changed to timestamp-based ID
   pollTimer = null;
   visibilityHandler = null;
   mode = "timeline";
@@ -6984,21 +7055,37 @@ var ActivityPanel = class extends HTMLElement {
     this.loadOperations();
   }
   setMode(mode) {
+    const wasJournal = this.mode === "journal";
     this.mode = mode;
     this.expandedIndex = null;
     localStorage.setItem(MODE_STORAGE_KEY, mode);
-    this.render();
+    if (mode === "journal" || wasJournal) {
+      this.loadOperations();
+    } else {
+      this.render();
+    }
   }
   setDate(dateKey) {
     this.selectedDate = dateKey;
-    this.render();
+    if (this.mode === "journal") {
+      this.loadOperations();
+    } else {
+      this.render();
+    }
   }
   async loadOperations() {
     if (this.operations.length === 0) {
       this.innerHTML = '<div class="activity-loading">Loading activity...</div>';
     }
     try {
-      const url = this.taskId ? `/operations?task=${encodeURIComponent(this.taskId)}&limit=100` : "/operations?limit=100";
+      let url;
+      if (this.taskId) {
+        url = `/operations?task=${encodeURIComponent(this.taskId)}&limit=100`;
+      } else if (this.mode === "journal") {
+        url = `/operations?date=${this.selectedDate}`;
+      } else {
+        url = "/operations?limit=100";
+      }
       const res = await fetch(url);
       this.operations = await res.json();
       this.render();
@@ -7056,10 +7143,11 @@ var ActivityPanel = class extends HTMLElement {
     `;
   }
   renderTaskGroup(taskGroup) {
+    const mergedOps = mergeConsecutiveEdits(taskGroup.operations);
     const isExpanded = this.expandedTaskGroups.has(taskGroup.resourceId);
-    const hasMore = taskGroup.operations.length > DEFAULT_VISIBLE_ITEMS;
-    const visibleOps = isExpanded ? taskGroup.operations : taskGroup.operations.slice(0, DEFAULT_VISIBLE_ITEMS);
-    const hiddenCount = taskGroup.operations.length - DEFAULT_VISIBLE_ITEMS;
+    const hasMore = mergedOps.length > DEFAULT_VISIBLE_ITEMS;
+    const visibleOps = isExpanded ? mergedOps : mergedOps.slice(0, DEFAULT_VISIBLE_ITEMS);
+    const hiddenCount = mergedOps.length - DEFAULT_VISIBLE_ITEMS;
     const mostRecentDate = new Date(taskGroup.mostRecentTs);
     const mostRecentDateStr = formatDateTime(mostRecentDate);
     return `
@@ -7076,10 +7164,7 @@ var ActivityPanel = class extends HTMLElement {
           ${taskGroup.title !== taskGroup.resourceId ? `<span class="activity-task-title">${this.escapeHtml(taskGroup.title)}</span>` : ""}
           <span class="activity-task-recent">${mostRecentDateStr}</span>
         </div>
-        ${visibleOps.map((op) => {
-      const globalIndex = this.operations.indexOf(op);
-      return this.renderOperation(op, globalIndex);
-    }).join("")}
+        ${visibleOps.map((op) => this.renderOperation(op)).join("")}
         ${hasMore ? `
           <button class="activity-toggle-btn" data-task-id="${taskGroup.resourceId}">
             ${isExpanded ? "Show less" : `Show ${hiddenCount} more`}
@@ -7153,19 +7238,22 @@ var ActivityPanel = class extends HTMLElement {
       </div>
     `;
   }
-  renderOperation(op, index) {
-    const isExpanded = this.expandedIndex === index;
+  renderOperation(op) {
+    const opId = op.ts;
+    const isExpanded = this.expandedIndex === opId;
     const time = new Date(op.ts);
     const dateKey = getLocalDateKey(time);
     const today = getTodayKey();
     const timeStr = dateKey === today ? formatTime(time) : formatDateTime(time);
+    const mergedCount = op.params._mergedCount;
+    const mergedBadge = mergedCount && mergedCount > 1 ? `<span class="activity-merged-badge">${mergedCount} edits</span>` : "";
     return `
-      <div class="activity-item ${isExpanded ? "expanded" : ""}" data-index="${index}">
+      <div class="activity-item ${isExpanded ? "expanded" : ""}" data-op-id="${opId}">
         <div class="activity-item-header">
           <div class="activity-item-left">
             <span class="activity-icon">${getToolIcon(op.tool)}</span>
             <div class="activity-item-info">
-              <span class="activity-label">${getToolLabel(op.tool)}</span>
+              <span class="activity-label">${getToolLabel(op.tool)}${mergedBadge}</span>
               ${this.renderActorInline(op.actor)}
             </div>
           </div>
@@ -7235,15 +7323,21 @@ var ActivityPanel = class extends HTMLElement {
       }).join("");
     } else if (op.tool === "backlog_delete") {
       content += `<div class="activity-detail-row"><span class="activity-detail-value">Task permanently deleted</span></div>`;
-    } else if (op.tool === "write_resource" && op.params.operation) {
-      const operation = op.params.operation;
-      if (operation.type === "str_replace" && operation.old_str && operation.new_str) {
+    } else if (op.tool === "write_resource") {
+      const mergedOps = op.params._mergedOps;
+      if (mergedOps && mergedOps.length > 1) {
         const uri = op.params.uri;
         const filename = uri.split("/").pop() || "file";
-        const unifiedDiff = createUnifiedDiff(operation.old_str, operation.new_str, filename);
+        let combinedDiff = "";
+        for (const mergedOp of [...mergedOps].reverse()) {
+          const operation = mergedOp.params.operation;
+          if (operation.old_str !== void 0 && operation.new_str !== void 0) {
+            combinedDiff += createUnifiedDiff(operation.old_str, operation.new_str, filename) + "\n";
+          }
+        }
         content += `
           <div class="activity-diff">
-            ${html2(unifiedDiff, {
+            ${html2(combinedDiff, {
           drawFileList: false,
           matching: "lines",
           outputFormat: "line-by-line",
@@ -7252,13 +7346,31 @@ var ActivityPanel = class extends HTMLElement {
         })}
           </div>
         `;
-      } else {
-        content += `
-          <div class="activity-detail-row">
-            <span class="activity-detail-label">Operation:</span>
-            <span class="activity-detail-value">${operation.type}</span>
-          </div>
-        `;
+      } else if (op.params.operation) {
+        const operation = op.params.operation;
+        if (operation.type === "str_replace" && operation.old_str !== void 0 && operation.new_str !== void 0) {
+          const uri = op.params.uri;
+          const filename = uri.split("/").pop() || "file";
+          const unifiedDiff = createUnifiedDiff(operation.old_str, operation.new_str, filename);
+          content += `
+            <div class="activity-diff">
+              ${html2(unifiedDiff, {
+            drawFileList: false,
+            matching: "lines",
+            outputFormat: "line-by-line",
+            diffStyle: "word",
+            colorScheme: "dark"
+          })}
+            </div>
+          `;
+        } else {
+          content += `
+            <div class="activity-detail-row">
+              <span class="activity-detail-label">Operation:</span>
+              <span class="activity-detail-value">${operation.type}</span>
+            </div>
+          `;
+        }
       }
     }
     return `<div class="activity-expanded" onclick="event.stopPropagation()">${content}</div>`;
@@ -7297,15 +7409,17 @@ var ActivityPanel = class extends HTMLElement {
           } else {
             this.expandedTaskGroups.add(taskId);
           }
+          const scrollTop = this.scrollTop;
           this.render();
+          this.scrollTop = scrollTop;
         }
       });
     });
     this.querySelectorAll(".activity-item-header").forEach((header) => {
       header.addEventListener("click", () => {
         const item = header.closest(".activity-item");
-        const index = parseInt(item?.getAttribute("data-index") || "0");
-        this.toggleExpand(index);
+        const opId = item?.getAttribute("data-op-id") || "";
+        this.toggleExpand(opId);
       });
     });
     this.querySelectorAll(".activity-task-link").forEach((link) => {
@@ -7332,8 +7446,8 @@ var ActivityPanel = class extends HTMLElement {
   escapeHtml(str) {
     return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
   }
-  toggleExpand(index) {
-    this.expandedIndex = this.expandedIndex === index ? null : index;
+  toggleExpand(opId) {
+    this.expandedIndex = this.expandedIndex === opId ? null : opId;
     this.render();
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backlog-mcp",
-  "version": "0.30.0",
+  "version": "0.31.0",
   "description": "Minimal task backlog MCP server for Claude and AI agents",
   "keywords": [
     "mcp",

package/viewer/components/activity-panel.ts

@@ -15,6 +15,7 @@ import {
   groupByEpic,
   getToolLabel,
   getToolIcon,
+  mergeConsecutiveEdits,
   type OperationEntry,
   type Actor,
   type DayGroup,
@@ -36,7 +37,7 @@ const DEFAULT_VISIBLE_ITEMS = 2;
 export class ActivityPanel extends HTMLElement {
   private taskId: string | null = null;
   private operations: OperationEntry[] = [];
-  private expandedIndex: number | null = null;
+  private expandedIndex: string | null = null; // Changed to timestamp-based ID
   private pollTimer: number | null = null;
   private visibilityHandler: (() => void) | null = null;
   private mode: ViewMode = 'timeline';
@@ -90,16 +91,27 @@ export class ActivityPanel extends HTMLElement {
   }
 
   setMode(mode: ViewMode) {
+    const wasJournal = this.mode === 'journal';
     this.mode = mode;
     this.expandedIndex = null;
     // Persist mode to localStorage
     localStorage.setItem(MODE_STORAGE_KEY, mode);
-    this.render();
+    // Reload when switching to/from journal mode (different data requirements)
+    if (mode === 'journal' || wasJournal) {
+      this.loadOperations();
+    } else {
+      this.render();
+    }
   }
 
   setDate(dateKey: string) {
     this.selectedDate = dateKey;
-    this.render();
+    // Reload operations for the new date when in journal mode
+    if (this.mode === 'journal') {
+      this.loadOperations();
+    } else {
+      this.render();
+    }
   }
 
   async loadOperations() {
@@ -108,9 +120,15 @@ export class ActivityPanel extends HTMLElement {
     }
 
     try {
-      const url = this.taskId 
-        ? `/operations?task=${encodeURIComponent(this.taskId)}&limit=100`
-        : '/operations?limit=100';
+      let url: string;
+      if (this.taskId) {
+        url = `/operations?task=${encodeURIComponent(this.taskId)}&limit=100`;
+      } else if (this.mode === 'journal') {
+        // In journal mode, fetch all operations for the selected date
+        url = `/operations?date=${this.selectedDate}`;
+      } else {
+        url = '/operations?limit=100';
+      }
       
       const res = await fetch(url);
       this.operations = await res.json();
@@ -178,12 +196,15 @@ export class ActivityPanel extends HTMLElement {
   }
 
   private renderTaskGroup(taskGroup: TaskGroup): string {
+    // Merge consecutive edits before rendering
+    const mergedOps = mergeConsecutiveEdits(taskGroup.operations);
+    
     const isExpanded = this.expandedTaskGroups.has(taskGroup.resourceId);
-    const hasMore = taskGroup.operations.length > DEFAULT_VISIBLE_ITEMS;
+    const hasMore = mergedOps.length > DEFAULT_VISIBLE_ITEMS;
     const visibleOps = isExpanded 
-      ? taskGroup.operations 
-      : taskGroup.operations.slice(0, DEFAULT_VISIBLE_ITEMS);
-    const hiddenCount = taskGroup.operations.length - DEFAULT_VISIBLE_ITEMS;
+      ? mergedOps 
+      : mergedOps.slice(0, DEFAULT_VISIBLE_ITEMS);
+    const hiddenCount = mergedOps.length - DEFAULT_VISIBLE_ITEMS;
     
     // Format most recent activity date
     const mostRecentDate = new Date(taskGroup.mostRecentTs);
@@ -203,10 +224,7 @@ export class ActivityPanel extends HTMLElement {
           ${taskGroup.title !== taskGroup.resourceId ? `<span class="activity-task-title">${this.escapeHtml(taskGroup.title)}</span>` : ''}
           <span class="activity-task-recent">${mostRecentDateStr}</span>
         </div>
-        ${visibleOps.map(op => {
-          const globalIndex = this.operations.indexOf(op);
-          return this.renderOperation(op, globalIndex);
-        }).join('')}
+        ${visibleOps.map(op => this.renderOperation(op)).join('')}
         ${hasMore ? `
           <button class="activity-toggle-btn" data-task-id="${taskGroup.resourceId}">
             ${isExpanded ? 'Show less' : `Show ${hiddenCount} more`}
@@ -290,8 +308,9 @@ export class ActivityPanel extends HTMLElement {
     `;
   }
 
-  private renderOperation(op: OperationEntry, index: number): string {
-    const isExpanded = this.expandedIndex === index;
+  private renderOperation(op: OperationEntry): string {
+    const opId = op.ts; // Use timestamp as unique ID
+    const isExpanded = this.expandedIndex === opId;
     const time = new Date(op.ts);
     const dateKey = getLocalDateKey(time);
     const today = getTodayKey();
@@ -300,14 +319,20 @@ export class ActivityPanel extends HTMLElement {
     const timeStr = dateKey === today 
       ? formatTime(time)
       : formatDateTime(time);
+    
+    // Check if this is a merged operation
+    const mergedCount = op.params._mergedCount as number | undefined;
+    const mergedBadge = mergedCount && mergedCount > 1 
+      ? `<span class="activity-merged-badge">${mergedCount} edits</span>` 
+      : '';
 
     return `
-      <div class="activity-item ${isExpanded ? 'expanded' : ''}" data-index="${index}">
+      <div class="activity-item ${isExpanded ? 'expanded' : ''}" data-op-id="${opId}">
         <div class="activity-item-header">
           <div class="activity-item-left">
             <span class="activity-icon">${getToolIcon(op.tool)}</span>
             <div class="activity-item-info">
-              <span class="activity-label">${getToolLabel(op.tool)}</span>
+              <span class="activity-label">${getToolLabel(op.tool)}${mergedBadge}</span>
               ${this.renderActorInline(op.actor)}
             </div>
           </div>
@@ -381,16 +406,26 @@ export class ActivityPanel extends HTMLElement {
       }).join('');
     } else if (op.tool === 'backlog_delete') {
       content += `<div class="activity-detail-row"><span class="activity-detail-value">Task permanently deleted</span></div>`;
-    } else if (op.tool === 'write_resource' && op.params.operation) {
-      const operation = op.params.operation as { type: string; old_str?: string; new_str?: string };
+    } else if (op.tool === 'write_resource') {
+      // Check if this is a merged operation with multiple diffs
+      const mergedOps = op.params._mergedOps as OperationEntry[] | undefined;
       
-      if (operation.type === 'str_replace' && operation.old_str && operation.new_str) {
+      if (mergedOps && mergedOps.length > 1) {
+        // Concatenate all diffs into one unified diff (oldest first)
         const uri = op.params.uri as string;
         const filename = uri.split('/').pop() || 'file';
-        const unifiedDiff = createUnifiedDiff(operation.old_str, operation.new_str, filename);
+        
+        let combinedDiff = '';
+        for (const mergedOp of [...mergedOps].reverse()) {
+          const operation = mergedOp.params.operation as { type: string; old_str?: string; new_str?: string };
+          if (operation.old_str !== undefined && operation.new_str !== undefined) {
+            combinedDiff += createUnifiedDiff(operation.old_str, operation.new_str, filename) + '\n';
+          }
+        }
+        
         content += `
           <div class="activity-diff">
-            ${Diff2Html.html(unifiedDiff, {
+            ${Diff2Html.html(combinedDiff, {
               drawFileList: false,
               matching: 'lines',
               outputFormat: 'line-by-line',
@@ -399,13 +434,33 @@ export class ActivityPanel extends HTMLElement {
             })}
           </div>
         `;
-      } else {
-        content += `
-          <div class="activity-detail-row">
-            <span class="activity-detail-label">Operation:</span>
-            <span class="activity-detail-value">${operation.type}</span>
-          </div>
-        `;
+      } else if (op.params.operation) {
+        // Single operation
+        const operation = op.params.operation as { type: string; old_str?: string; new_str?: string };
+        
+        if (operation.type === 'str_replace' && operation.old_str !== undefined && operation.new_str !== undefined) {
+          const uri = op.params.uri as string;
+          const filename = uri.split('/').pop() || 'file';
+          const unifiedDiff = createUnifiedDiff(operation.old_str, operation.new_str, filename);
+          content += `
+            <div class="activity-diff">
+              ${Diff2Html.html(unifiedDiff, {
+                drawFileList: false,
+                matching: 'lines',
+                outputFormat: 'line-by-line',
+                diffStyle: 'word',
+                colorScheme: 'dark',
+              })}
+            </div>
+          `;
+        } else {
+          content += `
+            <div class="activity-detail-row">
+              <span class="activity-detail-label">Operation:</span>
+              <span class="activity-detail-value">${operation.type}</span>
+            </div>
+          `;
+        }
       }
     }
 
@@ -453,7 +508,10 @@ export class ActivityPanel extends HTMLElement {
           } else {
             this.expandedTaskGroups.add(taskId);
           }
+          // Preserve scroll position during re-render
+          const scrollTop = this.scrollTop;
           this.render();
+          this.scrollTop = scrollTop;
         }
       });
     });
@@ -462,8 +520,8 @@ export class ActivityPanel extends HTMLElement {
     this.querySelectorAll('.activity-item-header').forEach(header => {
       header.addEventListener('click', () => {
         const item = header.closest('.activity-item');
-        const index = parseInt(item?.getAttribute('data-index') || '0');
-        this.toggleExpand(index);
+        const opId = item?.getAttribute('data-op-id') || '';
+        this.toggleExpand(opId);
       });
     });
 
@@ -500,8 +558,8 @@ export class ActivityPanel extends HTMLElement {
       .replace(/"/g, '&quot;');
   }
 
-  private toggleExpand(index: number) {
-    this.expandedIndex = this.expandedIndex === index ? null : index;
+  private toggleExpand(opId: string) {
+    this.expandedIndex = this.expandedIndex === opId ? null : opId;
     this.render();
   }
 }

package/viewer/components/activity-utils.test.ts

@@ -6,6 +6,7 @@ import {
   groupByEpic,
   getToolLabel,
   getToolIcon,
+  mergeConsecutiveEdits,
   type OperationEntry,
   type JournalEntry,
 } from './activity-utils.js';
@@ -188,8 +189,8 @@ describe('activity-utils', () => {
       expect(journal.completed).toHaveLength(1);
     });
 
-    it('shows first status change for each task', () => {
-      // Operations are processed in order - first status wins for each category
+    it('shows only highest priority state for each task', () => {
+      // Task goes through in_progress then done - should only show in completed
       const operations: OperationEntry[] = [
         { ts: '2026-02-05T10:00:00Z', tool: 'backlog_update', params: { status: 'in_progress' }, result: {}, resourceId: 'TASK-0001' },
         { ts: '2026-02-05T11:00:00Z', tool: 'backlog_update', params: { status: 'done' }, result: {}, resourceId: 'TASK-0001' },
@@ -197,9 +198,9 @@ describe('activity-utils', () => {
 
       const journal = aggregateForJournal(operations);
       
-      // Both statuses are recorded since they're different categories
-      expect(journal.inProgress).toHaveLength(1);
+      // Only shows in completed (highest priority), not in_progress
       expect(journal.completed).toHaveLength(1);
+      expect(journal.inProgress).toHaveLength(0);
     });
 
     it('skips operations without resourceId', () => {
@@ -325,4 +326,75 @@ describe('activity-utils', () => {
       expect(getToolIcon('unknown_tool')).toBe('⚡');
     });
   });
+
+  describe('mergeConsecutiveEdits', () => {
+    it('merges consecutive str_replace ops within 30s window', () => {
+      const operations: OperationEntry[] = [
+        // Newest first (reverse chronological)
+        { ts: '2026-02-05T10:00:20.000Z', tool: 'write_resource', params: { uri: 'mcp://backlog/tasks/TASK-0001.md', operation: { type: 'str_replace', old_str: 'B', new_str: 'C' } }, result: {} },
+        { ts: '2026-02-05T10:00:10.000Z', tool: 'write_resource', params: { uri: 'mcp://backlog/tasks/TASK-0001.md', operation: { type: 'str_replace', old_str: 'A', new_str: 'B' } }, result: {} },
+      ];
+
+      const merged = mergeConsecutiveEdits(operations);
+      
+      expect(merged).toHaveLength(1);
+      expect(merged[0].params._mergedCount).toBe(2);
+      // Should store all ops for stacked rendering
+      const mergedOps = merged[0].params._mergedOps as OperationEntry[];
+      expect(mergedOps).toHaveLength(2);
+      expect((mergedOps[0].params.operation as { new_str: string }).new_str).toBe('C'); // newest
+      expect((mergedOps[1].params.operation as { old_str: string }).old_str).toBe('A'); // oldest
+    });
+
+    it('does not merge ops more than 30s apart', () => {
+      const operations: OperationEntry[] = [
+        { ts: '2026-02-05T10:01:00.000Z', tool: 'write_resource', params: { uri: 'mcp://backlog/tasks/TASK-0001.md', operation: { type: 'str_replace', old_str: 'B', new_str: 'C' } }, result: {} },
+        { ts: '2026-02-05T10:00:00.000Z', tool: 'write_resource', params: { uri: 'mcp://backlog/tasks/TASK-0001.md', operation: { type: 'str_replace', old_str: 'A', new_str: 'B' } }, result: {} },
+      ];
+
+      const merged = mergeConsecutiveEdits(operations);
+      
+      expect(merged).toHaveLength(2);
+      expect(merged[0].params._mergedCount).toBeUndefined();
+    });
+
+    it('does not merge ops on different URIs', () => {
+      const operations: OperationEntry[] = [
+        { ts: '2026-02-05T10:00:10.000Z', tool: 'write_resource', params: { uri: 'mcp://backlog/tasks/TASK-0002.md', operation: { type: 'str_replace', old_str: 'X', new_str: 'Y' } }, result: {} },
+        { ts: '2026-02-05T10:00:00.000Z', tool: 'write_resource', params: { uri: 'mcp://backlog/tasks/TASK-0001.md', operation: { type: 'str_replace', old_str: 'A', new_str: 'B' } }, result: {} },
+      ];
+
+      const merged = mergeConsecutiveEdits(operations);
+      
+      expect(merged).toHaveLength(2);
+    });
+
+    it('preserves non-str_replace operations', () => {
+      const operations: OperationEntry[] = [
+        { ts: '2026-02-05T10:00:20.000Z', tool: 'backlog_update', params: { id: 'TASK-0001' }, result: {} },
+        { ts: '2026-02-05T10:00:10.000Z', tool: 'write_resource', params: { uri: 'mcp://backlog/tasks/TASK-0001.md', operation: { type: 'str_replace', old_str: 'A', new_str: 'B' } }, result: {} },
+      ];
+
+      const merged = mergeConsecutiveEdits(operations);
+      
+      expect(merged).toHaveLength(2);
+      expect(merged[0].tool).toBe('backlog_update');
+      expect(merged[1].tool).toBe('write_resource');
+    });
+
+    it('returns empty array for empty input', () => {
+      expect(mergeConsecutiveEdits([])).toEqual([]);
+    });
+
+    it('returns single op unchanged', () => {
+      const operations: OperationEntry[] = [
+        { ts: '2026-02-05T10:00:00.000Z', tool: 'write_resource', params: { uri: 'mcp://backlog/tasks/TASK-0001.md', operation: { type: 'str_replace', old_str: 'A', new_str: 'B' } }, result: {} },
+      ];
+
+      const merged = mergeConsecutiveEdits(operations);
+      
+      expect(merged).toHaveLength(1);
+      expect(merged[0].params._mergedCount).toBeUndefined();
+    });
+  });
 });

package/viewer/components/activity-utils.ts

@@ -132,9 +132,89 @@ export function groupByTask(operations: OperationEntry[]): TaskGroup[] {
     .sort((a, b) => b.mostRecentTs.localeCompare(a.mostRecentTs));
 }
 
+const MERGE_WINDOW_MS = 30000; // 30 seconds
+
+interface StrReplaceOp {
+  type: 'str_replace';
+  old_str: string;
+  new_str: string;
+}
+
+function isStrReplace(op: OperationEntry): op is OperationEntry & { params: { uri: string; operation: StrReplaceOp } } {
+  if (op.tool !== 'write_resource') return false;
+  const operation = op.params.operation as { type?: string } | undefined;
+  return operation?.type === 'str_replace';
+}
+
+/**
+ * Merge consecutive str_replace operations on the same URI within a time window.
+ * Operations are in reverse chronological order (newest first).
+ * Stores all operations in _mergedOps for stacked diff rendering.
+ */
+export function mergeConsecutiveEdits(operations: OperationEntry[]): OperationEntry[] {
+  if (operations.length <= 1) return operations;
+  
+  const result: OperationEntry[] = [];
+  let i = 0;
+  
+  while (i < operations.length) {
+    const current = operations[i];
+    
+    if (!isStrReplace(current)) {
+      result.push(current);
+      i++;
+      continue;
+    }
+    
+    // Start a merge group
+    const group: OperationEntry[] = [current];
+    const uri = current.params.uri;
+    let j = i + 1;
+    
+    // Collect consecutive str_replace ops on same URI within time window
+    while (j < operations.length) {
+      const next = operations[j];
+      if (!isStrReplace(next) || next.params.uri !== uri) break;
+      
+      // Check time gap (operations are newest-first, so group[last] is older)
+      const newerTs = new Date(group[group.length - 1].ts).getTime();
+      const olderTs = new Date(next.ts).getTime();
+      if (newerTs - olderTs > MERGE_WINDOW_MS) break;
+      
+      group.push(next);
+      j++;
+    }
+    
+    if (group.length === 1) {
+      result.push(current);
+    } else {
+      // Create merged operation with all individual ops for stacked rendering
+      const newest = group[0];
+      const oldest = group[group.length - 1];
+      
+      const merged: OperationEntry = {
+        ...newest,
+        params: {
+          ...newest.params,
+          _mergedCount: group.length,
+          _mergedOps: group, // Store all ops for stacked diff rendering
+          _mergedRange: { from: oldest.ts, to: newest.ts },
+        },
+      };
+      result.push(merged);
+    }
+    
+    i = j;
+  }
+  
+  return result;
+}
+
 /**
  * Aggregate operations for journal view.
  * Categorizes tasks by their most significant status change.
+ * Each task appears in only ONE category (highest priority wins):
+ * completed > in_progress > created > updated
  */
 export function aggregateForJournal(operations: OperationEntry[]): JournalData {
   const completed: JournalEntry[] = [];
@@ -142,40 +222,56 @@ export function aggregateForJournal(operations: OperationEntry[]): JournalData {
   const created: JournalEntry[] = [];
   const updated: JournalEntry[] = [];
   
-  const seenCompleted = new Set<string>();
-  const seenInProgress = new Set<string>();
-  const seenCreated = new Set<string>();
-  const seenUpdated = new Set<string>();
+  // Track the highest priority state for each task
+  const taskState = new Map<string, { state: 'completed' | 'in_progress' | 'created' | 'updated'; title: string; epicId?: string; epicTitle?: string }>();
   
+  // Process operations (newest first) to find the latest state
   for (const op of operations) {
     const resourceId = op.resourceId;
     if (!resourceId) continue;
     
-    // Use resourceTitle from server enrichment, fall back to params.title or resourceId
     const title = op.resourceTitle || (op.params.title as string) || resourceId;
     const epicId = op.epicId;
     const epicTitle = op.epicTitle;
+    const entry = { title, epicId, epicTitle };
     
-    if (op.tool === 'backlog_create') {
-      if (!seenCreated.has(resourceId)) {
-        seenCreated.add(resourceId);
-        created.push({ resourceId, title, epicId, epicTitle });
-      }
-    } else if (op.tool === 'backlog_update') {
+    const existing = taskState.get(resourceId);
+    
+    if (op.tool === 'backlog_update') {
       const status = op.params.status as string | undefined;
-      if (status === 'done' && !seenCompleted.has(resourceId)) {
-        seenCompleted.add(resourceId);
-        completed.push({ resourceId, title, epicId, epicTitle });
-      } else if (status === 'in_progress' && !seenInProgress.has(resourceId)) {
-        seenInProgress.add(resourceId);
-        inProgress.push({ resourceId, title, epicId, epicTitle });
-      } else if (!seenUpdated.has(resourceId) && !seenCompleted.has(resourceId) && !seenInProgress.has(resourceId)) {
-        seenUpdated.add(resourceId);
-        updated.push({ resourceId, title, epicId, epicTitle });
+      if (status === 'done') {
+        // Completed is highest priority - always set
+        if (!existing || existing.state !== 'completed') {
+          taskState.set(resourceId, { state: 'completed', ...entry });
+        }
+      } else if (status === 'in_progress') {
+        // In progress beats created/updated
+        if (!existing || (existing.state !== 'completed' && existing.state !== 'in_progress')) {
+          taskState.set(resourceId, { state: 'in_progress', ...entry });
+        }
+      } else if (!existing) {
+        // Generic update - lowest priority
+        taskState.set(resourceId, { state: 'updated', ...entry });
+      }
+    } else if (op.tool === 'backlog_create') {
+      // Created beats updated only
+      if (!existing || existing.state === 'updated') {
+        taskState.set(resourceId, { state: 'created', ...entry });
       }
     }
   }
   
+  // Build result arrays
+  for (const [resourceId, data] of taskState) {
+    const entry: JournalEntry = { resourceId, title: data.title, epicId: data.epicId, epicTitle: data.epicTitle };
+    switch (data.state) {
+      case 'completed': completed.push(entry); break;
+      case 'in_progress': inProgress.push(entry); break;
+      case 'created': created.push(entry); break;
+      case 'updated': updated.push(entry); break;
+    }
+  }
+  
   return { completed, inProgress, created, updated };
 }
 

package/viewer/components/spotlight-search.ts

@@ -113,6 +113,11 @@ class SpotlightSearch extends HTMLElement {
       });
     });
 
+    this.attachTabListeners();
+  }
+
+  // Separate method for tab-related listeners that get re-rendered
+  private attachTabListeners() {
     // Tab buttons
     this.querySelectorAll('.spotlight-tab-btn').forEach(btn => {
       btn.addEventListener('click', (e) => {
@@ -151,7 +156,7 @@ class SpotlightSearch extends HTMLElement {
     this.activeTab = tab;
     this.selectedIndex = 0;
     this.renderDefaultTabs();
-    this.attachEventListeners();
+    this.attachTabListeners();
   }
 
   private selectTabItem(id: string, type: 'task' | 'epic' | 'resource') {
@@ -190,7 +195,7 @@ class SpotlightSearch extends HTMLElement {
       this.isLoadingActivity = false;
       if (this.query.length < 2) {
         this.renderDefaultTabs();
-        this.attachEventListeners();
+        this.attachTabListeners();
       }
     }
   }

package/viewer/styles.css

@@ -1560,6 +1560,16 @@ copy-button {
   flex-shrink: 0;
 }
 
+.activity-merged-badge {
+  font-size: 11px;
+  font-weight: 500;
+  color: #58a6ff;
+  background: rgba(88, 166, 255, 0.15);
+  padding: 2px 6px;
+  border-radius: 4px;
+  margin-left: 6px;
+}
+
 .activity-resource {
   flex: 1;
   color: #8b949e;
@@ -1746,6 +1756,7 @@ copy-button {
   border-radius: 6px;
   overflow: hidden;
   margin-top: 8px;
+  position: relative; /* Fix for d2h-code-linenumber absolute positioning */
 }
 
 .activity-diff .d2h-file-header {
@@ -1754,19 +1765,37 @@ copy-button {
 
 .activity-diff .d2h-file-wrapper {
   margin-bottom: 0;
+  border: none;
 }
 
 .activity-diff .d2h-diff-table {
   font-size: 12px;
 }
 
+.activity-diff .d2h-code-linenumber {
+  position: sticky;
+  left: 0;
+}
+
+/* Stacked diffs container */
+.activity-diff-stack {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.activity-diff-stack .activity-diff {
+  margin-top: 0;
+}
+
 /* Day grouping styles */
 .activity-day-separator {
   display: flex;
   align-items: center;
   gap: 8px;
-  padding: 12px 12px 10px;
-  margin-top: 16px;
+  padding: 12px 12px;
+  margin-top: 20px;
+  margin-bottom: 12px;
   position: sticky;
   top: 0;
   background: #252526;
@@ -1777,7 +1806,6 @@ copy-button {
 
 .activity-day-separator:first-child {
   margin-top: 0;
-  padding-top: 12px;
 }
 
 .activity-day-label {
@@ -1978,22 +2006,26 @@ copy-button {
   flex: 1;
   overflow-y: auto;
   padding: 12px;
+  padding-bottom: 24px;
 }
 
 .activity-journal-section {
-  margin-bottom: 20px;
+  margin-bottom: 24px;
+  background: #1e1e1e;
+  border-radius: 8px;
+  padding: 12px;
 }
 
 .activity-journal-section:last-child {
-  margin-bottom: 0;
+  margin-bottom: 12px;
 }
 
 .activity-journal-section-title {
   font-weight: 600;
   color: #d4d4d4;
   font-size: 14px;
-  margin-bottom: 8px;
-  padding-bottom: 4px;
+  margin-bottom: 12px;
+  padding-bottom: 8px;
   border-bottom: 1px solid #30363d;
 }
 
@@ -2007,7 +2039,18 @@ copy-button {
   display: flex;
   align-items: center;
   gap: 8px;
-  padding: 6px 0;
+  padding: 8px 0;
+  border-bottom: 1px solid #252525;
+  flex-wrap: nowrap;
+  min-width: 0;
+}
+
+.activity-journal-item:last-child {
+  border-bottom: none;
+}
+
+.activity-journal-item task-badge {
+  flex-shrink: 0;
 }
 
 .activity-journal-title {
@@ -2016,6 +2059,8 @@ copy-button {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  flex: 1;
+  min-width: 0;
 }
 
 /* Epic grouping in journal */
@@ -2032,12 +2077,20 @@ copy-button {
   align-items: center;
   gap: 8px;
   padding: 8px 0 4px 0;
+  flex-wrap: nowrap;
+}
+
+.activity-journal-epic-header task-badge {
+  flex-shrink: 0;
 }
 
 .activity-journal-epic-title {
   font-weight: 500;
   color: #d4d4d4;
   font-size: 13px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .activity-journal-epic-group .activity-journal-list {
@@ -2047,5 +2100,5 @@ copy-button {
 }
 
 .activity-journal-epic-group .activity-journal-item {
-  padding: 4px 0;
+  padding: 6px 0;
 }