@comfanion/usethis_search 4.2.0-dev.1 → 4.2.0-dev.2

package/hooks/message-before.ts

@@ -126,33 +126,47 @@ export function createWorkspaceInjectionHandler(state: SessionState) {
      workspace += `</workspace_context>`
 
     // ── Inject into messages ──────────────────────────────────────────────
-    // Find the last real user message and inject workspace BEFORE it
-    // This way AI sees files as "already available context"
-
-    const lastUserIdx = findLastUserMessageIndex(output.messages)
-    if (lastUserIdx === -1) return
-
-    // Create synthetic workspace message (inserted before last user message)
-    const workspaceMessage: Message = {
-      info: {
-        role: "user",
-        // Mark as synthetic so DCP doesn't prune it
-        _synthetic: true,
-        _workspace_injection: true,
-      },
-      parts: [
-        {
-          type: "text",
-          content: workspace,
-          // Anthropic prompt caching — content that doesn't change
-          // between turns gets cached at 90% discount
-          cache_control: { type: "ephemeral" },
-        },
-      ],
-    }
+    // Get base message for creating proper synthetic message
+    const lastUserMessage = findLastUserMessage(output.messages)
+    if (!lastUserMessage) return
+
+    // Create proper synthetic workspace message (like DCP does)
+    const workspaceMessage = createSyntheticUserMessage(lastUserMessage, workspace)
 
-    // Insert before last user message
-    output.messages.splice(lastUserIdx, 0, workspaceMessage)
+    // Add to end of messages (like DCP does with push, not splice)
+    output.messages.push(workspaceMessage)
+  }
+}
+
+/**
+ * Create a properly-formed synthetic user message for workspace injection.
+ * Follows OpenCode SDK message format to avoid "Invalid prompt" errors.
+ */
+function createSyntheticUserMessage(baseMessage: Message, content: string): Message {
+  const userInfo = baseMessage.info as any
+  const now = Date.now()
+
+  return {
+    info: {
+      id: "msg_workspace_01234567890123",
+      sessionID: userInfo.sessionID,
+      role: "user",
+      agent: userInfo.agent || "code",
+      model: userInfo.model,
+      time: { created: now },
+      variant: userInfo.variant,
+    },
+    parts: [
+      {
+        id: "prt_workspace_01234567890123",
+        sessionID: userInfo.sessionID,
+        messageID: "msg_workspace_01234567890123",
+        type: "text",
+        text: content,  // TEXT not content!
+        // Anthropic prompt caching for 90% token savings
+        cache_control: { type: "ephemeral" },
+      },
+    ],
   }
 }
 
@@ -240,15 +254,13 @@ function formatChunk(entry: ReturnType<typeof workspaceCache.getAll>[0]): string
   return block
 }
 
-function findLastUserMessageIndex(messages: Message[]): number {
+function findLastUserMessage(messages: Message[]): Message | null {
   for (let i = messages.length - 1; i >= 0; i--) {
     if (messages[i]?.info?.role === "user") {
-      // Skip synthetic messages
-      if ((messages[i].info as any)._synthetic) continue
-      return i
+      return messages[i]
     }
   }
-  return -1
+  return null
 }
 
 // ── Search output pruning ────────────────────────────────────────────────────

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comfanion/usethis_search",
-  "version": "4.2.0-dev.1",
+  "version": "4.2.0-dev.2",
   "description": "OpenCode plugin: semantic search with chunk-based workspace injection (v4.2-dev: chunk-level context, granular detach, improved token efficiency)",
   "type": "module",
   "main": "./index.ts",