@mindfoldhq/trellis 0.4.0-beta.8 → 0.4.0-rc.0

package/dist/templates/opencode/plugins/session-start.js

@@ -3,15 +3,11 @@
  * Trellis Session Start Plugin
  *
  * Injects context when user sends the first message in a session.
- * Uses OpenCode's chat.message + experimental.chat.messages.transform hooks.
- *
- * Compatibility:
- * - If oh-my-opencode handles via .claude/hooks/, this plugin skips
- * - Otherwise, this plugin handles injection
+ * Uses OpenCode's chat.message hook directly so the context persists in history.
  */
 
 import { existsSync, readFileSync, readdirSync, statSync } from "fs"
-import { join } from "path"
+import { basename, join } from "path"
 import { execFileSync } from "child_process"
 import { platform } from "os"
 import { TrellisContext, contextCollector, debugLog } from "../lib/trellis-context.js"
@@ -23,40 +19,18 @@ const PYTHON_CMD = platform() === "win32" ? "python" : "python3"
  * Check current task status and return structured status string.
  * JavaScript equivalent of _get_task_status in Claude's session-start.py.
  */
-function getTaskStatus(directory) {
-  const trellisDir = join(directory, ".trellis")
-  const currentTaskFile = join(trellisDir, ".current-task")
-
-  if (!existsSync(currentTaskFile)) {
-    return "Status: NO ACTIVE TASK\nNext: Describe what you want to work on"
-  }
-
-  let taskRef
-  try {
-    taskRef = readFileSync(currentTaskFile, "utf-8").trim()
-  } catch {
-    return "Status: NO ACTIVE TASK\nNext: Describe what you want to work on"
-  }
-
+function getTaskStatus(ctx) {
+  const taskRef = ctx.getCurrentTask()
   if (!taskRef) {
     return "Status: NO ACTIVE TASK\nNext: Describe what you want to work on"
   }
 
-  // Resolve task directory
-  let taskDir
-  if (taskRef.startsWith("/")) {
-    taskDir = taskRef
-  } else if (taskRef.startsWith(".trellis/")) {
-    taskDir = join(directory, taskRef)
-  } else {
-    taskDir = join(trellisDir, "tasks", taskRef)
-  }
+  const taskDir = ctx.resolveTaskDir(taskRef)
 
-  if (!existsSync(taskDir)) {
+  if (!taskDir || !existsSync(taskDir)) {
     return `Status: STALE POINTER\nTask: ${taskRef}\nNext: Task directory not found. Run: python3 ./.trellis/scripts/task.py finish`
   }
 
-  // Read task.json
   let taskData = {}
   const taskJsonPath = join(taskDir, "task.json")
   if (existsSync(taskJsonPath)) {
@@ -71,11 +45,10 @@ function getTaskStatus(directory) {
   const taskStatus = taskData.status || "unknown"
 
   if (taskStatus === "completed") {
-    const dirName = taskDir.split("/").pop()
+    const dirName = basename(taskDir)
     return `Status: COMPLETED\nTask: ${taskTitle}\nNext: Archive with \`python3 ./.trellis/scripts/task.py archive ${dirName}\` or start a new task`
   }
 
-  // Check if context is configured (jsonl files exist and non-empty)
   let hasContext = false
   for (const jsonlName of ["implement.jsonl", "check.jsonl", "spec.jsonl"]) {
     const jsonlPath = join(taskDir, jsonlName)
@@ -125,7 +98,6 @@ function loadTrellisConfig(directory) {
     if (data.mode !== "monorepo") {
       return { isMonorepo: false, packages: {}, specScope: null, activeTaskPackage: null, defaultPackage: null }
     }
-    // Convert packages array to dict keyed by name
     const pkgDict = {}
     for (const pkg of (data.packages || [])) {
       pkgDict[pkg.name] = pkg
@@ -155,7 +127,6 @@ function checkLegacySpec(directory, config) {
   const specDir = join(directory, ".trellis", "spec")
   if (!existsSync(specDir)) return null
 
-  // Check for legacy flat spec dirs
   let hasLegacy = false
   for (const name of ["backend", "frontend"]) {
     if (existsSync(join(specDir, name, "index.md"))) {
@@ -165,7 +136,6 @@ function checkLegacySpec(directory, config) {
   }
   if (!hasLegacy) return null
 
-  // Check which packages are missing spec/<pkg>/ directory
   const pkgNames = Object.keys(config.packages).sort()
   const missing = pkgNames.filter(name => !existsSync(join(specDir, name)))
 
@@ -213,7 +183,6 @@ function resolveSpecScope(config) {
       }
     }
     if (valid.size > 0) return valid
-    // All invalid: fallback
     if (activeTaskPackage && activeTaskPackage in packages) return new Set([activeTaskPackage])
     if (defaultPackage && defaultPackage in packages) return new Set([defaultPackage])
     return null
@@ -229,10 +198,7 @@ function resolveSpecScope(config) {
 function buildSessionContext(ctx) {
   const directory = ctx.directory
   const trellisDir = join(directory, ".trellis")
-  const claudeDir = join(directory, ".claude")
-  const opencodeDir = join(directory, ".opencode")
 
-  // Load config for scope filtering and legacy detection
   const config = loadTrellisConfig(directory)
   const allowedPkgs = resolveSpecScope(config)
 
@@ -261,11 +227,20 @@ Read and follow all instructions below carefully.
     }
   }
 
-  // 3. Workflow Guide
-  const workflow = ctx.readProjectFile(".trellis/workflow.md")
-  if (workflow) {
+  // 3. Workflow Guide (ToC only — lazy-load the full file on demand)
+  const workflowContent = ctx.readProjectFile(".trellis/workflow.md")
+  if (workflowContent) {
+    const tocLines = [
+      "# Development Workflow — Section Index",
+      "Full guide: .trellis/workflow.md  (read on demand)",
+      "",
+    ]
+    for (const line of workflowContent.split("\n")) {
+      if (line.startsWith("## ")) tocLines.push(line)
+    }
+    tocLines.push("", "To read a section: use the Read tool on .trellis/workflow.md")
     parts.push("<workflow>")
-    parts.push(workflow)
+    parts.push(tocLines.join("\n"))
     parts.push("</workflow>")
   }
 
@@ -287,7 +262,6 @@ Read and follow all instructions below carefully.
       }).sort()
 
       for (const sub of subs) {
-        // Always include guides/ regardless of scope
         if (sub === "guides") {
           const indexFile = join(specDir, sub, "index.md")
           if (existsSync(indexFile)) {
@@ -301,14 +275,11 @@ Read and follow all instructions below carefully.
 
         const indexFile = join(specDir, sub, "index.md")
         if (existsSync(indexFile)) {
-          // Flat spec dir: spec/<layer>/index.md (single-repo)
           const content = ctx.readFile(indexFile)
           if (content) {
             parts.push(`## ${sub}\n${content}\n`)
           }
         } else {
-          // Nested package dirs (monorepo): spec/<pkg>/<layer>/index.md
-          // Apply scope filter
           if (allowedPkgs !== null && !allowedPkgs.has(sub)) {
             continue
           }
@@ -342,131 +313,164 @@ Read and follow all instructions below carefully.
 
   parts.push("</guidelines>")
 
-  // 5. Session Instructions - try both .claude and .opencode
-  let startMd = ctx.readFile(join(claudeDir, "commands", "trellis", "start.md"))
-  if (!startMd) {
-    startMd = ctx.readFile(join(opencodeDir, "commands", "trellis", "start.md"))
-  }
-  if (startMd) {
-    parts.push("<instructions>")
-    parts.push(startMd)
-    parts.push("</instructions>")
-  }
-
-  // 6. Task status (R2: check task state for session resume)
-  const taskStatus = getTaskStatus(directory)
+  // 6. Task status
+  const taskStatus = getTaskStatus(ctx)
   parts.push(`<task-status>\n${taskStatus}\n</task-status>`)
 
-  // 7. Final directive (R3: active, not passive)
+  // 7. Final directive
   parts.push(`<ready>
-Context loaded. Steps 1-3 (workflow, context, guidelines) are already injected above — do NOT re-read them.
-Start from Step 4. Wait for user's first message, then follow <instructions> to handle their request.
+Context loaded. Workflow index, project state, and guidelines are already injected above — do NOT re-read them.
+Wait for the user's first message, then handle it following the workflow guide.
 If there is an active task, ask whether to continue it.
 </ready>`)
 
   return parts.join("\n\n")
 }
 
-export default async ({ directory }) => {
-  const ctx = new TrellisContext(directory)
-  debugLog("session", "Plugin loaded, directory:", directory)
+function getTrellisMetadata(metadata) {
+  if (!metadata || typeof metadata !== "object") {
+    return {}
+  }
 
-  return {
-    // chat.message - triggered when user sends a message
-    "chat.message": async (input) => {
-      try {
-        const sessionID = input.sessionID
-        const agent = input.agent || "unknown"
-        debugLog("session", "chat.message called, sessionID:", sessionID, "agent:", agent)
-
-        // Skip in non-interactive mode
-        if (process.env.OPENCODE_NON_INTERACTIVE === "1") {
-          debugLog("session", "Skipping - non-interactive mode")
-          return
-        }
+  const trellis = metadata.trellis
+  if (!trellis || typeof trellis !== "object") {
+    return {}
+  }
 
-        // Check if we should skip (omo will handle)
-        if (ctx.shouldSkipHook("session-start")) {
-          debugLog("session", "Skipping - omo will handle via .claude/hooks/")
-          return
-        }
+  return trellis
+}
 
-        // Only inject on first message
-        if (contextCollector.isProcessed(sessionID)) {
-          debugLog("session", "Skipping - session already processed")
-          return
-        }
+function markPartAsSessionStart(part) {
+  const metadata = part.metadata && typeof part.metadata === "object"
+    ? part.metadata
+    : {}
+  part.metadata = {
+    ...metadata,
+    trellis: {
+      ...getTrellisMetadata(metadata),
+      sessionStart: true,
+    },
+  }
+}
 
-        // Mark session as processed
-        contextCollector.markProcessed(sessionID)
+function hasSessionStartMarker(part) {
+  if (!part || part.type !== "text" || typeof part.text !== "string") {
+    return false
+  }
 
-        // Build and store context
-        const context = buildSessionContext(ctx)
-        debugLog("session", "Built context, length:", context.length)
+  return getTrellisMetadata(part.metadata).sessionStart === true
+}
 
-        contextCollector.store(sessionID, context)
-        debugLog("session", "Context stored for session:", sessionID)
+export function hasInjectedTrellisContext(messages) {
+  if (!Array.isArray(messages)) {
+    return false
+  }
 
-      } catch (error) {
-        debugLog("session", "Error in chat.message:", error.message, error.stack)
-      }
-    },
+  return messages.some(message => {
+    if (!message?.info || message.info.role !== "user" || !Array.isArray(message.parts)) {
+      return false
+    }
 
-    // experimental.chat.messages.transform - modify messages before sending to AI
-    "experimental.chat.messages.transform": async (input, output) => {
-      try {
-        const { messages } = output
-        debugLog("session", "messages.transform called, messageCount:", messages?.length)
+    return message.parts.some(hasSessionStartMarker)
+  })
+}
 
-        if (!messages || messages.length === 0) {
-          return
-        }
+async function hasPersistedInjectedContext(client, directory, sessionID) {
+  try {
+    const response = await client.session.messages({
+      path: { id: sessionID },
+      query: { directory },
+      throwOnError: true,
+    })
+    return hasInjectedTrellisContext(response.data || [])
+  } catch (error) {
+    debugLog(
+      "session",
+      "Failed to read session history for dedupe:",
+      error instanceof Error ? error.message : String(error),
+    )
+    return false
+  }
+}
 
-        // Find last user message
-        let lastUserMessageIndex = -1
-        for (let i = messages.length - 1; i >= 0; i--) {
-          if (messages[i].info?.role === "user") {
-            lastUserMessageIndex = i
-            break
-          }
-        }
+export default {
+  id: "trellis.session-start",
+  server: async ({ directory, client }) => {
+    const ctx = new TrellisContext(directory)
+    debugLog("session", "Plugin loaded, directory:", directory)
 
-        if (lastUserMessageIndex === -1) {
-          debugLog("session", "No user message found")
-          return
+    return {
+      // Clear in-memory dedupe after compaction so context can be re-injected.
+      event: ({ event }) => {
+        try {
+          if (event?.type === "session.compacted" && event?.properties?.sessionID) {
+            const sessionID = event.properties.sessionID
+            contextCollector.clear(sessionID)
+            debugLog("session", "Cleared processed flag after compaction for session:", sessionID)
+          }
+        } catch (error) {
+          debugLog(
+            "session",
+            "Error in event hook:",
+            error instanceof Error ? error.message : String(error),
+          )
         }
+      },
 
-        const lastUserMessage = messages[lastUserMessageIndex]
-        const sessionID = lastUserMessage.info?.sessionID
+      // chat.message - triggered when user sends a message.
+      // Modify the message in-place so the context is persisted with updateMessage/updatePart.
+      "chat.message": async (input, output) => {
+        try {
+          const sessionID = input.sessionID
+          const agent = input.agent || "unknown"
+          debugLog("session", "chat.message called, sessionID:", sessionID, "agent:", agent)
+
+          // Skip in non-interactive mode
+          if (process.env.OPENCODE_NON_INTERACTIVE === "1") {
+            debugLog("session", "Skipping - non-interactive mode")
+            return
+          }
 
-        debugLog("session", "Found user message, sessionID:", sessionID)
+          // Only inject on first message
+          if (contextCollector.isProcessed(sessionID)) {
+            debugLog("session", "Skipping - session already processed")
+            return
+          }
 
-        if (!sessionID || !contextCollector.hasPending(sessionID)) {
-          debugLog("session", "No pending context for session")
-          return
-        }
+          if (await hasPersistedInjectedContext(client, ctx.directory, sessionID)) {
+            contextCollector.markProcessed(sessionID)
+            debugLog("session", "Skipping - session already contains persisted Trellis context")
+            return
+          }
 
-        // Get and consume pending context
-        const pending = contextCollector.consume(sessionID)
+          // Build context
+          const context = buildSessionContext(ctx)
+          debugLog("session", "Built context, length:", context.length)
+
+          // Inject context directly into output.parts so it gets persisted by updatePart
+          const parts = output?.parts || []
+          const textPartIndex = parts.findIndex(
+            p => p.type === "text" && p.text !== undefined
+          )
+
+          if (textPartIndex !== -1) {
+            const originalText = parts[textPartIndex].text || ""
+            parts[textPartIndex].text = `${context}\n\n---\n\n${originalText}`
+            markPartAsSessionStart(parts[textPartIndex])
+            debugLog("session", "Injected context into chat.message text part, length:", context.length)
+          } else {
+            // No existing text part: prepend a new one
+            const injectedPart = { type: "text", text: context }
+            markPartAsSessionStart(injectedPart)
+            parts.unshift(injectedPart)
+            debugLog("session", "Prepended new text part with context, length:", context.length)
+          }
 
-        // Find first text part
-        const textPartIndex = lastUserMessage.parts?.findIndex(
-          p => p.type === "text" && p.text !== undefined
-        )
+          contextCollector.markProcessed(sessionID)
 
-        if (textPartIndex === -1) {
-          debugLog("session", "No text part found in user message")
-          return
+        } catch (error) {
+          debugLog("session", "Error in chat.message:", error.message, error.stack)
         }
-
-        // Prepend context to the text part (same approach as omo)
-        const originalText = lastUserMessage.parts[textPartIndex].text || ""
-        lastUserMessage.parts[textPartIndex].text = `${pending.content}\n\n---\n\n${originalText}`
-
-        debugLog("session", "Injected context by prepending to text, length:", pending.content.length)
-
-      } catch (error) {
-        debugLog("session", "Error in messages.transform:", error.message, error.stack)
       }
     }
   }

package/dist/templates/trellis/scripts/add_session.py

@@ -316,11 +316,16 @@ def update_index(
 def _auto_commit_workspace(repo_root: Path) -> None:
     """Stage .trellis/workspace and .trellis/tasks, then commit with a configured message."""
     commit_msg = get_session_commit_message(repo_root)
-    subprocess.run(
+    add_result = subprocess.run(
         ["git", "add", "-A", ".trellis/workspace", ".trellis/tasks"],
         cwd=repo_root,
         capture_output=True,
+        text=True,
     )
+    if add_result.returncode != 0:
+        print(f"[WARN] git add failed (exit {add_result.returncode}): {add_result.stderr.strip()}", file=sys.stderr)
+        print("[WARN] Please commit .trellis/ changes manually: git add .trellis && git commit", file=sys.stderr)
+        return
     # Check if there are staged changes
     result = subprocess.run(
         ["git", "diff", "--cached", "--quiet", "--", ".trellis/workspace", ".trellis/tasks"],

package/dist/templates/trellis/scripts/common/__init__.py

@@ -75,6 +75,8 @@ from .paths import (
     count_lines,
     get_current_task,
     get_current_task_abs,
+    normalize_task_ref,
+    resolve_task_ref,
     set_current_task,
     clear_current_task,
     has_current_task,