openhermes 2.6.0 → 2.6.1

package/README.md

@@ -259,17 +259,6 @@ openhermes/
 
 ---
 
-## Environment Variables
-
-Two knobs. That's it.
-
-| Variable | Default | Effect |
-|----------|---------|--------|
-| `OPENCODE_ALLOW_PROJECT_HARNESS` | `false` | Enable project-local harness at `.opencode/openhermes/` |
-| `OPENCODE_CURATOR_LOGS` | `false` | Pipe curator diagnostics to stderr for debugging |
-
----
-
 ## Why OpenHermes ≠ Hermes Agent
 
 Same messenger emoji. Entirely different mediums.

package/lib/ohc/compress/state.mjs

@@ -33,7 +33,7 @@ export function applyCompressionState(state, input, selection, anchorMessageId,
     endId: input.endId,
     summary: storedSummary,
     summaryTokens: input.summaryTokens || 0,
-    compressedTokens: 0,
+    compressedTokens: input.compressedTokens || 0,
     consumedBlockIds: Array.isArray(consumedBlockIds) ? consumedBlockIds : [],
     deactivatedByBlockId: undefined,
     deactivatedByUser: false,

package/lib/ohc/notify.mjs

@@ -3,11 +3,11 @@ function formatTokenCount(tokens) {
   return String(tokens)
 }
 
-function buildProgressBar(prunedCount, visibleCount, width) {
+function buildProgressBar(totalMessagesRemoved, currentMessageCount, width) {
   width = width || 30
-  const total = prunedCount + visibleCount
+  const total = totalMessagesRemoved + currentMessageCount
   if (total === 0) return `\u2502${"\u2591".repeat(width)}\u2502  0% active`
-  const activeRatio = visibleCount / total
+  const activeRatio = currentMessageCount / total
   const activeW = Math.round(activeRatio * width)
   const prunedW = width - activeW
   const bar = "\u2588".repeat(Math.min(activeW, width)) + "\u2591".repeat(Math.min(prunedW, width))
@@ -19,11 +19,11 @@ function buildMinimal(count, tokensRemoved, savedTotal, blockCount) {
   return `\u25A3 OHC | ~${formatTokenCount(savedTotal)} saved total \u2014 ${label}`
 }
 
-function buildDetailed(count, tokensRemoved, savedTotal, blockCount, prunedCount, visibleCount, summary) {
+function buildDetailed(count, tokensRemoved, savedTotal, blockCount, totalMessagesRemoved, currentMessageCount, summary) {
   const label = "Compression"
   let msg = `\u25A3 OHC | ~${formatTokenCount(savedTotal)} saved total`
-  if (prunedCount + visibleCount > 0) {
-    msg += `\n\n${buildProgressBar(prunedCount, visibleCount)}`
+  if (totalMessagesRemoved + currentMessageCount > 0) {
+    msg += `\n\n${buildProgressBar(totalMessagesRemoved, currentMessageCount)}`
   }
   msg += `\n\n\u25A3 ${label} #${blockCount}`
   msg += `\n\u2192 ${count} message${count === 1 ? "" : "s"} removed`
@@ -35,9 +35,13 @@ function buildStrategyNotification(strategy, count, detail) {
   return `\u25A3 OHC | ${strategy}: ${count} pruned${detail ? ` (${detail})` : ""}`
 }
 
-export async function sendCompressNotification(client, sessionId, config, count, summary, tokensRemoved, savedTotal, blockCount, prunedCount, visibleCount) {
+export async function sendCompressNotification(client, sessionId, config, count, summary, tokensRemoved, ss, currentMessageCount) {
   if (count === 0) return false
 
+  const savedTotal = ss?.totalTokensSaved || 0
+  const blockCount = ss?.blockCount || 0
+  const totalMessagesRemoved = ss?.totalMessagesRemoved || 0
+
   const notifType = config.notification ?? "toast"
   const notifMode = config.notificationMode ?? "minimal"
 
@@ -46,7 +50,7 @@ export async function sendCompressNotification(client, sessionId, config, count,
   if (notifType === "toast") {
     const message = notifMode === "minimal"
       ? buildMinimal(count, tokensRemoved, savedTotal, blockCount)
-      : buildDetailed(count, tokensRemoved, savedTotal, blockCount, prunedCount, visibleCount, summary)
+      : buildDetailed(count, tokensRemoved, savedTotal, blockCount, totalMessagesRemoved, currentMessageCount, summary)
     try {
       await client.tui.showToast({
         body: {
@@ -65,7 +69,7 @@ export async function sendCompressNotification(client, sessionId, config, count,
       path: { id: sessionId },
       body: {
         noReply: true,
-        parts: [{ type: "text", text: buildDetailed(count, tokensRemoved, savedTotal, blockCount, prunedCount, visibleCount, summary), ignored: true }],
+        parts: [{ type: "text", text: buildDetailed(count, tokensRemoved, savedTotal, blockCount, totalMessagesRemoved, currentMessageCount, summary), ignored: true }],
       },
     })
   } catch {}

package/lib/ohc/pruner.mjs

@@ -1,6 +1,6 @@
 import { tool } from "@opencode-ai/plugin"
 import { loadConfig } from "./config.mjs"
-import { selectMessagesToReap, totalTokens } from "./reaper.mjs"
+import { selectMessagesToReap, totalTokens, msgTokens } from "./reaper.mjs"
 import {
   loadOhcState, saveOhcState, createSessionState,
   serializeState, deserializeState,
@@ -75,7 +75,6 @@ async function applyCompress(ctx, sessionId, summary, max, min, targetTokens) {
     for (const r of selected) ss.prunedIds.add(r.id)
     ss.summary = summarizeRemoved(selected, summary)
     ss.anchorMessageId = selected[0].id
-    saveOhcState(sessionId, serializeState(ss))
   }
 
   const tokensRemoved = selected.reduce((s, r) => s + r.tokens, 0)
@@ -84,6 +83,8 @@ async function applyCompress(ctx, sessionId, summary, max, min, targetTokens) {
   if (ss) {
     ss.blockCount++
     ss.totalTokensSaved += tokensRemoved
+    ss.totalMessagesRemoved += selected.length
+    saveOhcState(sessionId, serializeState(ss))
   }
   return { removed: selected.length, afterTotal, tokensRemoved, beforeTotal, beforeCount: msgs.length, afterCount: msgs.length - selected.length }
 }
@@ -133,12 +134,21 @@ async function executeRangeCompress(ctx, sessionId, callId, topic, content) {
 
   const runId = allocateRunId(ss)
   const notifications = []
+  let totalActualTokensRemoved = 0
+  const allMessageIds = []
 
   for (const plan of plans) {
     const blockId = allocateBlockId(ss)
     const storedSummary = wrapBlockSummary(blockId, plan.entry.summary)
     const summaryTokens = Math.ceil(storedSummary.length / 4)
 
+    const actualTokensRemoved = plan.selection.messageIds.reduce((sum, mid) => {
+      const msg = searchContext.rawMessagesById.get(mid)
+      return msg ? sum + msgTokens(msg) : sum
+    }, 0)
+    totalActualTokensRemoved += actualTokensRemoved
+    allMessageIds.push(...plan.selection.messageIds)
+
     applyCompressionState(
       ss,
       {
@@ -151,6 +161,7 @@ async function executeRangeCompress(ctx, sessionId, callId, topic, content) {
         compressMessageId: plan.selection.messageIds[0],
         compressCallId: callId,
         summaryTokens,
+        compressedTokens: actualTokensRemoved,
       },
       plan.selection,
       plan.anchorMessageId,
@@ -160,7 +171,8 @@ async function executeRangeCompress(ctx, sessionId, callId, topic, content) {
     )
 
     ss.blockCount++
-    ss.totalTokensSaved += summaryTokens
+    ss.totalTokensSaved += actualTokensRemoved
+    ss.totalMessagesRemoved += plan.selection.messageIds.length
 
     notifications.push({
       blockId,
@@ -170,11 +182,14 @@ async function executeRangeCompress(ctx, sessionId, callId, topic, content) {
     })
   }
 
+  saveOhcState(sessionId, serializeState(ss))
+
   return {
-    messageIds: plans.flatMap(p => p.selection.messageIds),
-    compressedTokens: 0,
+    messageIds: allMessageIds,
+    compressedTokens: totalActualTokensRemoved,
     summaryRef: content[0]?.summary || topic,
     blockCount: plans.length,
+    afterCount: rawMessages.length - allMessageIds.length,
   }
 }
 
@@ -283,10 +298,11 @@ export const OhcPlugin = async (ctx) => {
           for (const r of selected) ss.prunedIds.add(r.id)
           if (!ss.summary) ss.summary = summarizeRemoved(selected, null)
           if (!ss.anchorMessageId) ss.anchorMessageId = selected[0].id
-          saveOhcState(sessionId, serializeState(ss))
           const tokensRemoved = selected.reduce((s, r) => s + r.tokens, 0)
           ss.blockCount++
           ss.totalTokensSaved += tokensRemoved
+          ss.totalMessagesRemoved += selected.length
+          saveOhcState(sessionId, serializeState(ss))
           ss.lastAutoPruneAt = now
           ss._pruneCycleDone = true
         }
@@ -416,7 +432,11 @@ export const OhcPlugin = async (ctx) => {
         const timing = buildTimingStr(ss)
         const activeBlockIds = [...(ss?.prune?.messages?.activeBlockIds || [])].filter(id => Number.isInteger(id)).sort((a, b) => a - b)
         const blockLine = activeBlockIds.length ? ` Blocks: bk${activeBlockIds.join(", bk")}.` : ""
-        const text = `[OHC Status] ${msgs.length} messages visible (${prunedCount} auto-pruned, ${strategyPruned} strategy-pruned)${blockLine}${timing}. ~${Math.round(t / 1000)}K / ${max.toLocaleString()} tokens (${Math.round((t / max) * 100)}%). Soft floor: ${min.toLocaleString()}.`
+        const summaryBufferTotal = config.compress?.summaryBuffer
+          ? estimateSummaryTokens(msgs)
+          : 0
+        const effectiveMax = max + summaryBufferTotal
+        const text = `[OHC Status] ${msgs.length} messages visible (${prunedCount} auto-pruned, ${strategyPruned} strategy-pruned)${blockLine}${timing}. ~${Math.round(t / 1000)}K / ${effectiveMax.toLocaleString()} tokens (${Math.round((t / effectiveMax) * 100)}%). Soft floor: ${min.toLocaleString()}.`
         await ctx.client.session.prompt({
           path: { id: input.sessionID },
           body: { noReply: true, parts: [{ type: "text", text, ignored: true }] },
@@ -475,7 +495,7 @@ export const OhcPlugin = async (ctx) => {
         try {
           const result = await applyCompress(ctx, input.sessionID, focus, max, min, targetTokens)
           const cmdSs = getOrCreateState(input.sessionID)
-          await sendCompressNotification(ctx.client, input.sessionID, config, result.removed, focus, result.tokensRemoved, cmdSs?.totalTokensSaved || 0, cmdSs?.blockCount || 0, result.removed, result.afterCount)
+          await sendCompressNotification(ctx.client, input.sessionID, config, result.removed, focus, result.tokensRemoved, cmdSs, result.afterCount)
           output.parts.length = 0
           output.parts.push({
             type: "text",
@@ -574,14 +594,14 @@ export const OhcPlugin = async (ctx) => {
             const result = await executeRangeCompress(ctx, sessionId, callId, args.topic || "Compression", args.content)
             toolCtx.metadata({ title: "Compress Range" })
             const resultSs = getOrCreateState(sessionId)
-            await sendCompressNotification(ctx.client, sessionId, config, result.messageIds.length, result.summaryRef, result.compressedTokens, resultSs?.totalTokensSaved || 0, resultSs?.blockCount || 0, result.messageIds.length, 0)
+            await sendCompressNotification(ctx.client, sessionId, config, result.messageIds.length, result.summaryRef, result.compressedTokens, resultSs, result.afterCount || 0)
             return `Compressed ${result.messageIds.length} messages across ${args.content.length} range(s). Summary: "${truncateText(result.summaryRef, 200)}"`
           }
 
           const result = await applyCompress(ctx, sessionId, args.summary, max, min, args.targetTokens)
           toolCtx.metadata({ title: "Compress" })
           const toolSs = getOrCreateState(sessionId)
-          await sendCompressNotification(ctx.client, sessionId, config, result.removed, truncateText(args.summary, 200), result.tokensRemoved, toolSs?.totalTokensSaved || 0, toolSs?.blockCount || 0, result.removed, result.afterCount)
+          await sendCompressNotification(ctx.client, sessionId, config, result.removed, truncateText(args.summary, 200), result.tokensRemoved, toolSs, result.afterCount)
           return `Compressed: ${result.removed} messages removed. Summary: "${truncateText(args.summary, 200)}"`
         },
       }),

package/lib/ohc/reaper.mjs

@@ -10,7 +10,7 @@ function partTokens(part) {
   return Math.ceil(JSON.stringify(part).length / 4)
 }
 
-function msgTokens(msg) {
+export function msgTokens(msg) {
   return (Array.isArray(msg.parts) ? msg.parts : []).reduce((s, p) => s + partTokens(p), 0)
 }
 

package/lib/ohc/state.mjs

@@ -89,6 +89,7 @@ export function createSessionState() {
     summary: null,
     anchorMessageId: null,
     totalTokensSaved: 0,
+    totalMessagesRemoved: 0,
     blockCount: 0,
   }
 }
@@ -136,6 +137,7 @@ export function serializeState(state) {
     },
     lastAutoPruneAt: state.lastAutoPruneAt,
     totalTokensSaved: state.totalTokensSaved,
+    totalMessagesRemoved: state.totalMessagesRemoved,
     blockCount: state.blockCount,
     summary: state.summary,
     anchorMessageId: state.anchorMessageId,
@@ -180,6 +182,7 @@ export function deserializeState(saved) {
   }
   state.lastAutoPruneAt = saved.lastAutoPruneAt || null
   state.totalTokensSaved = saved.totalTokensSaved || 0
+  state.totalMessagesRemoved = saved.totalMessagesRemoved || 0
   state.blockCount = saved.blockCount || 0
   state.summary = saved.summary || null
   state.anchorMessageId = saved.anchorMessageId || null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openhermes",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "OpenHermes plugin suite for OpenCode — autonomous checkpointing, native memory tools, subagent routing, slash commands, and skill-candidate detection.",
   "type": "module",
   "license": "MIT",