@osovv/vv-opencode 1.3.3 → 1.3.5

package/dist/plugins/tool-history-compaction/transform.js

@@ -1,9 +1,9 @@
 // FILE: src/plugins/tool-history-compaction/transform.ts
-// VERSION: 0.1.0
+// VERSION: 0.2.0
 // START_MODULE_CONTRACT
-//   PURPOSE: Apply tool-history compaction to the in-memory message list the model is about to receive: walk messages newest-first, protect the recent tail, dispatch retained/read/other tools to the right compaction layer, and mutate only completed tool part outputs.
-//   SCOPE: Completed-tool-part detection, protected-tail accounting, retention dispatch, read-slim and prune application, and idempotent in-place output rewrites.
-//   DEPENDS: [src/plugins/tool-history-compaction/config.ts, src/plugins/tool-history-compaction/retention.ts, src/plugins/tool-history-compaction/prune.ts, src/plugins/tool-history-compaction/read-slim.ts]
+//   PURPOSE: Apply tool-history compaction to the in-memory message list the model is about to receive: compute an absolute recent-message window from message recency times, walk messages newest-first, dispatch retained/read/other tools to the right compaction layer, persist full pruned outputs for recoverable markers, and mutate only completed tool part outputs.
+//   SCOPE: Recency-time window computation, completed-tool-part detection, per-call protection accounting outside the window, retention dispatch, read-slim and prune application, optional disk-backed prune recovery, and idempotent in-place output rewrites.
+//   DEPENDS: [src/plugins/tool-history-compaction/config.ts, src/plugins/tool-history-compaction/retention.ts, src/plugins/tool-history-compaction/prune.ts, src/plugins/tool-history-compaction/read-slim.ts, src/plugins/tool-history-compaction/saved-output.ts]
 //   LINKS: [M-PLUGIN-TOOL-HISTORY-COMPACTION]
 //   ROLE: RUNTIME
 //   MAP_MODE: EXPORTS
@@ -11,15 +11,17 @@
 //
 // START_MODULE_MAP
 //   TransformMessage - One message entry in the transform hook output.
+//   recentMessageIndexes - Indices of the newest messages by recency time (array-position tie-break and fallback).
 //   compactMessages - Deterministically rewrite eligible tool part outputs in place.
 // END_MODULE_MAP
 //
 // START_CHANGE_SUMMARY
-//   LAST_CHANGE: [v0.1.0 - Established the transform core with protected tail, retention dispatch, and idempotence.]
+//   LAST_CHANGE: [v0.2.0 - Added recency-time recent-message window, fixed retained-tool budget leak, and added recoverable disk-backed pruning.]
 // END_CHANGE_SUMMARY
 import { pruneOutput } from "./prune.js";
 import { slimReadOutput } from "./read-slim.js";
 import { isRetainedTool } from "./retention.js";
+import { savePrunedOutputOnce } from "./saved-output.js";
 function isCompletedToolPart(part) {
     return part.type === "tool" && part.state.status === "completed";
 }
@@ -30,7 +32,40 @@ function isCompactedByOpencode(part) {
 function isReadTool(tool) {
     return tool.toLowerCase() === "read";
 }
-// END_BLOCK_GUARDS
+function messageRecencyTime(message) {
+    const info = message?.info;
+    const time = info?.time;
+    return time?.completed ?? time?.created ?? Number.NEGATIVE_INFINITY;
+}
+/**
+ * Compute the indices of the newest `count` messages by recency time.
+ * Ties are broken by array position (later index wins); messages without
+ * usable times fall back to array-position ordering so the newest entries are
+ * still selected deterministically.
+ * @param messages - the transform hook's message list.
+ * @param count - how many newest messages to protect; 0 or negative disables the window.
+ * @returns the set of protected message indices.
+ */
+export function recentMessageIndexes(messages, count) {
+    const result = new Set();
+    if (count <= 0 || messages.length === 0)
+        return result;
+    const ranked = messages
+        .map((message, index) => ({ index, recency: messageRecencyTime(message) }))
+        .sort((a, b) => {
+        if (b.recency !== a.recency)
+            return b.recency - a.recency;
+        return b.index - a.index;
+    });
+    const take = Math.min(count, ranked.length);
+    for (let k = 0; k < take; k++) {
+        const entry = ranked[k];
+        if (entry)
+            result.add(entry.index);
+    }
+    return result;
+}
+// END_BLOCK_WINDOW
 // START_BLOCK_COMPACT
 /**
  * Deterministically rewrite eligible tool part outputs in place.
@@ -41,12 +76,15 @@ function isReadTool(tool) {
  * @param config - resolved compaction config.
  */
 export function compactMessages(messages, config) {
+    // The newest message is always protected; protectRecentMessages widens the window.
+    const windowSize = Math.max(1, config.protectRecentMessages);
+    const protectedMessages = recentMessageIndexes(messages, windowSize);
     let remainingProtection = config.protectLastCalls;
-    let firstMessage = true;
     for (let i = messages.length - 1; i >= 0; i--) {
         const message = messages[i];
         if (!message)
             continue;
+        const withinWindow = protectedMessages.has(i);
         for (let j = message.parts.length - 1; j >= 0; j--) {
             const part = message.parts[j];
             if (!part || part.type !== "tool")
@@ -55,14 +93,17 @@ export function compactMessages(messages, config) {
                 continue;
             if (isCompactedByOpencode(part))
                 continue;
-            const withinTail = firstMessage || remainingProtection > 0;
-            if (withinTail) {
-                if (!firstMessage)
-                    remainingProtection -= 1;
+            // Absolute recent-message window: nothing inside the newest messages is rewritten.
+            if (withinWindow)
                 continue;
-            }
+            // Retained tools are never compacted and do not consume the per-call budget.
             if (isRetainedTool(part.tool, config.retainTools))
                 continue;
+            // Per-call protection budget applies only to compaction-eligible parts outside the window.
+            if (remainingProtection > 0) {
+                remainingProtection -= 1;
+                continue;
+            }
             const output = part.state.output;
             let rewritten;
             if (config.readSlim && isReadTool(part.tool)) {
@@ -77,16 +118,27 @@ export function compactMessages(messages, config) {
                 }
             }
             else {
-                const pruned = pruneOutput(output, config);
-                if (pruned)
-                    rewritten = pruned.output;
+                const basePruned = pruneOutput(output, config);
+                if (basePruned) {
+                    if (config.savePrunedOutput) {
+                        const savedPath = savePrunedOutputOnce(output, part.callID);
+                        if (savedPath) {
+                            const recoverable = pruneOutput(output, config, savedPath);
+                            rewritten = recoverable ? recoverable.output : basePruned.output;
+                        }
+                        else {
+                            rewritten = basePruned.output;
+                        }
+                    }
+                    else {
+                        rewritten = basePruned.output;
+                    }
+                }
             }
             if (rewritten !== undefined && rewritten !== output) {
                 part.state.output = rewritten;
             }
         }
-        if (firstMessage)
-            firstMessage = false;
     }
 }
 // END_BLOCK_COMPACT

package/dist/plugins/tool-history-compaction/transform.js.map

@@ -1 +1 @@
-{"version":3,"file":"transform.js","sourceRoot":"","sources":["../../../src/plugins/tool-history-compaction/transform.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transform.js","sourceRoot":"","sources":["../../../src/plugins/tool-history-compaction/transform.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@osovv/vv-opencode",
-  "version": "1.3.3",
-  "description": "A curated, opinionated set of OpenCode plugins for spec-first, review-driven, safer agentic development.",
+  "version": "1.3.5",
+  "description": "An opinionated agentic development layer for OpenCode — spec-first when it matters, review-driven execution, portable model roles, safer tools, and long-run safety.",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/schemas/vvoc/v3.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdn.jsdelivr.net/npm/@osovv/vv-opencode@1.3.3/schemas/vvoc/v3.json",
+  "$id": "https://cdn.jsdelivr.net/npm/@osovv/vv-opencode@1.3.5/schemas/vvoc/v3.json",
   "title": "vvoc config",
   "description": "Canonical vvoc configuration document.",
   "type": "object",
@@ -169,6 +169,8 @@
             "properties": {
               "enabled": { "type": "boolean" },
               "protectLastCalls": { "type": "integer", "minimum": 0 },
+              "protectRecentMessages": { "type": "integer", "minimum": 0 },
+              "savePrunedOutput": { "type": "boolean" },
               "minSavingsChars": { "type": "integer", "minimum": 0 },
               "outputMaxChars": { "type": "integer", "minimum": 0 },
               "headChars": { "type": "integer", "minimum": 0 },

package/templates/skills/vv-execute/SKILL.md

@@ -45,27 +45,27 @@ Do not mutate files until the execution mode is explicit. In classic mode, deleg
   <purpose>List all module names</purpose>
 </helper>
 <helper name="list-tasks">
-  <command>grep '&lt;id&gt;T-' PLAN_PATH</command>
+  <command>grep '&lt;TASK-T-' PLAN_PATH</command>
   <purpose>List all task IDs in document order</purpose>
 </helper>
 <helper name="extract-task">
-  <command>sed -n '/&lt;id&gt;T-NNN&lt;\/id&gt;/,/&lt;\/task&gt;/p' PLAN_PATH</command>
-  <purpose>Extract one full task by ID (replace T-NNN with actual ID like T-001)</purpose>
+  <command>sed -n '/&lt;TASK-T-NNN&gt;/,/&lt;\/TASK-T-NNN&gt;/p' PLAN_PATH</command>
+  <purpose>Extract one full task by ID (replace T-NNN in the TASK-T-NNN element name with the actual ID, e.g. TASK-T-001)</purpose>
 </helper>
 <helper name="extract-snippet">
-  <command>sed -n '/&lt;id&gt;T-NNN&lt;\/id&gt;/,/&lt;\/task&gt;/p' PLAN_PATH | sed -n '/&lt;snippet&gt;/,/&lt;\/snippet&gt;/p'</command>
+  <command>sed -n '/&lt;TASK-T-NNN&gt;/,/&lt;\/TASK-T-NNN&gt;/p' PLAN_PATH | sed -n '/&lt;snippet&gt;/,/&lt;\/snippet&gt;/p'</command>
   <purpose>Extract only the code snippet for a specific task</purpose>
 </helper>
 <helper name="extract-acceptance">
-  <command>sed -n '/&lt;id&gt;T-NNN&lt;\/id&gt;/,/&lt;\/task&gt;/p' PLAN_PATH | sed -n '/&lt;acceptance&gt;/,/&lt;\/acceptance&gt;/p'</command>
+  <command>sed -n '/&lt;TASK-T-NNN&gt;/,/&lt;\/TASK-T-NNN&gt;/p' PLAN_PATH | sed -n '/&lt;acceptance&gt;/,/&lt;\/acceptance&gt;/p'</command>
   <purpose>Extract all acceptance criteria for a specific task</purpose>
 </helper>
 <helper name="task-file">
-  <command>sed -n '/&lt;id&gt;T-NNN&lt;\/id&gt;/,/&lt;\/task&gt;/p' PLAN_PATH | grep '&lt;file&gt;'</command>
+  <command>sed -n '/&lt;TASK-T-NNN&gt;/,/&lt;\/TASK-T-NNN&gt;/p' PLAN_PATH | grep '&lt;file&gt;'</command>
   <purpose>Get the target file for a specific task</purpose>
 </helper>
 <helper name="task-status">
-  <command>sed -n '/&lt;id&gt;T-NNN&lt;\/id&gt;/,/&lt;\/task&gt;/p' PLAN_PATH | grep '&lt;status&gt;'</command>
+  <command>sed -n '/&lt;TASK-T-NNN&gt;/,/&lt;\/TASK-T-NNN&gt;/p' PLAN_PATH | grep '&lt;status&gt;'</command>
   <purpose>Get current status of a specific task</purpose>
 </helper>
 <helper name="dependency-graph">
@@ -73,11 +73,11 @@ Do not mutate files until the execution mode is explicit. In classic mode, deleg
   <purpose>Show all task dependencies</purpose>
 </helper>
 <helper name="task-deps">
-  <command>sed -n '/&lt;id&gt;T-NNN&lt;\/id&gt;/,/&lt;\/task&gt;/p' PLAN_PATH | grep '&lt;task_id&gt;'</command>
+  <command>sed -n '/&lt;TASK-T-NNN&gt;/,/&lt;\/TASK-T-NNN&gt;/p' PLAN_PATH | grep '&lt;task_id&gt;'</command>
   <purpose>List dependencies for a specific task</purpose>
 </helper>
 <helper name="count-tasks">
-  <command>grep -c '&lt;id&gt;T-' PLAN_PATH</command>
+  <command>grep -c '&lt;TASK-T-' PLAN_PATH</command>
   <purpose>Count total tasks in the plan</purpose>
 </helper>
 <helper name="all-files">
@@ -103,8 +103,8 @@ Do not mutate files until the execution mode is explicit. In classic mode, deleg
   <check>Plan contains a non-empty &lt;spec&gt; path pointing to a readable active spec file at .vvoc/specs/&lt;id&gt;/spec.xml. Stop and report if the spec path is under archive/.</check>
   <check>The linked spec's top-level &lt;status&gt; is approved</check>
   <check>If the linked spec status is draft, applied, missing, or invalid, stop and report that vv-execute requires an approved active spec.</check>
-  <check>Plan contains &lt;tasks&gt; section with at least one &lt;task&gt;</check>
-  <check>Each task has non-empty &lt;id&gt;, &lt;title&gt;, and &lt;file&gt;</check>
+  <check>Plan contains &lt;tasks&gt; section with at least one &lt;TASK-T-NNN&gt; element grouped under &lt;WAVE-N&gt; elements</check>
+  <check>Each task element name matches the TASK-T-NNN pattern and the task has non-empty &lt;title&gt; and &lt;file&gt;. There is no child id element — identity lives in the element name.</check>
   <check>Each task has &lt;snippet&gt; (may be empty but must exist)</check>
   <check>Each task has &lt;acceptance&gt; with at least one &lt;criterion&gt;</check>
   <action>If any check fails, stop and report the issue with line numbers. Do not proceed with broken plan.</action>

package/templates/skills/vv-plan/SKILL.md

@@ -36,8 +36,9 @@ You are the vv-plan skill. Your job is to take an approved spec and write an imp
 <rule>When first saving the plan, set the top-level status to &lt;status&gt;draft&lt;/status&gt;. Only change it to approved after the user explicitly reads/reviews and approves the final plan. Never set the top-level status to applied yourself; applied is reserved for vv-execute after successful execution.</rule>
 <rule>The plan contains two major sections: architecture (modules, contracts, dependencies) and tasks (implementation steps with code snippets).</rule>
 <rule>Architecture section uses child tags: module, name, purpose, file (path, role), contract, depends_on (module).</rule>
-<rule>Tasks use child tags: id (T-NNN pattern), title, file, status, description, depends_on (task_id), snippet (CDATA), acceptance (criterion), verification (command). Task-level &lt;status&gt; values are separate from the top-level plan lifecycle status and may remain pending until execution updates them.</rule>
-<rule>Every XML element is named for grep extraction. Use: `grep '&lt;id&gt;T-' plan.xml` to list tasks, `grep '&lt;criterion&gt;' plan.xml` for all criteria, `grep '&lt;task_id&gt;' plan.xml` for dependency graph.</rule>
+<rule>Tasks are grouped into wave elements whose identity is the element name: &lt;WAVE-1&gt;, &lt;WAVE-2&gt;, … Each wave contains a &lt;goal&gt; and its tasks.</rule>
+<rule>A task's identity is its element name in the TASK-T-NNN pattern: &lt;TASK-T-001&gt;…&lt;/TASK-T-001&gt;. The identity repeats on both boundaries so long blocks stay addressable. Tasks use child tags: title, file, status, description, depends_on (task_id), snippet (CDATA), acceptance (criterion), verification (command). Do NOT add a child id element — the element name is the single authoritative identity. Task-level &lt;status&gt; values are separate from the top-level plan lifecycle status and may remain pending until execution updates them.</rule>
+<rule>Every XML element is named for grep extraction. Use: `grep '&lt;TASK-T-' plan.xml` to list tasks, `grep '&lt;criterion&gt;' plan.xml` for all criteria, `grep '&lt;task_id&gt;' plan.xml` for dependency graph.</rule>
 <rule>Populate the &lt;spec&gt; element with the path to the spec.xml this plan implements.</rule>
 <rule>If a design-context.xml was found and read as explanatory context, populate the &lt;design-context&gt; element with the path to design-context.xml so execution tools and reviewers can locate it.</rule>
 <location>Save plan.xml as a sibling of spec.xml in the same spec package directory: .vvoc/specs/&lt;id&gt;/plan.xml</location>
@@ -61,10 +62,9 @@ You are the vv-plan skill. Your job is to take an approved spec and write an imp
 </acceptance_criteria_format>
 
 <example>
-<rule>Here is a concrete example of one task in the new format. Every &lt;snippet&gt; uses CDATA, and every &lt;criterion&gt; is testable:</rule>
+<rule>Here is a concrete example of one task. The task identity is the element name, repeated on both boundaries; every &lt;snippet&gt; uses CDATA, and every &lt;criterion&gt; is testable:</rule>
 <sample-fragment>
-  &lt;task&gt;
-  &lt;id&gt;T-001&lt;/id&gt;
+  &lt;TASK-T-001&gt;
   &lt;title&gt;LRU Cache Store&lt;/title&gt;
   &lt;file&gt;src/lib/cache-store.ts&lt;/file&gt;
   &lt;status&gt;pending&lt;/status&gt;
@@ -111,9 +111,9 @@ export type CacheStoreOptions = {
   &lt;verification&gt;
     &lt;command&gt;bun test src/lib/cache-store.test.ts&lt;/command&gt;
   &lt;/verification&gt;
-  &lt;/task&gt;
+  &lt;/TASK-T-001&gt;
 </sample-fragment>
-<rule>Notice: the snippet uses CDATA wrapping (mandatory). Every element is a child tag (no attributes). The task has id, title, file, status, description, snippet, acceptance, and verification — all as child elements.</rule>
+<rule>Notice: the task identity TASK-T-001 appears in the opening and closing element names. The snippet uses CDATA wrapping (mandatory). Every field is a child tag (no attributes): title, file, status, description, snippet, acceptance, and verification.</rule>
 </example>
 
 <file_structure>
@@ -142,6 +142,7 @@ export type CacheStoreOptions = {
 <forbidden>XML attributes in any tag — use child elements only</forbidden>
 <forbidden>Code outside CDATA — all snippets must be wrapped in CDATA sections</forbidden>
 <forbidden>Numbered criterion tags — use plain &lt;criterion&gt;, not numbered variants</forbidden>
+<forbidden>Generic &lt;task&gt; or &lt;wave&gt; elements with child id/num elements — identity belongs in the element name: &lt;TASK-T-NNN&gt;, &lt;WAVE-N&gt;</forbidden>
 </no_placeholders>
 
 <self_review>
@@ -150,7 +151,7 @@ export type CacheStoreOptions = {
 <check>Acceptance criteria quality: Is every criterion testable? Could a reviewer or implementer write a failing test for it?</check>
 <check>Type consistency: Do types, signatures, and property names match across tasks? A function called `clearLayers()` in Task 3 but `clearFullLayers()` in Task 7 is a bug.</check>
 <rule>Fix issues inline as you find them. No second review pass needed — just fix and continue.</rule>
-<check>Format compliance: Are there zero XML attributes? Is every snippet in CDATA? Are tasks using id child tags instead of task-N numbering?</check>
+<check>Format compliance: Are there zero XML attributes? Is every snippet in CDATA? Is every task a &lt;TASK-T-NNN&gt; element with identity in the element name and no child id element?</check>
 <check>Architecture presence: Does the plan have an architecture section with modules, contracts, and dependency graph?</check>
 </self_review>
 

package/templates/skills/vv-plan/references/plan-template.xml

@@ -28,11 +28,9 @@
   </architecture>
 
   <tasks>
-    <wave>
-      <num>1</num>
+    <WAVE-1>
       <goal></goal>
-      <task>
-        <id>T-001</id>
+      <TASK-T-001>
         <title></title>
         <file></file>
         <status>pending</status>
@@ -49,7 +47,7 @@
         <verification>
           <command></command>
         </verification>
-      </task>
-    </wave>
+      </TASK-T-001>
+    </WAVE-1>
   </tasks>
 </plan>