opencode-sa-assistant 0.2.1 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-sa-assistant",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "type": "module",
   "main": "src/index.ts",
   "description": "OpenCode plugin for AWS Solutions Architect assistant with multi-agent Guru system",

package/src/hooks/wadd-mode.ts

@@ -2,71 +2,119 @@
  * WADD Mode Activation System
  * 
  * Detects "wadd" keyword and activates AWS Solutions Architect mode.
- * Uses word boundary regex to prevent false positives.
+ * Follows oh-my-opencode keyword-detector pattern.
  */
 
 import { SA_ORCHESTRATOR_PROMPT } from "../prompts/orchestrator";
 
+/**
+ * Patterns for code block removal (prevent false positives)
+ */
+const CODE_BLOCK_PATTERN = /```[\s\S]*?```/g;
+const INLINE_CODE_PATTERN = /`[^`]+`/g;
+
 /**
  * Regex pattern for WADD keyword detection
- * - \b: Word boundary (prevents matching "wa", "wadding", "mywadd")
+ * - \b: Word boundary (prevents matching "wadding", "mywadd")
  * - i flag: Case-insensitive matching
  */
 const WADD_PATTERN = /\bwadd\b/i;
 
 /**
- * Detects if content contains the WADD keyword
+ * SA Mode activation message (injected before user message)
+ */
+const SA_MODE_MESSAGE = `[sa-mode]
+AWS Solutions Architect Mode activated. You have access to:
+- 4 Guru agents (sa-bezos, sa-vogels, sa-naval, sa-feynman)
+- 3 Specialist agents (sa-explorer, sa-researcher, sa-reviewer)
+- AWS MCP tools (aws-docs_search_documentation, aws-docs_read_documentation)
+
+Follow Guru_Mandate: Consult appropriate Gurus before architecture decisions.
+Apply Well-Architected Framework 6 pillars for all reviews.`;
+
+/**
+ * Removes code blocks from text to prevent false keyword detection
+ */
+export function removeCodeBlocks(text: string): string {
+  return text.replace(CODE_BLOCK_PATTERN, "").replace(INLINE_CODE_PATTERN, "");
+}
+
+/**
+ * Detects if content contains the WADD keyword (outside code blocks)
  * @param content - User message content to check
  * @returns true if WADD keyword found, false otherwise
  */
 export function detectWaddKeyword(content: string): boolean {
-  return WADD_PATTERN.test(content);
+  const textWithoutCode = removeCodeBlocks(content);
+  return WADD_PATTERN.test(textWithoutCode);
 }
 
 /**
- * Activates SA mode by modifying message properties
- * @param message - Message object to modify
+ * Extracts text from message parts array
  */
-export function activateSAMode(message: any): void {
-  // Set variant to "max" for best model
-  message.variant = "max";
-  
-  // Prepend SA mode activation marker
-  // (Full orchestrator prompt will be added in Task 5)
-  message.content = `[SA MODE ACTIVATED]\n\n${message.content}`;
+function extractPromptText(parts: any[]): string {
+  if (!parts || !Array.isArray(parts)) return "";
+  return parts
+    .filter((p: any) => p.type === "text")
+    .map((p: any) => p.text || "")
+    .join(" ");
 }
 
 /**
  * Hook: chat.message
- * Intercepts user messages to detect WADD keyword and activate SA mode
+ * Intercepts user messages to detect WADD keyword and activate SA mode.
+ * Follows oh-my-opencode pattern: inject message before user content.
  */
 export const chatMessageHook = async (input: any, output: any) => {
-  const content = input?.message?.content;
-  if (!content) return;
+  const promptText = extractPromptText(output?.parts);
+  if (!promptText) return;
   
-  if (detectWaddKeyword(content)) {
-    activateSAMode(output.message);
-    
-    // Show toast notification if API available
-    if (output.toasts) {
-      output.toasts.push({
-        type: "info",
-        title: "SA Assistant Mode",
-        message: "AWS Solutions Architect mode activated"
-      });
-    }
+  if (!detectWaddKeyword(promptText)) return;
+  
+  // Set variant to "max" for best model (like ultrawork)
+  if (output.message) {
+    output.message.variant = "max";
+  } else {
+    output.variant = "max";
+  }
+  
+  // Find text part and inject SA mode message before content
+  const textPartIndex = output.parts?.findIndex(
+    (p: any) => p.type === "text" && p.text !== undefined
+  );
+  
+  if (textPartIndex !== -1 && output.parts[textPartIndex]) {
+    const originalText = output.parts[textPartIndex].text ?? "";
+    output.parts[textPartIndex].text = `${SA_MODE_MESSAGE}\n\n---\n\n${originalText}`;
+  }
+  
+  // Show toast notification
+  if (output.toasts) {
+    output.toasts.push({
+      type: "info",
+      title: "SA Assistant Mode",
+      message: "AWS Solutions Architect mode activated"
+    });
   }
 };
 
 /**
  * Hook: experimental.chat.system.transform
- * Injects SA orchestrator system prompt when SA mode is active
+ * Injects SA orchestrator system prompt when SA mode is active.
  */
 export const systemTransformHook = async (input: any, output: any) => {
-  // Check if SA mode is active by scanning message history
-  const hasWadd = input.messages?.some((m: any) => 
-    m.content && detectWaddKeyword(m.content)
-  );
+  const hasWadd = input.messages?.some((m: any) => {
+    if (m.role !== "user") return false;
+    const parts = m.parts || m.content;
+    if (Array.isArray(parts)) {
+      const text = parts
+        .filter((p: any) => p.type === "text")
+        .map((p: any) => p.text || "")
+        .join(" ");
+      return detectWaddKeyword(text);
+    }
+    return typeof parts === "string" && detectWaddKeyword(parts);
+  });
   
   if (hasWadd) {
     output.system = `${output.system || ""}\n\n${SA_ORCHESTRATOR_PROMPT}`;