@jmylchreest/aide-plugin 0.0.42 → 0.0.44

package/src/opencode/hooks.ts

@@ -26,6 +26,7 @@
  */
 
 import { execFileSync } from "child_process";
+import { join } from "path";
 import { findAideBinary } from "../core/aide-client.js";
 import {
   ensureDirectories,
@@ -66,6 +67,7 @@ import {
   buildSummaryFromPartials,
   cleanupPartials,
 } from "../core/partial-memory.js";
+import { ContextPruningTracker } from "../core/context-pruning/index.js";
 import type { MemoryInjection, SessionState } from "../core/types.js";
 import type {
   Hooks,
@@ -114,6 +116,8 @@ interface AideState {
   /** Per-session metadata for agent-like tracking */
   sessionInfoMap: Map<string, SessionInfo>;
   client: OpenCodeClient;
+  /** Context pruning tracker for dedup/supersede/purge of tool outputs */
+  pruningTracker: ContextPruningTracker;
 }
 
 /**
@@ -142,6 +146,7 @@ export async function createHooks(
     lastUserPrompt: null,
     sessionInfoMap: new Map(),
     client,
+    pruningTracker: new ContextPruningTracker(cwd),
   };
 
   // Run one-time initialization (directories, binary, config)
@@ -184,16 +189,49 @@ function createConfigHandler(
       // Discover all skills and register them as OpenCode commands
       const skills = discoverSkills(state.cwd, state.pluginRoot ?? undefined);
 
+      // Register our skill directories with OpenCode's native skill discovery
+      // as a fallback, so the native `skill` tool can also find them.
+      const skillsConfig = (input as Record<string, unknown>).skills as
+        | { paths?: string[]; urls?: string[] }
+        | undefined;
+      const existingPaths = skillsConfig?.paths ?? [];
+      const aidePaths = [
+        join(state.cwd, ".aide", "skills"),
+        join(state.cwd, "skills"),
+      ];
+      if (state.pluginRoot) {
+        aidePaths.push(join(state.pluginRoot, "skills"));
+      }
+      // Only add paths that aren't already registered
+      const newPaths = aidePaths.filter((p) => !existingPaths.includes(p));
+      if (newPaths.length > 0) {
+        (input as Record<string, unknown>).skills = {
+          ...skillsConfig,
+          paths: [...existingPaths, ...newPaths],
+        };
+      }
+
       if (!input.command) {
         input.command = {};
       }
 
       for (const skill of skills) {
+        // Skip skills restricted to other platforms
+        if (
+          skill.platforms &&
+          skill.platforms.length > 0 &&
+          !skill.platforms.includes("opencode")
+        ) {
+          continue;
+        }
         const commandName = `aide:${skill.name}`;
         // Only register if not already defined (user config takes priority)
         if (!input.command[commandName]) {
           input.command[commandName] = {
-            template: `Activate the aide "${skill.name}" skill. {{arguments}}`,
+            // IMPORTANT: Template wording must NOT trigger the native "skill" tool.
+            // The actual instructions are injected into the system prompt by
+            // createCommandHandler → pendingSkillsContext → createSystemTransformHandler.
+            template: `Follow the aide "${skill.name}" instructions that have been injected into your system prompt. Do NOT use the skill tool. {{arguments}}`,
             description: skill.description || `aide ${skill.name} skill`,
           };
         }
@@ -234,9 +272,18 @@ function createCommandHandler(state: AideState): (
         // Format the skill content for injection
         const context = formatSkillsContext([skill]);
 
-        // Store for system transform injection
+        // Store for system transform injection (into system prompt)
         state.pendingSkillsContext = context;
 
+        // Also inject into the command output parts so the model sees the
+        // instructions directly in the user message. This avoids reliance
+        // on the system transform alone and prevents the model from trying
+        // to call the native "skill" tool to find the instructions.
+        output.parts.push({
+          type: "text",
+          text: `<aide-instructions>\n${context}\n</aide-instructions>`,
+        });
+
         // Also store the arguments as the user prompt for the transform
         if (args) {
           state.lastUserPrompt = args;
@@ -299,7 +346,7 @@ function initializeAide(state: AideState): void {
         state.binary,
         state.cwd,
         projectName,
-        3,
+        2,
         config,
       );
     }
@@ -506,14 +553,20 @@ async function handleSessionIdle(
     let summary: string | null = null;
 
     if (partials.length > 0) {
-      const commits = getSessionCommits(state.cwd);
+      const commits = getSessionCommits(
+        state.cwd,
+        state.sessionState?.startedAt,
+      );
       summary = buildSummaryFromPartials(partials, commits, []);
       debug(SOURCE, `Built summary from ${partials.length} partials`);
     }
 
     // Fall back to state-only summary if no partials
     if (!summary) {
-      summary = buildSessionSummaryFromState(state.cwd);
+      summary = buildSessionSummaryFromState(
+        state.cwd,
+        state.sessionState?.startedAt,
+      );
     }
 
     if (summary) {
@@ -584,7 +637,7 @@ async function handleMessagePartUpdated(
   state.lastUserPrompt = prompt;
 
   const skills = discoverSkills(state.cwd, state.pluginRoot ?? undefined);
-  const matched = matchSkills(prompt, skills, 3);
+  const matched = matchSkills(prompt, skills, 3, "opencode");
 
   if (matched.length > 0) {
     try {
@@ -704,6 +757,29 @@ function createToolAfterHandler(
       debug(SOURCE, `Partial memory write failed (non-fatal): ${err}`);
     }
 
+    // Context pruning: dedup/supersede/purge tool outputs
+    try {
+      const toolArgs = (_output.metadata?.args || {}) as Record<
+        string,
+        unknown
+      >;
+      const pruneResult = state.pruningTracker.process(
+        input.callID,
+        input.tool,
+        toolArgs,
+        _output.output,
+      );
+      if (pruneResult.modified) {
+        _output.output = pruneResult.output;
+        debug(
+          SOURCE,
+          `Context pruning [${pruneResult.strategy}]: saved ${pruneResult.bytesSaved} bytes for ${input.tool}`,
+        );
+      }
+    } catch (err) {
+      debug(SOURCE, `Context pruning failed (non-fatal): ${err}`);
+    }
+
     // Comment checker: detect excessive comments in Write/Edit output
     try {
       const toolArgs = (_output.metadata?.args || {}) as Record<
@@ -742,6 +818,10 @@ function createCompactionHandler(
   output: { context: string[]; prompt?: string },
 ) => Promise<void> {
   return async (input, output) => {
+    // Reset context pruning tracker — compaction clears the conversation
+    // history, so dedup/supersede references would be stale.
+    state.pruningTracker.reset();
+
     // Save state snapshot before compaction
     if (state.binary) {
       saveStateSnapshot(state.binary, state.cwd, input.sessionID);
@@ -758,7 +838,10 @@ function createCompactionHandler(
         let summary: string | null = null;
 
         if (partials.length > 0) {
-          const commits = getSessionCommits(state.cwd);
+          const commits = getSessionCommits(
+            state.cwd,
+            state.sessionState?.startedAt,
+          );
           summary = buildSummaryFromPartials(partials, commits, []);
           debug(
             SOURCE,
@@ -768,7 +851,10 @@ function createCompactionHandler(
 
         // Fall back to state-only summary if no partials
         if (!summary) {
-          summary = buildSessionSummaryFromState(state.cwd);
+          summary = buildSessionSummaryFromState(
+            state.cwd,
+            state.sessionState?.startedAt,
+          );
         }
 
         if (summary) {
@@ -802,7 +888,7 @@ function createCompactionHandler(
           state.binary,
           state.cwd,
           projectName,
-          3,
+          2,
         );
         state.memories = freshMemories;
         state.welcomeContext = buildWelcomeContext(
@@ -844,6 +930,17 @@ function createSystemTransformHandler(
       output.system.push(state.welcomeContext);
     }
 
+    // Inject context pruning notes only after the first prune fires.
+    // Avoids adding ~280 bytes to every session that never triggers pruning.
+    if (state.pruningTracker.getStats().prunedCalls > 0) {
+      output.system.push(`<aide-context-pruning>
+Tool outputs may contain these tags from aide's context optimization:
+- [aide:dedup] — This output is identical to a previous call. Refer to the earlier result.
+- [aide:supersede] — A prior Read of this file is now stale after a Write/Edit.
+- [aide:purge] — Large error output was trimmed. Re-run the command for full output.
+</aide-context-pruning>`);
+    }
+
     // Inject per-session context only when swarm mode is active and session
     // has been assigned a worktree/role (e.g., by swarm orchestration).
     // Without this guard, every normal session would incorrectly be told
@@ -894,7 +991,12 @@ function createSystemTransformHandler(
     } else if (state.lastUserPrompt) {
       try {
         const skills = discoverSkills(state.cwd, state.pluginRoot ?? undefined);
-        const matched = matchSkills(state.lastUserPrompt, skills, 3);
+        const matched = matchSkills(
+          state.lastUserPrompt,
+          skills,
+          3,
+          "opencode",
+        );
         if (matched.length > 0) {
           output.system.push(formatSkillsContext(matched));
           debug(
@@ -907,8 +1009,9 @@ function createSystemTransformHandler(
       }
     }
 
-    // Inject messaging protocol for multi-instance coordination
-    output.system.push(`<aide-messaging>
+    // Inject messaging protocol only in swarm mode (saves ~450 bytes per turn otherwise)
+    if (rawMode === "swarm") {
+      output.system.push(`<aide-messaging>
 
 ## Agent Messaging
 
@@ -927,6 +1030,7 @@ Use aide MCP tools to coordinate with other agents or sessions:
 - Check messages periodically for requests from other agents
 
 </aide-messaging>`);
+    }
   };
 }