@mindfoldhq/trellis 0.5.12 → 0.5.13

package/dist/migrations/manifests/0.5.13.json

@@ -0,0 +1,9 @@
+{
+  "version": "0.5.13",
+  "description": "Patch: OpenCode context injection, non-Git session context, hook timeouts, and Copilot SessionStart wording.",
+  "breaking": false,
+  "recommendMigrate": false,
+  "changelog": "**Bug Fixes:**\n- fix(opencode): detect Windows POSIX shell dialects before injecting `TRELLIS_CONTEXT_ID`, so Git Bash / MSYS / Cygwin sessions receive `export ...` while PowerShell keeps `$env:...`.\n- fix(context): session context now handles non-Git Trellis roots without reporting fake clean Git state, and falls back to bounded child-repo discovery for unconfigured polyrepo layouts.\n- fix(opencode): Trellis sub-agent dispatch now skips duplicate SessionStart / workflow-state injection, resolves active tasks from session context, `Active task:` hints, or single-session fallback, and marks successfully injected prompts.\n- fix(hooks): default hook timeouts now use 30s for SessionStart and 15s for per-prompt workflow injection across hook-based platforms, avoiding Windows Python cold-start drops.\n- fix(copilot): SessionStart output no longer emits the stale `Copilot currently ignores sessionStart hook output` system message; it keeps `hookSpecificOutput.additionalContext` as the documented payload.\n\n**Internal:**\n- docs(spec): platform and cross-platform spec templates document shell-dialect-aware `TRELLIS_CONTEXT_ID` prefix rules for OpenCode.",
+  "migrations": [],
+  "notes": "Run `trellis update` to refresh hash-tracked hook, OpenCode, session-context, and spec templates. No migration required."
+}

package/dist/migrations/manifests/0.6.0-beta.7.json

@@ -0,0 +1,9 @@
+{
+  "version": "0.6.0-beta.7",
+  "description": "Beta patch: brings the v0.5.12 workflow update fix into the 0.6 beta line.",
+  "breaking": false,
+  "recommendMigrate": false,
+  "changelog": "**Bug Fixes:**\n- fix(update): update `.trellis/workflow.md` as a whole hash-tracked template so runtime phase routing markers, including Codex `codex-inline` / `codex-sub-agent` blocks, refresh during `trellis update`.",
+  "migrations": [],
+  "notes": "Beta patch on top of 0.6.0-beta.6. Run `trellis update` to refresh hash-tracked workflow templates. No migration required."
+}

package/dist/migrations/manifests/0.6.0-beta.8.json

@@ -0,0 +1,9 @@
+{
+  "version": "0.6.0-beta.8",
+  "description": "Beta patch: adds task-creation consent gates and planning artifacts across workflow, hooks, skills, and platform templates.",
+  "breaking": false,
+  "recommendMigrate": false,
+  "changelog": "**Enhancements:**\n- feat(workflow): no-task turns now classify simple conversation, inline small work, and full Trellis tasks before task creation; complex work asks before creating a task and entering planning.\n- feat(task): `task.py create` now creates a default `prd.md`, while complex tasks require `design.md` and `implement.md` before `task.py start`.\n- feat(context): implement/check context loading now uses the same artifact order across hook-push, pull-prelude, Pi, OpenCode, and inline modes: jsonl entries -> `prd.md` -> optional `design.md` -> optional `implement.md`.\n- feat(codex): Codex no-task breadcrumbs include `<trellis-bootstrap>` plus explicit `<codex-mode>` text, and inline mode keeps implementation/check work in the main session.",
+  "migrations": [],
+  "notes": "Beta patch on top of 0.6.0-beta.7. Run `trellis update` to refresh workflow, hook, skill, agent, and platform templates. No migration required."
+}

package/dist/templates/claude/settings.json

@@ -10,7 +10,7 @@
           {
             "type": "command",
             "command": "{{PYTHON_CMD}} .claude/hooks/session-start.py",
-            "timeout": 10
+            "timeout": 30
           }
         ]
       },
@@ -20,7 +20,7 @@
           {
             "type": "command",
             "command": "{{PYTHON_CMD}} .claude/hooks/session-start.py",
-            "timeout": 10
+            "timeout": 30
           }
         ]
       },
@@ -30,7 +30,7 @@
           {
             "type": "command",
             "command": "{{PYTHON_CMD}} .claude/hooks/session-start.py",
-            "timeout": 10
+            "timeout": 30
           }
         ]
       }
@@ -63,7 +63,7 @@
           {
             "type": "command",
             "command": "{{PYTHON_CMD}} .claude/hooks/inject-workflow-state.py",
-            "timeout": 5
+            "timeout": 15
           }
         ]
       }

package/dist/templates/codebuddy/settings.json

@@ -7,7 +7,7 @@
           {
             "type": "command",
             "command": "{{PYTHON_CMD}} .codebuddy/hooks/session-start.py",
-            "timeout": 10
+            "timeout": 30
           }
         ]
       },
@@ -17,7 +17,7 @@
           {
             "type": "command",
             "command": "{{PYTHON_CMD}} .codebuddy/hooks/session-start.py",
-            "timeout": 10
+            "timeout": 30
           }
         ]
       },
@@ -27,7 +27,7 @@
           {
             "type": "command",
             "command": "{{PYTHON_CMD}} .codebuddy/hooks/session-start.py",
-            "timeout": 10
+            "timeout": 30
           }
         ]
       }
@@ -50,7 +50,7 @@
           {
             "type": "command",
             "command": "{{PYTHON_CMD}} .codebuddy/hooks/inject-workflow-state.py",
-            "timeout": 5
+            "timeout": 15
           }
         ]
       }

package/dist/templates/codex/hooks.json

@@ -6,7 +6,7 @@
           {
             "type": "command",
             "command": "{{PYTHON_CMD}} .codex/hooks/inject-workflow-state.py",
-            "timeout": 5
+            "timeout": 15
           }
         ]
       }

package/dist/templates/copilot/hooks/session-start.py

@@ -1,13 +1,18 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """
-Copilot Session Start Hook - Emit Trellis session-start diagnostics.
-
-GitHub Copilot's documented SessionStart behavior ignores hook output, so this
-script must not be treated as proof that model-visible context was injected.
-The JSON shape is kept for parity with other Trellis hooks and future host
-support, but current Copilot users should rely on UserPromptSubmit breadcrumbs
-and hook logs instead.
+Copilot Session Start Hook - Emit Trellis session-start context.
+
+Microsoft VS Code Agent hooks are in preview and have been documented since
+VS Code 1.110 (February 2026). The official documentation
+(https://code.visualstudio.com/docs/copilot/customization/hooks) defines
+`SessionStart.hookSpecificOutput.additionalContext` as the field used to inject
+additional context into the agent's conversation.
+
+This script emits the spec-compliant SessionStart payload. Whether Copilot
+actually consumes `additionalContext` depends on the user's installed VS Code
+and Copilot versions, which is outside Trellis's control. UserPromptSubmit
+breadcrumbs remain available as a per-turn complement.
 """
 
 from __future__ import annotations
@@ -412,10 +417,6 @@ If a task is READY, execute its Next required action without asking whether to c
     context = output.getvalue()
     result = {
         "suppressOutput": True,
-        "systemMessage": (
-            f"Trellis SessionStart diagnostics emitted ({len(context)} chars); "
-            "Copilot currently ignores sessionStart hook output."
-        ),
         "hookSpecificOutput": {
             "hookEventName": "SessionStart",
             "additionalContext": context,

package/dist/templates/copilot/hooks.json

@@ -4,7 +4,7 @@
       {
         "type": "command",
         "command": "{{PYTHON_CMD}} .github/copilot/hooks/session-start.py",
-        "timeout": 10
+        "timeout": 30
       }
     ],
     "userPromptSubmitted": [
@@ -12,7 +12,7 @@
         "type": "command",
         "bash": "{{PYTHON_CMD}} .github/copilot/hooks/inject-workflow-state.py",
         "powershell": "{{PYTHON_CMD}} .github/copilot/hooks/inject-workflow-state.py",
-        "timeoutSec": 5
+        "timeoutSec": 15
       }
     ]
   }

package/dist/templates/cursor/hooks.json

@@ -11,13 +11,13 @@
     "sessionStart": [
       {
         "command": "{{PYTHON_CMD}} .cursor/hooks/session-start.py",
-        "timeout": 10
+        "timeout": 30
       }
     ],
     "beforeSubmitPrompt": [
       {
         "command": "{{PYTHON_CMD}} .cursor/hooks/inject-workflow-state.py",
-        "timeout": 5
+        "timeout": 15
       }
     ],
     "beforeShellExecution": [

package/dist/templates/droid/settings.json

@@ -7,7 +7,7 @@
           {
             "type": "command",
             "command": "{{PYTHON_CMD}} .factory/hooks/session-start.py",
-            "timeout": 10
+            "timeout": 30
           }
         ]
       },
@@ -17,7 +17,7 @@
           {
             "type": "command",
             "command": "{{PYTHON_CMD}} .factory/hooks/session-start.py",
-            "timeout": 10
+            "timeout": 30
           }
         ]
       },
@@ -27,7 +27,7 @@
           {
             "type": "command",
             "command": "{{PYTHON_CMD}} .factory/hooks/session-start.py",
-            "timeout": 10
+            "timeout": 30
           }
         ]
       }
@@ -50,7 +50,7 @@
           {
             "type": "command",
             "command": "{{PYTHON_CMD}} .factory/hooks/inject-workflow-state.py",
-            "timeout": 5
+            "timeout": 15
           }
         ]
       }

package/dist/templates/gemini/settings.json

@@ -7,7 +7,7 @@
           {
             "type": "command",
             "command": "{{PYTHON_CMD}} .gemini/hooks/session-start.py",
-            "timeout": 10000
+            "timeout": 30000
           }
         ]
       }
@@ -19,7 +19,7 @@
           {
             "type": "command",
             "command": "{{PYTHON_CMD}} .gemini/hooks/inject-workflow-state.py",
-            "timeout": 5000
+            "timeout": 15000
           }
         ]
       }

package/dist/templates/markdown/spec/guides/cross-platform-thinking-guide.md.txt

@@ -215,20 +215,26 @@ home = Path.home()
 ```
 
 **Rule 2**: When injecting environment variables into shell commands, generate
-the prefix for the actual host shell. Do not assume `export` works everywhere.
-AI tool "Bash" surfaces on Windows may execute through PowerShell.
+the prefix for the actual shell that will parse the command. Do not choose
+syntax from OS alone. AI tool "Bash" surfaces on Windows may execute through
+PowerShell, Git Bash, MSYS2, or another POSIX-like shell.
 
 ```javascript
 // BAD - breaks when the host shell is PowerShell
 command = `export TRELLIS_CONTEXT_ID=${shellQuote(contextKey)}; ${command}`;
 
-// GOOD - shell-aware command prefix
-const prefix = process.platform === "win32"
+// GOOD - shell-dialect-aware command prefix
+const prefix = process.platform === "win32" && !isWindowsPosixShell(process.env)
   ? `$env:TRELLIS_CONTEXT_ID = ${powershellQuote(contextKey)}; `
   : `export TRELLIS_CONTEXT_ID=${shellQuote(contextKey)}; `;
 command = `${prefix}${command}`;
 ```
 
+On Windows, treat `MSYSTEM`, `MINGW_PREFIX`, `OSTYPE=msys|mingw|cygwin`,
+`SHELL=...bash`, or a platform-specific Git Bash setting as POSIX-shell
+signals. Keep PowerShell as the Windows default when there is no POSIX-shell
+signal.
+
 Also make duplicate-injection detection shell-aware. A guard that only matches
 `export VAR=` will miss PowerShell's `$env:VAR = ...` form and can wrap an
 already-correct command a second time.

package/dist/templates/opencode/lib/trellis-context.js

@@ -63,6 +63,21 @@ function buildContextKey(platformName, kind, value) {
   return safeValue ? `${platformName}_${safeValue}` : `${platformName}_${hashValue(value)}`
 }
 
+// Matches `trellis-implement`, `trellis-check`, `trellis-research` exactly.
+// Used by chat.message plugins to skip injection inside Trellis sub-agent turns.
+const TRELLIS_SUBAGENT_RE = /^trellis-(implement|check|research)$/
+
+/**
+ * Return true when the OpenCode `chat.message` input represents a Trellis
+ * sub-agent turn. `input.agent` is set by OpenCode when a Task tool spawns a
+ * child session with a custom agent (see `packages/opencode/src/tool/task.ts`).
+ */
+export function isTrellisSubagent(input) {
+  if (!input || typeof input !== "object") return false
+  const agent = typeof input.agent === "string" ? input.agent.trim() : ""
+  return TRELLIS_SUBAGENT_RE.test(agent)
+}
+
 /**
  * Trellis Context Manager
  */
@@ -116,27 +131,74 @@ export class TrellisContext {
 
   /**
    * Get active task from session runtime context.
+   *
+   * Resolution order (mirrors Python `active_task.resolve_active_task`):
+   *   1. Lookup the runtime file for the input-derived context key.
+   *   2. If that misses and exactly one session runtime file exists locally,
+   *      use it (`_resolveSingleSessionFallback`). Refuses to guess when 0 or
+   *      ≥2 files exist so multi-window isolation holds.
    */
   getActiveTask(platformInput = null) {
     const contextKey = this.getContextKey(platformInput)
-    if (!contextKey) {
-      return { taskPath: null, source: "none", stale: false }
+    if (contextKey) {
+      const context = this.readContext(contextKey)
+      const taskRef = this.normalizeTaskRef(context?.current_task || "")
+      if (taskRef) {
+        const taskDir = this.resolveTaskDir(taskRef)
+        return {
+          taskPath: taskRef,
+          source: `session:${contextKey}`,
+          stale: !taskDir || !existsSync(taskDir),
+        }
+      }
     }
 
-    const context = this.readContext(contextKey)
-    const taskRef = this.normalizeTaskRef(context?.current_task || "")
-    if (taskRef) {
-      const taskDir = this.resolveTaskDir(taskRef)
-      return {
-        taskPath: taskRef,
-        source: `session:${contextKey}`,
-        stale: !taskDir || !existsSync(taskDir),
-      }
+    const fallback = this._resolveSingleSessionFallback()
+    if (fallback) {
+      return fallback
     }
 
     return { taskPath: null, source: "none", stale: false }
   }
 
+  /**
+   * Mirror of Python `_resolve_single_session_fallback`. Returns the task
+   * pointed at by the sole session runtime file when exactly one exists,
+   * else null.
+   */
+  _resolveSingleSessionFallback() {
+    const sessionsDir = join(this.directory, ".trellis", ".runtime", "sessions")
+    if (!existsSync(sessionsDir)) return null
+
+    let files
+    try {
+      files = readdirSync(sessionsDir)
+        .filter(name => name.endsWith(".json"))
+        .sort()
+    } catch {
+      return null
+    }
+    if (files.length !== 1) return null
+
+    const sessionFile = join(sessionsDir, files[0])
+    let context
+    try {
+      context = JSON.parse(readFileSync(sessionFile, "utf-8"))
+    } catch {
+      return null
+    }
+    const taskRef = this.normalizeTaskRef(context?.current_task || "")
+    if (!taskRef) return null
+
+    const taskDir = this.resolveTaskDir(taskRef)
+    const fallbackKey = files[0].replace(/\.json$/, "")
+    return {
+      taskPath: taskRef,
+      source: `session-fallback:${fallbackKey}`,
+      stale: !taskDir || !existsSync(taskDir),
+    }
+  }
+
   getCurrentTask(platformInput = null) {
     return this.getActiveTask(platformInput).taskPath
   }

package/dist/templates/opencode/plugins/inject-subagent-context.js

@@ -14,24 +14,39 @@ import { TrellisContext, debugLog } from "../lib/trellis-context.js"
 const AGENTS_ALL = ["implement", "check", "research"]
 const AGENTS_REQUIRE_TASK = ["implement", "check"]
 
+// Match `Active task: <path>` on the first non-empty line of the dispatch
+// prompt. Mirrors the contract in workflow.md's [workflow-state:in_progress]
+// breadcrumb so multi-window users can disambiguate which task is targeted.
+const ACTIVE_TASK_HINT_RE = /^\s*Active task:\s*(\S+)\s*$/m
+
+function extractActiveTaskHint(prompt) {
+  if (typeof prompt !== "string" || !prompt) return null
+  const match = prompt.match(ACTIVE_TASK_HINT_RE)
+  return match ? match[1].trim() : null
+}
+
 /**
- * Get context for implement agent
+ * Get context for implement agent. `taskDir` may be relative
+ * (`.trellis/tasks/foo`) or absolute; both are resolved via
+ * `ctx.resolveTaskDir`.
  */
 function getImplementContext(ctx, taskDir) {
   const parts = []
+  const taskDirFull = ctx.resolveTaskDir(taskDir)
+  if (!taskDirFull) return ""
 
-  const jsonlPath = join(ctx.directory, taskDir, "implement.jsonl")
+  const jsonlPath = join(taskDirFull, "implement.jsonl")
   const entries = ctx.readJsonlWithFiles(jsonlPath)
   if (entries.length > 0) {
     parts.push(ctx.buildContextFromEntries(entries))
   }
 
-  const prd = ctx.readProjectFile(join(taskDir, "prd.md"))
+  const prd = ctx.readFile(join(taskDirFull, "prd.md"))
   if (prd) {
     parts.push(`=== ${taskDir}/prd.md (Requirements) ===\n${prd}`)
   }
 
-  const info = ctx.readProjectFile(join(taskDir, "info.md"))
+  const info = ctx.readFile(join(taskDirFull, "info.md"))
   if (info) {
     parts.push(`=== ${taskDir}/info.md (Technical Design) ===\n${info}`)
   }
@@ -40,18 +55,20 @@ function getImplementContext(ctx, taskDir) {
 }
 
 /**
- * Get context for check agent
+ * Get context for check agent. `taskDir` may be relative or absolute.
  */
 function getCheckContext(ctx, taskDir) {
   const parts = []
+  const taskDirFull = ctx.resolveTaskDir(taskDir)
+  if (!taskDirFull) return ""
 
-  const jsonlPath = join(ctx.directory, taskDir, "check.jsonl")
+  const jsonlPath = join(taskDirFull, "check.jsonl")
   const entries = ctx.readJsonlWithFiles(jsonlPath)
   if (entries.length > 0) {
     parts.push(ctx.buildContextFromEntries(entries))
   }
 
-  const prd = ctx.readProjectFile(join(taskDir, "prd.md"))
+  const prd = ctx.readFile(join(taskDirFull, "prd.md"))
   if (prd) {
     parts.push(`=== ${taskDir}/prd.md (Requirements) ===\n${prd}`)
   }
@@ -128,7 +145,8 @@ function getResearchContext(ctx) {
  */
 function buildPrompt(agentType, originalPrompt, context, isFinish = false) {
   const templates = {
-    implement: `# Implement Agent Task
+    implement: `<!-- trellis-hook-injected -->
+# Implement Agent Task
 
 You are the Implement Agent in the Multi-Agent Pipeline.
 
@@ -157,7 +175,8 @@ ${originalPrompt}
 - Follow all dev specs injected above
 - Report list of modified/created files when done`,
 
-    check: isFinish ? `# Finish Agent Task
+    check: isFinish ? `<!-- trellis-hook-injected -->
+# Finish Agent Task
 
 You are performing the final check before creating a PR.
 
@@ -191,7 +210,8 @@ ${originalPrompt}
 - Do NOT update specs for trivial changes (typos, formatting, obvious fixes)
 - If critical CODE issues found, report them clearly (fix specs, not code)
 - Verify all acceptance criteria in prd.md are met` :
-      `# Check Agent Task
+      `<!-- trellis-hook-injected -->
+# Check Agent Task
 
 You are the Check Agent in the Multi-Agent Pipeline.
 
@@ -219,7 +239,8 @@ ${originalPrompt}
 - Fix issues yourself, don't just report
 - Must execute complete checklist`,
 
-    research: `# Research Agent Task
+    research: `<!-- trellis-hook-injected -->
+# Research Agent Task
 
 You are the Research Agent in the Multi-Agent Pipeline.
 
@@ -264,9 +285,29 @@ function powershellQuote(value) {
   return `'${String(value).replace(/'/g, "''")}'`
 }
 
-function buildTrellisContextPrefix(contextKey, hostPlatform = process.platform) {
-  if (hostPlatform === "win32") {
-    // OpenCode's Windows Bash tool runs through PowerShell, not a POSIX shell.
+function envValue(env, key) {
+  const value = env?.[key]
+  return typeof value === "string" && value.trim() ? value.trim() : null
+}
+
+function shellBasename(value) {
+  return value.replace(/\\/g, "/").split("/").pop()?.toLowerCase() || ""
+}
+
+function isWindowsPosixShell(env = process.env) {
+  if (envValue(env, "MSYSTEM")) return true
+  if (envValue(env, "MINGW_PREFIX")) return true
+  if (envValue(env, "OPENCODE_GIT_BASH_PATH")) return true
+
+  const ostype = envValue(env, "OSTYPE")?.toLowerCase() || ""
+  if (/(msys|mingw|cygwin)/.test(ostype)) return true
+
+  const shell = shellBasename(envValue(env, "SHELL") || "")
+  return /^(bash|sh|zsh)(\.exe)?$/.test(shell)
+}
+
+function buildTrellisContextPrefix(contextKey, hostPlatform = process.platform, env = process.env) {
+  if (hostPlatform === "win32" && !isWindowsPosixShell(env)) {
     return `$env:TRELLIS_CONTEXT_ID = ${powershellQuote(contextKey)}; `
   }
 
@@ -285,7 +326,7 @@ function commandStartsWithTrellisContext(command) {
   return (
     /^TRELLIS_CONTEXT_ID\s*=/.test(firstCommand) ||
     /^export\s+TRELLIS_CONTEXT_ID\s*=/.test(firstCommand) ||
-    /^env\s+(?:[^\s=]+\s+)*TRELLIS_CONTEXT_ID\s*=/.test(firstCommand) ||
+    /^env\s+(?:(?:-\S+|[A-Za-z_][A-Za-z0-9_]*=\S*)\s+)*TRELLIS_CONTEXT_ID\s*=/.test(firstCommand) ||
     /^\$env:TRELLIS_CONTEXT_ID\s*=/i.test(firstCommand)
   )
 }
@@ -294,7 +335,7 @@ function commandStartsWithTrellisContext(command) {
  * OpenCode TUI may not expose OPENCODE_RUN_ID to Bash. The plugin hook still
  * receives session identity, so inject it into Bash commands before execution.
  */
-function injectTrellisContextIntoBash(ctx, input, output, hostPlatform) {
+function injectTrellisContextIntoBash(ctx, input, output, hostPlatform, env) {
   const args = output?.args
   const commandKey = getBashCommandKey(args)
   if (!commandKey) return false
@@ -306,7 +347,7 @@ function injectTrellisContextIntoBash(ctx, input, output, hostPlatform) {
   const contextKey = ctx.getContextKey(input)
   if (!contextKey) return false
 
-  args[commandKey] = `${buildTrellisContextPrefix(contextKey, hostPlatform)}${command}`
+  args[commandKey] = `${buildTrellisContextPrefix(contextKey, hostPlatform, env)}${command}`
   return true
 }
 
@@ -315,7 +356,7 @@ function injectTrellisContextIntoBash(ctx, input, output, hostPlatform) {
 // (packages/opencode/src/plugin/index.ts — `for ([_, fn] of Object.entries(mod)) await fn(input)`);
 // the previous `{ id, server }` object shape failed with
 // `TypeError: fn is not a function` in 1.2.x.
-export default async ({ directory, platform: hostPlatform = process.platform }) => {
+export default async ({ directory, platform: hostPlatform = process.platform, env = process.env }) => {
   const ctx = new TrellisContext(directory)
   debugLog("inject", "Plugin loaded, directory:", directory)
 
@@ -329,7 +370,7 @@ export default async ({ directory, platform: hostPlatform = process.platform })
 
           const toolName = input?.tool?.toLowerCase()
           if (toolName === "bash") {
-            if (injectTrellisContextIntoBash(ctx, input, output, hostPlatform)) {
+            if (injectTrellisContextIntoBash(ctx, input, output, hostPlatform, env)) {
               debugLog("inject", "Injected TRELLIS_CONTEXT_ID into Bash command")
             }
             return
@@ -354,8 +395,53 @@ export default async ({ directory, platform: hostPlatform = process.platform })
             return
           }
 
-          // Resolve active task through session runtime context.
-          const taskDir = ctx.getCurrentTask(input)
+          // Resolve active task in this priority order (only later steps
+          // run when earlier ones miss):
+          //   1. Exact session runtime context lookup for input.sessionID
+          //   2. `Active task: <path>` hint in the dispatch prompt
+          //      (explicit per-dispatch override — beats single-session
+          //      inference so multi-window users can disambiguate)
+          //   3. Single-session fallback — only when exactly 1 session
+          //      runtime file exists locally
+          let taskDir = null
+          let taskSource = null
+
+          const contextKey = ctx.getContextKey(input)
+          if (contextKey) {
+            const context = ctx.readContext(contextKey)
+            const exactRef = ctx.normalizeTaskRef(context?.current_task || "")
+            if (exactRef) {
+              taskDir = exactRef
+              taskSource = `session:${contextKey}`
+            }
+          }
+
+          if (!taskDir) {
+            const hintRef = extractActiveTaskHint(originalPrompt)
+            if (hintRef) {
+              const hintNormalized = ctx.normalizeTaskRef(hintRef)
+              if (hintNormalized) {
+                const hintDir = ctx.resolveTaskDir(hintNormalized)
+                if (hintDir && existsSync(hintDir)) {
+                  taskDir = hintNormalized
+                  taskSource = "prompt-hint"
+                  debugLog("inject", "Resolved task from Active task: hint:", hintNormalized)
+                }
+              }
+            }
+          }
+
+          if (!taskDir) {
+            const fallback = ctx._resolveSingleSessionFallback()
+            if (fallback?.taskPath) {
+              const fallbackDir = ctx.resolveTaskDir(fallback.taskPath)
+              if (fallbackDir && existsSync(fallbackDir)) {
+                taskDir = fallback.taskPath
+                taskSource = fallback.source
+                debugLog("inject", "Resolved task via single-session fallback:", taskDir, "source:", taskSource)
+              }
+            }
+          }
 
           // Agents requiring task directory
           if (AGENTS_REQUIRE_TASK.includes(subagentType)) {
@@ -364,8 +450,8 @@ export default async ({ directory, platform: hostPlatform = process.platform })
               debugLog("inject", "Skipping - no current task")
               return
             }
-            const taskDirFull = join(directory, taskDir)
-            if (!existsSync(taskDirFull)) {
+            const taskDirFull = ctx.resolveTaskDir(taskDir)
+            if (!taskDirFull || !existsSync(taskDirFull)) {
               debugLog("inject", "Skipping - task directory not found")
               return
             }

package/dist/templates/opencode/plugins/inject-workflow-state.js

@@ -25,7 +25,7 @@
 
 import { existsSync, readFileSync } from "fs"
 import { join } from "path"
-import { TrellisContext, debugLog } from "../lib/trellis-context.js"
+import { TrellisContext, debugLog, isTrellisSubagent } from "../lib/trellis-context.js"
 
 // Supports STATUS values with letters, digits, underscores, hyphens
 // (so "in-review" / "blocked-by-team" work alongside "in_progress").
@@ -111,6 +111,13 @@ export default async ({ directory }) => {
       // so it persists in conversation history.
       "chat.message": async (input, output) => {
         try {
+          // Skip Trellis sub-agent turns — the per-turn breadcrumb is for the
+          // main session only; sub-agent context comes from the parent's
+          // tool.execute.before injection.
+          if (isTrellisSubagent(input)) {
+            debugLog("workflow-state", "Skipping trellis subagent turn:", input?.agent)
+            return
+          }
           if (process.env.TRELLIS_HOOKS === "0" || process.env.TRELLIS_DISABLE_HOOKS === "1") {
             return
           }

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

@@ -6,7 +6,7 @@
  * Uses OpenCode's chat.message hook directly so the context persists in history.
  */
 
-import { TrellisContext, contextCollector, debugLog } from "../lib/trellis-context.js"
+import { TrellisContext, contextCollector, debugLog, isTrellisSubagent } from "../lib/trellis-context.js"
 import {
   buildSessionContext,
   hasPersistedInjectedContext,
@@ -43,6 +43,14 @@ export default async ({ directory, client }) => {
         const agent = input.agent || "unknown"
         debugLog("session", "chat.message called, sessionID:", sessionID, "agent:", agent)
 
+        // Skip Trellis sub-agent turns — sub-agent context is injected by
+        // `inject-subagent-context.js` on the parent's tool.execute.before;
+        // re-injecting the main-session SessionStart here would drown that.
+        if (isTrellisSubagent(input)) {
+          debugLog("session", "Skipping trellis subagent turn:", agent)
+          return
+        }
+
         if (process.env.TRELLIS_HOOKS === "0" || process.env.TRELLIS_DISABLE_HOOKS === "1") {
           debugLog("session", "Skipping - TRELLIS_HOOKS disabled")
           return

package/dist/templates/qoder/settings.json

@@ -7,7 +7,7 @@
           {
             "type": "command",
             "command": "{{PYTHON_CMD}} .qoder/hooks/session-start.py",
-            "timeout": 10
+            "timeout": 30
           }
         ]
       },
@@ -17,7 +17,7 @@
           {
             "type": "command",
             "command": "{{PYTHON_CMD}} .qoder/hooks/session-start.py",
-            "timeout": 10
+            "timeout": 30
           }
         ]
       },
@@ -27,7 +27,7 @@
           {
             "type": "command",
             "command": "{{PYTHON_CMD}} .qoder/hooks/session-start.py",
-            "timeout": 10
+            "timeout": 30
           }
         ]
       }
@@ -38,7 +38,7 @@
           {
             "type": "command",
             "command": "{{PYTHON_CMD}} .qoder/hooks/inject-workflow-state.py",
-            "timeout": 5
+            "timeout": 15
           }
         ]
       }

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

@@ -50,12 +50,140 @@ _VERSION_RE = re.compile(
     r"^\s*(\d+)(?:\.(\d+))?(?:\.(\d+))?(?:-([0-9A-Za-z.-]+))?\s*$"
 )
 _VERSION_TOKEN_RE = re.compile(r"\b\d+(?:\.\d+){1,2}(?:-[0-9A-Za-z.-]+)?\b")
+_POLYREPO_IGNORED_DIRS = {
+    "node_modules",
+    "target",
+    "dist",
+    "build",
+    "out",
+    "bin",
+    "obj",
+    "vendor",
+    "coverage",
+    "tmp",
+    "__pycache__",
+}
+_POLYREPO_SCAN_MAX_DEPTH = 2
+
+
+def _is_git_worktree(path: Path) -> bool:
+    """Return True when path is inside a Git worktree."""
+    rc, out, _ = run_git(["rev-parse", "--is-inside-work-tree"], cwd=path)
+    return rc == 0 and out.strip().lower() == "true"
+
+
+def _parse_recent_commits(log_output: str) -> list[dict]:
+    """Parse `git log --oneline` output into structured commit entries."""
+    commits = []
+    for line in log_output.splitlines():
+        if not line.strip():
+            continue
+        parts = line.split(" ", 1)
+        if len(parts) >= 2:
+            commits.append({"hash": parts[0], "message": parts[1]})
+        elif len(parts) == 1:
+            commits.append({"hash": parts[0], "message": ""})
+    return commits
+
+
+def _collect_git_repo_info(name: str, rel_path: str, repo_dir: Path) -> dict | None:
+    """Collect Git status for one known repository directory."""
+    if not (repo_dir / ".git").exists():
+        return None
+
+    _, branch_out, _ = run_git(["branch", "--show-current"], cwd=repo_dir)
+    branch = branch_out.strip() or "unknown"
+
+    _, status_out, _ = run_git(["status", "--porcelain"], cwd=repo_dir)
+    changes = len([l for l in status_out.splitlines() if l.strip()])
+
+    _, log_out, _ = run_git(["log", "--oneline", "-5"], cwd=repo_dir)
+
+    return {
+        "name": name,
+        "path": rel_path,
+        "branch": branch,
+        "isClean": changes == 0,
+        "uncommittedChanges": changes,
+        "recentCommits": _parse_recent_commits(log_out),
+    }
+
+
+def _collect_root_git_info(repo_root: Path) -> dict:
+    """Collect root Git info without pretending a non-Git root is clean."""
+    if not _is_git_worktree(repo_root):
+        return {
+            "isRepo": False,
+            "branch": "",
+            "isClean": False,
+            "uncommittedChanges": 0,
+            "recentCommits": [],
+        }
+
+    _, branch_out, _ = run_git(["branch", "--show-current"], cwd=repo_root)
+    branch = branch_out.strip() or "unknown"
+
+    _, status_out, _ = run_git(["status", "--porcelain"], cwd=repo_root)
+    status_lines = [line for line in status_out.splitlines() if line.strip()]
+
+    _, short_out, _ = run_git(["status", "--short"], cwd=repo_root)
+
+    _, log_out, _ = run_git(["log", "--oneline", "-5"], cwd=repo_root)
+
+    return {
+        "isRepo": True,
+        "branch": branch,
+        "isClean": len(status_lines) == 0,
+        "uncommittedChanges": len(status_lines),
+        "statusShort": short_out.splitlines(),
+        "recentCommits": _parse_recent_commits(log_out),
+    }
+
+
+def _discover_child_git_repos(repo_root: Path) -> list[tuple[str, str]]:
+    """Discover child Git repositories using the init-time polyrepo heuristic."""
+    found: list[str] = []
 
+    def is_candidate_dir(path: Path) -> bool:
+        name = path.name
+        return not name.startswith(".") and name not in _POLYREPO_IGNORED_DIRS
 
-def _collect_package_git_info(repo_root: Path) -> list[dict]:
-    """Collect git status and recent commits for packages with independent git repos.
+    def scan(rel_dir: Path, depth: int) -> None:
+        if depth >= _POLYREPO_SCAN_MAX_DEPTH:
+            return
+        abs_dir = repo_root / rel_dir
+        try:
+            children = sorted(abs_dir.iterdir(), key=lambda p: p.name)
+        except OSError:
+            return
 
-    Only packages marked with ``git: true`` in config.yaml are included.
+        for child in children:
+            if not child.is_dir() or not is_candidate_dir(child):
+                continue
+
+            child_rel = (
+                rel_dir / child.name if rel_dir != Path(".") else Path(child.name)
+            )
+            if (child / ".git").exists():
+                found.append(child_rel.as_posix())
+                continue
+            scan(child_rel, depth + 1)
+
+    scan(Path("."), 0)
+    if len(found) < 2:
+        return []
+    return [(path.replace("/", "_"), path) for path in sorted(found)]
+
+
+def _collect_package_git_info(
+    repo_root: Path,
+    discover_unconfigured: bool = False,
+) -> list[dict]:
+    """Collect Git status for independent package repositories.
+
+    Packages marked with ``git: true`` in config.yaml are authoritative.
+    When the Trellis root is not a Git repo and no configured package repos are
+    available, optionally fall back to the bounded polyrepo child scan.
 
     Returns:
         List of dicts with keys: name, path, branch, isClean,
@@ -63,41 +191,56 @@ def _collect_package_git_info(repo_root: Path) -> list[dict]:
         Empty list if no git-repo packages are configured.
     """
     git_pkgs = get_git_packages(repo_root)
-    if not git_pkgs:
-        return []
-
     result = []
     for pkg_name, pkg_path in git_pkgs.items():
         pkg_dir = repo_root / pkg_path
-        if not (pkg_dir / ".git").exists():
-            continue
+        info = _collect_git_repo_info(pkg_name, pkg_path, pkg_dir)
+        if info is not None:
+            result.append(info)
 
-        _, branch_out, _ = run_git(["branch", "--show-current"], cwd=pkg_dir)
-        branch = branch_out.strip() or "unknown"
-
-        _, status_out, _ = run_git(["status", "--porcelain"], cwd=pkg_dir)
-        changes = len([l for l in status_out.splitlines() if l.strip()])
-
-        _, log_out, _ = run_git(["log", "--oneline", "-5"], cwd=pkg_dir)
-        commits = []
-        for line in log_out.splitlines():
-            if line.strip():
-                parts = line.split(" ", 1)
-                if len(parts) >= 2:
-                    commits.append({"hash": parts[0], "message": parts[1]})
-                elif len(parts) == 1:
-                    commits.append({"hash": parts[0], "message": ""})
-
-        result.append({
-            "name": pkg_name,
-            "path": pkg_path,
-            "branch": branch,
-            "isClean": changes == 0,
-            "uncommittedChanges": changes,
-            "recentCommits": commits,
-        })
+    if result or not discover_unconfigured:
+        return result
+
+    discovered = []
+    for pkg_name, pkg_path in _discover_child_git_repos(repo_root):
+        info = _collect_git_repo_info(pkg_name, pkg_path, repo_root / pkg_path)
+        if info is not None:
+            discovered.append(info)
+    return discovered
 
-    return result
+
+def _append_root_git_context(lines: list[str], root_git_info: dict) -> None:
+    """Append root Git status without misleading non-Git roots."""
+    lines.append("## GIT STATUS")
+    if not root_git_info["isRepo"]:
+        lines.append("Root is not a Git repository.")
+        lines.append("Run Git commands from the package repository paths listed below.")
+    else:
+        lines.append(f"Branch: {root_git_info['branch']}")
+        if root_git_info["isClean"]:
+            lines.append("Working directory: Clean")
+        else:
+            lines.append(
+                f"Working directory: {root_git_info['uncommittedChanges']} "
+                "uncommitted change(s)"
+            )
+            lines.append("")
+            lines.append("Changes:")
+            for line in root_git_info.get("statusShort", [])[:10]:
+                lines.append(line)
+    lines.append("")
+
+    lines.append("## RECENT COMMITS")
+    if not root_git_info["isRepo"]:
+        lines.append(
+            "Root has no Git commit history because it is not a Git repository."
+        )
+    elif root_git_info["recentCommits"]:
+        for commit in root_git_info["recentCommits"]:
+            lines.append(f"{commit['hash']} {commit['message']}")
+    else:
+        lines.append("(no commits)")
+    lines.append("")
 
 
 def _append_package_git_context(lines: list[str], package_git_info: list[dict]) -> None:
@@ -301,24 +444,7 @@ def get_context_json(repo_root: Path | None = None) -> dict:
             f"{DIR_WORKFLOW}/{DIR_WORKSPACE}/{developer}/{journal_file.name}"
         )
 
-    # Git info
-    _, branch_out, _ = run_git(["branch", "--show-current"], cwd=repo_root)
-    branch = branch_out.strip() or "unknown"
-
-    _, status_out, _ = run_git(["status", "--porcelain"], cwd=repo_root)
-    git_status_count = len([line for line in status_out.splitlines() if line.strip()])
-    is_clean = git_status_count == 0
-
-    # Recent commits
-    _, log_out, _ = run_git(["log", "--oneline", "-5"], cwd=repo_root)
-    commits = []
-    for line in log_out.splitlines():
-        if line.strip():
-            parts = line.split(" ", 1)
-            if len(parts) >= 2:
-                commits.append({"hash": parts[0], "message": parts[1]})
-            elif len(parts) == 1:
-                commits.append({"hash": parts[0], "message": ""})
+    root_git_info = _collect_root_git_info(repo_root)
 
     # Tasks
     tasks = [
@@ -333,15 +459,19 @@ def get_context_json(repo_root: Path | None = None) -> dict:
     ]
 
     # Package git repos (independent sub-repositories)
-    pkg_git_info = _collect_package_git_info(repo_root)
+    pkg_git_info = _collect_package_git_info(
+        repo_root,
+        discover_unconfigured=not root_git_info["isRepo"],
+    )
 
     result = {
         "developer": developer or "",
         "git": {
-            "branch": branch,
-            "isClean": is_clean,
-            "uncommittedChanges": git_status_count,
-            "recentCommits": commits,
+            "isRepo": root_git_info["isRepo"],
+            "branch": root_git_info["branch"],
+            "isClean": root_git_info["isClean"],
+            "uncommittedChanges": root_git_info["uncommittedChanges"],
+            "recentCommits": root_git_info["recentCommits"],
         },
         "tasks": {
             "active": tasks,
@@ -405,39 +535,17 @@ def get_context_text(repo_root: Path | None = None) -> str:
     lines.append(f"Name: {developer}")
     lines.append("")
 
-    # Git status
-    lines.append("## GIT STATUS")
-    _, branch_out, _ = run_git(["branch", "--show-current"], cwd=repo_root)
-    branch = branch_out.strip() or "unknown"
-    lines.append(f"Branch: {branch}")
-
-    _, status_out, _ = run_git(["status", "--porcelain"], cwd=repo_root)
-    status_lines = [line for line in status_out.splitlines() if line.strip()]
-    status_count = len(status_lines)
-
-    if status_count == 0:
-        lines.append("Working directory: Clean")
-    else:
-        lines.append(f"Working directory: {status_count} uncommitted change(s)")
-        lines.append("")
-        lines.append("Changes:")
-        _, short_out, _ = run_git(["status", "--short"], cwd=repo_root)
-        for line in short_out.splitlines()[:10]:
-            lines.append(line)
-    lines.append("")
-
-    # Recent commits
-    lines.append("## RECENT COMMITS")
-    _, log_out, _ = run_git(["log", "--oneline", "-5"], cwd=repo_root)
-    if log_out.strip():
-        for line in log_out.splitlines():
-            lines.append(line)
-    else:
-        lines.append("(no commits)")
-    lines.append("")
+    root_git_info = _collect_root_git_info(repo_root)
+    _append_root_git_context(lines, root_git_info)
 
     # Package git repos — independent sub-repositories
-    _append_package_git_context(lines, _collect_package_git_info(repo_root))
+    _append_package_git_context(
+        lines,
+        _collect_package_git_info(
+            repo_root,
+            discover_unconfigured=not root_git_info["isRepo"],
+        ),
+    )
 
     # Current task
     lines.append("## CURRENT TASK")
@@ -557,20 +665,7 @@ def get_context_record_json(repo_root: Path | None = None) -> dict:
     developer = get_developer(repo_root)
     tasks_dir = get_tasks_dir(repo_root)
 
-    # Git info
-    _, branch_out, _ = run_git(["branch", "--show-current"], cwd=repo_root)
-    branch = branch_out.strip() or "unknown"
-
-    _, status_out, _ = run_git(["status", "--porcelain"], cwd=repo_root)
-    git_status_count = len([line for line in status_out.splitlines() if line.strip()])
-
-    _, log_out, _ = run_git(["log", "--oneline", "-5"], cwd=repo_root)
-    commits = []
-    for line in log_out.splitlines():
-        if line.strip():
-            parts = line.split(" ", 1)
-            if len(parts) >= 2:
-                commits.append({"hash": parts[0], "message": parts[1]})
+    root_git_info = _collect_root_git_info(repo_root)
 
     # My tasks (single pass — collect statuses and filter by assignee)
     all_tasks_list = list(iter_active_tasks(tasks_dir))
@@ -610,15 +705,19 @@ def get_context_record_json(repo_root: Path | None = None) -> dict:
             }
 
     # Package git repos
-    pkg_git_info = _collect_package_git_info(repo_root)
+    pkg_git_info = _collect_package_git_info(
+        repo_root,
+        discover_unconfigured=not root_git_info["isRepo"],
+    )
 
     result = {
         "developer": developer or "",
         "git": {
-            "branch": branch,
-            "isClean": git_status_count == 0,
-            "uncommittedChanges": git_status_count,
-            "recentCommits": commits,
+            "isRepo": root_git_info["isRepo"],
+            "branch": root_git_info["branch"],
+            "isClean": root_git_info["isClean"],
+            "uncommittedChanges": root_git_info["uncommittedChanges"],
+            "recentCommits": root_git_info["recentCommits"],
         },
         "myTasks": my_tasks,
         "currentTask": current_task_info,
@@ -673,39 +772,17 @@ def get_context_text_record(repo_root: Path | None = None) -> str:
         lines.append("(no active tasks assigned to you)")
     lines.append("")
 
-    # GIT STATUS
-    lines.append("## GIT STATUS")
-    _, branch_out, _ = run_git(["branch", "--show-current"], cwd=repo_root)
-    branch = branch_out.strip() or "unknown"
-    lines.append(f"Branch: {branch}")
-
-    _, status_out, _ = run_git(["status", "--porcelain"], cwd=repo_root)
-    status_lines = [line for line in status_out.splitlines() if line.strip()]
-    status_count = len(status_lines)
-
-    if status_count == 0:
-        lines.append("Working directory: Clean")
-    else:
-        lines.append(f"Working directory: {status_count} uncommitted change(s)")
-        lines.append("")
-        lines.append("Changes:")
-        _, short_out, _ = run_git(["status", "--short"], cwd=repo_root)
-        for line in short_out.splitlines()[:10]:
-            lines.append(line)
-    lines.append("")
-
-    # RECENT COMMITS
-    lines.append("## RECENT COMMITS")
-    _, log_out, _ = run_git(["log", "--oneline", "-5"], cwd=repo_root)
-    if log_out.strip():
-        for line in log_out.splitlines():
-            lines.append(line)
-    else:
-        lines.append("(no commits)")
-    lines.append("")
+    root_git_info = _collect_root_git_info(repo_root)
+    _append_root_git_context(lines, root_git_info)
 
     # Package git repos — independent sub-repositories
-    _append_package_git_context(lines, _collect_package_git_info(repo_root))
+    _append_package_git_context(
+        lines,
+        _collect_package_git_info(
+            repo_root,
+            discover_unconfigured=not root_git_info["isRepo"],
+        ),
+    )
 
     # CURRENT TASK
     lines.append("## CURRENT TASK")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mindfoldhq/trellis",
-  "version": "0.5.12",
+  "version": "0.5.13",
   "description": "AI capabilities grow like ivy — Trellis provides the structure to guide them along a disciplined path",
   "type": "module",
   "main": "./dist/index.js",