@pennixrv/trellis 0.7.0-beta.9 → 0.7.1-beta.0

package/dist/templates/omp/extensions/trellis/index.ts.txt

@@ -59,7 +59,7 @@ function isInsideRoot(root: string, candidate: string): boolean {
 }
 
 // ---------------------------------------------------------------------------
-// Trusted context roots (mirrors packages/cli/src/commands/channel/context-trust.ts;
+// Trusted context roots (mirrors packages/cli/src/commands/teamwork/context-trust.ts;
 // standalone copy since templates don't import from the CLI package).
 // ---------------------------------------------------------------------------
 
@@ -69,7 +69,7 @@ function stripTrustValue(s: string): string {
    return s.trim().replace(/\s*#.*$/, "").trim().replace(/^['"]|['"]$/g, "");
 }
 
-function parseChannelTrustSection(content: string): { trustedDirs: string[]; autoTrustSymlinks?: boolean } {
+function parseTeamworkTrustSection(content: string): { trustedDirs: string[]; autoTrustSymlinks?: boolean } {
    const lines = content.split("\n");
    const trustedDirs: string[] = [];
    let autoTrustSymlinks: boolean | undefined;
@@ -115,7 +115,7 @@ function parseChannelTrustSection(content: string): { trustedDirs: string[]; aut
          const val = stripTrustValue(boolMatch[1]!).toLowerCase();
          if (val === "false") autoTrustSymlinks = false;
          else if (val === "true") autoTrustSymlinks = true;
-         else process.stderr.write(`[channel] channel.auto_trust_trellis_symlinks: invalid value '${val}', ignoring\n`);
+         else process.stderr.write(`[teamwork] teamwork.auto_trust_trellis_symlinks: invalid value '${val}', ignoring\n`);
          continue;
       }
    }
@@ -128,7 +128,7 @@ function resolveTrustedRoots(projectRoot: string): string[] {
    let config: { trustedDirs: string[]; autoTrustSymlinks?: boolean } = { trustedDirs: [] };
    if (existsSync(configPath)) {
       try {
-         config = parseChannelTrustSection(readFileSync(configPath, "utf-8"));
+         config = parseTeamworkTrustSection(readFileSync(configPath, "utf-8"));
       } catch {
          // ignore
       }
@@ -202,9 +202,9 @@ function displayProjectPath(projectRoot: string, filePath: string, taskDir?: str
 function resolveActiveTaskStatus(
    projectRoot: string,
    contextKey: string | null,
-): { status: string; taskDir: string | null; taskTitle: string | null } {
+): { status: string; phaseStatus: string | null; taskDir: string | null; taskTitle: string | null } {
    const sessionsDir = join(projectRoot, ".trellis", ".runtime", "sessions");
-   if (!existsSync(sessionsDir)) return { status: "no_task", taskDir: null, taskTitle: null };
+   if (!existsSync(sessionsDir)) return { status: "no_task", phaseStatus: null, taskDir: null, taskTitle: null };
 
    // --- 通过 context key 解析 session 文件 ---
    let sessionFilePath: string | null = null;
@@ -214,7 +214,7 @@ function resolveActiveTaskStatus(
       if (existsSync(candidate)) {
          sessionFilePath = candidate;
       } else {
-         return { status: "no_task", taskDir: null, taskTitle: null };
+         return { status: "no_task", phaseStatus: null, taskDir: null, taskTitle: null };
       }
    } else {
       // No identity: use single-session fallback only when there is exactly one session file.
@@ -222,12 +222,12 @@ function resolveActiveTaskStatus(
       try {
          sessionFiles = readdirSync(sessionsDir).filter((f) => f.endsWith(".json"));
       } catch {
-         return { status: "no_task", taskDir: null, taskTitle: null };
+         return { status: "no_task", phaseStatus: null, taskDir: null, taskTitle: null };
       }
       if (sessionFiles.length === 1) {
          sessionFilePath = join(sessionsDir, sessionFiles[0]);
       } else {
-         return { status: "no_task", taskDir: null, taskTitle: null };
+         return { status: "no_task", phaseStatus: null, taskDir: null, taskTitle: null };
       }
    }
 
@@ -236,12 +236,12 @@ function resolveActiveTaskStatus(
    try {
       sessionData = JSON.parse(readFileSync(sessionFilePath, "utf-8"));
    } catch {
-      return { status: "no_task", taskDir: null, taskTitle: null };
+      return { status: "no_task", phaseStatus: null, taskDir: null, taskTitle: null };
    }
 
    const currentTask = sessionData.current_task;
    if (typeof currentTask !== "string" || !currentTask)
-      return { status: "no_task", taskDir: null, taskTitle: null };
+      return { status: "no_task", phaseStatus: null, taskDir: null, taskTitle: null };
 
    // Same jail the jsonl-referenced files already go through below. `task.py`
    // now refuses to store a ref that leaves the project, but a session file
@@ -249,19 +249,30 @@ function resolveActiveTaskStatus(
    // rewrite session files — so a poisoned pointer outlives the upgrade that
    // closed the writer.
    const taskDir = resolveProjectFile(projectRoot, currentTask, resolveTrustedRoots(projectRoot));
-   if (!taskDir) return { status: "no_task", taskDir: null, taskTitle: null };
+   if (!taskDir) return { status: "no_task", phaseStatus: null, taskDir: null, taskTitle: null };
    const taskJsonPath = join(taskDir, "task.json");
-   if (!existsSync(taskJsonPath)) return { status: "no_task", taskDir: null, taskTitle: null };
+   if (!existsSync(taskJsonPath)) return { status: "no_task", phaseStatus: null, taskDir: null, taskTitle: null };
 
    let taskData: Record<string, unknown>;
    try {
       taskData = JSON.parse(readFileSync(taskJsonPath, "utf-8"));
    } catch {
-      return { status: "no_task", taskDir: null, taskTitle: null };
+      return { status: "no_task", phaseStatus: null, taskDir: null, taskTitle: null };
    }
 
+   const taskMeta = taskData.meta;
+   const phaseWorkflow = taskMeta && typeof taskMeta === "object" && !Array.isArray(taskMeta)
+      ? (taskMeta as Record<string, unknown>).task_workflow as Record<string, unknown> | undefined
+      : undefined;
+   const route = phaseWorkflow?.phase_ids;
+   const phaseId = phaseWorkflow?.current_phase_id || (Array.isArray(route) ? route[route.length - 1] : undefined);
+   const phaseMap = phaseWorkflow?.phases;
+   const phase = typeof phaseId === "string" && phaseMap && typeof phaseMap === "object" && !Array.isArray(phaseMap)
+      ? (phaseMap as Record<string, Record<string, unknown>>)[phaseId]
+      : null;
    return {
-      status: typeof taskData.status === "string" ? taskData.status : "planning",
+      status: typeof phaseId === "string" && phase ? phaseId : (typeof taskData.status === "string" ? taskData.status : "planning"),
+      phaseStatus: typeof phase?.status === "string" ? phase.status : null,
       taskDir,
       taskTitle: typeof taskData.title === "string" ? taskData.title : null,
    };
@@ -818,7 +829,7 @@ class TurnContextCache {
          return { workflowMsg: this.workflowMsg };
       }
 
-      const { status } = resolveActiveTaskStatus(projectRoot, contextKey);
+      const { status, phaseStatus } = resolveActiveTaskStatus(projectRoot, contextKey);
 
       const workflowPath = join(projectRoot, ".trellis", "workflow.md");
       let workflowMd = "";
@@ -839,7 +850,7 @@ class TurnContextCache {
       // When skip keyword is present, skip workflow state injection this turn
       this.workflowMsg = this.skipThisTurn
          ? ""
-         : `<workflow-state>\n${workflowBody}\n</workflow-state>\n\n<session-overview>\n${SESSION_OVERVIEW_TEXT}\n</session-overview>`;
+         : `<workflow-state>\n${phaseStatus ? `Phase: ${status} (${phaseStatus})\n` : ""}${workflowBody}\n</workflow-state>\n\n<session-overview>\n${SESSION_OVERVIEW_TEXT}\n</session-overview>`;
 
       this.key = cacheKey;
       this.timestamp = now;

package/dist/templates/opencode/lib/session-utils.js

@@ -71,12 +71,9 @@ function getTaskStatus(ctx, platformInput = null) {
   const taskStatus = taskData.status || "unknown"
 
   if (taskStatus === "completed") {
-    return `Status: COMPLETED\nTask: ${taskTitle}\nNext-Action: Run /trellis:finish-work. If the working tree is dirty, return to Phase 3.4 first.`
+    return `Status: COMPLETED\nTask: ${taskTitle}\nNext-Action: Start another task or end the session; finish-work only records the session journal.`
   }
 
-  const hasPrd = existsSync(join(taskDir, "prd.md"))
-  const hasDesign = existsSync(join(taskDir, "design.md"))
-  const hasImplementPlan = existsSync(join(taskDir, "implement.md"))
   const artifactNames = ["prd.md", "design.md", "implement.md", "implement.jsonl", "check.jsonl"]
   const present = artifactNames.filter(name => existsSync(join(taskDir, name)))
   if (existsSync(join(taskDir, "research"))) present.push("research/")
@@ -87,24 +84,13 @@ function getTaskStatus(ctx, platformInput = null) {
     (!existsSync(implementJsonl) || hasCuratedJsonlEntry(implementJsonl)) &&
     (!existsSync(checkJsonl) || hasCuratedJsonlEntry(checkJsonl))
 
-  if (taskStatus === "planning" && !hasPrd) {
-    return `Status: PLANNING\nTask: ${taskTitle}\nPresent: ${presentLine}\nNext-Action: Load trellis-brainstorm and write prd.md. Stay in planning.`
-  }
-
   if (taskStatus === "planning") {
-    const missingComplex = []
-    if (!hasDesign) missingComplex.push("design.md")
-    if (!hasImplementPlan) missingComplex.push("implement.md")
-    const nextBits = []
-    if (missingComplex.length > 0) {
-      nextBits.push(
-        `Lightweight task can request start review with PRD-only; complex task must add ${missingComplex.join(", ")} before start`,
-      )
-    } else {
-      nextBits.push("Planning artifacts are present; ask for review before `task.py start`")
-    }
+    const nextBits = [
+      "Follow the current per-turn workflow-state; task lifecycle status and artifact presence do not identify the business phase",
+      "If no phase route is initialized, load `trellis-goal-exploration-and-requirements` and confirm the requirements baseline before initializing the route",
+    ]
     if (!jsonlReady) {
-      nextBits.push("curate `implement.jsonl` and `check.jsonl` before sub-agent mode start")
+      nextBits.push("curate task context manifests only when a dispatched agent needs them")
     }
     return `Status: PLANNING\nTask: ${taskTitle}\nPresent: ${presentLine}\nNext-Action: ${nextBits.join("; ")}. Do not enter implementation until the user confirms start.`
   }
@@ -112,7 +98,7 @@ function getTaskStatus(ctx, platformInput = null) {
   return (
     `Status: ${String(taskStatus).toUpperCase()}\nTask: ${taskTitle}\n` +
     `Present: ${presentLine}\n` +
-    "Next-Action: Follow the matching per-turn workflow-state. " +
+    "Next-Action: Follow the matching per-turn workflow-state; task lifecycle status does not identify the business phase. " +
     "Implementation/check context order is jsonl entries -> `prd.md` -> `design.md if present` -> `implement.md if present`."
   )
 }
@@ -393,8 +379,8 @@ Trellis compact SessionStart context. Use it to orient the session; load details
   if (workflowContent) {
     const allLines = workflowContent.split("\n")
     const overviewLines = [
-      "# Development Workflow - Session Summary",
-      "Full guide: .trellis/workflow.md. Step detail: `python3 ./.trellis/scripts/get_context.py --mode phase --step <X.Y>`.",
+      "# 工作流会话摘要",
+      "完整说明：.trellis/workflow.md。阶段详情：读取当前阶段提示指定的 Skill。",
       "",
     ]
 
@@ -402,9 +388,18 @@ Trellis compact SessionStart context. Use it to orient the session; load details
     let rangeEnd = allLines.length
     for (let i = 0; i < allLines.length; i++) {
       const stripped = allLines[i].trim()
-      if (rangeStart === -1 && stripped === "## Phase Index") {
+      const heading = stripped.replace(/^#{2,3}\s+/, "")
+      const isPhaseHeading =
+        /^#{2,3}\s+/.test(stripped) &&
+        ["目标探索与需求核对阶段", "Goal Exploration and Requirements Confirmation Phase"].some(
+          (title) =>
+            heading === title ||
+            heading.endsWith(`：${title}`) ||
+            heading.endsWith(`: ${title}`),
+        )
+      if (rangeStart === -1 && ["## 阶段索引", "## Phase Index"].includes(stripped)) {
         rangeStart = i
-      } else if (rangeStart !== -1 && stripped === "## Phase 1: Plan") {
+      } else if (rangeStart !== -1 && isPhaseHeading) {
         rangeEnd = i
         break
       }

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

@@ -372,14 +372,10 @@ 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. A known
-   *      key is authoritative when it contains a task; a missing or empty
-   *      context may use the guarded unbound-task projection.
-   *   2. If no context key is available 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.
-   *   3. If no session file exists, expose one resumable task assigned to the
-   *      current developer as a read-only unbound projection.
+   *   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)
@@ -394,11 +390,6 @@ export class TrellisContext {
           stale: !taskDir || !existsSync(taskDir),
         }
       }
-      const unbound = this._resolveUnboundTask()
-      if (unbound) {
-        return unbound
-      }
-      return { taskPath: null, source: "none", stale: false }
     }
 
     const fallback = this._resolveSingleSessionFallback()
@@ -406,11 +397,6 @@ export class TrellisContext {
       return fallback
     }
 
-    const unbound = this._resolveUnboundTask()
-    if (unbound) {
-      return unbound
-    }
-
     return { taskPath: null, source: "none", stale: false }
   }
 
@@ -452,64 +438,6 @@ export class TrellisContext {
     }
   }
 
-  _resolveUnboundTask() {
-    const sessionsDir = join(this.directory, ".trellis", ".runtime", "sessions")
-    if (existsSync(sessionsDir)) {
-      let sessionFiles
-      try {
-        sessionFiles = readdirSync(sessionsDir).filter(name => name.endsWith(".json"))
-      } catch {
-        return null
-      }
-      if (sessionFiles.some(file => {
-        try {
-          const context = JSON.parse(readFileSync(join(sessionsDir, file), "utf-8"))
-          return Boolean(this.normalizeTaskRef(context?.current_task || ""))
-        } catch {
-          return false
-        }
-      })) return null
-    }
-
-    const developer = (process.env.TRELLIS_DEVELOPER || "").trim() || (() => {
-      try {
-        const content = readFileSync(join(this.directory, ".trellis", ".developer"), "utf-8")
-        return content.split(/\r?\n/).find(line => line.startsWith("name="))?.slice(5).trim() || ""
-      } catch {
-        return ""
-      }
-    })()
-    if (!developer) return null
-
-    const tasksDir = join(this.directory, ".trellis", "tasks")
-    let taskNames
-    try {
-      taskNames = readdirSync(tasksDir).filter(name => name !== "archive")
-    } catch {
-      return null
-    }
-
-    const candidates = taskNames.flatMap(name => {
-      try {
-        const data = JSON.parse(readFileSync(join(tasksDir, name, "task.json"), "utf-8"))
-        if (data.assignee !== developer || !["planning", "in_progress", "review"].includes(data.status)) return []
-        return [`.trellis/tasks/${name}`]
-      } catch {
-        return []
-      }
-    })
-    if (candidates.length === 0) return null
-    if (candidates.length === 1) {
-      return { taskPath: candidates[0], source: "unbound", stale: false }
-    }
-    return {
-      taskPath: null,
-      source: "unbound_ambiguous",
-      stale: false,
-      candidatePaths: candidates.sort(),
-    }
-  }
-
   getCurrentTask(platformInput = null) {
     return this.getActiveTask(platformInput).taskPath
   }

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

@@ -471,9 +471,10 @@ export default async ({ directory, platform: hostPlatform = process.platform, en
           // 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)
-          //   3. Single-session fallback only when the input has no session
-          //      identity and exactly 1 runtime file exists locally
+          //      (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
 
@@ -502,7 +503,7 @@ export default async ({ directory, platform: hostPlatform = process.platform, en
             }
           }
 
-          if (!taskDir && !contextKey) {
+          if (!taskDir) {
             const fallback = ctx._resolveSingleSessionFallback()
             if (fallback?.taskPath) {
               const fallbackDir = ctx.resolveTaskDir(fallback.taskPath)

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

@@ -244,14 +244,6 @@ function loadBreadcrumbs(workflowPath) {
  */
 function getActiveTask(ctx, platformInput = null) {
   const active = ctx.getActiveTask(platformInput)
-  if (active.source === "unbound_ambiguous") {
-    return {
-      id: null,
-      status: "unbound_ambiguous",
-      source: active.source,
-      candidates: active.candidatePaths || [],
-    }
-  }
   const taskRef = active.taskPath
   if (!taskRef) return null
   const taskDir = ctx.resolveTaskDir(taskRef)
@@ -264,8 +256,14 @@ function getActiveTask(ctx, platformInput = null) {
     const data = JSON.parse(readFileSync(taskJsonPath, "utf-8"))
     const status = typeof data.status === "string" ? data.status : ""
     if (!status) return null
+    const phaseWorkflow = data.meta?.task_workflow
+    const phases = phaseWorkflow?.phases
+    const phaseId = phaseWorkflow?.current_phase_id || phaseWorkflow?.phase_ids?.at(-1)
+    const phase = typeof phaseId === "string" ? phases?.[phaseId] : null
     const id = data.id || taskRef.split("/").pop()
-    if (active.source === "unbound") return { id, status: "unbound_task", source: active.source }
+    if (typeof phaseId === "string" && phase && typeof phase.status === "string") {
+      return { id, status: phaseId, phaseStatus: phase.status, source: active.source }
+    }
     return { id, status, source: active.source }
   } catch {
     return null
@@ -279,17 +277,16 @@ function getActiveTask(ctx, platformInput = null) {
  *   "Refer to workflow.md for current step." line
  * - no_task pseudo-status (id === null) → header omits task info
  */
-function buildBreadcrumb(id, status, templates, candidates = []) {
+function buildBreadcrumb(id, status, templates, phaseStatus = null) {
   let body = templates[status]
   if (body === undefined) {
     body = "Refer to workflow.md for current step."
   }
-  let header
-  if (status === "unbound_ambiguous") {
-    header = `Status: ${status}\nCandidates: ${candidates.join(", ")}`
-  } else {
-    header = id === null ? `Status: ${status}` : `Task: ${id} (${status})`
-  }
+  const header = id === null
+    ? `Status: ${status}`
+    : phaseStatus
+      ? `Task: ${id}\nPhase: ${status} (${phaseStatus})`
+      : `Task: ${id} (${status})`
   return `<workflow-state>\n${header}\n${body}\n</workflow-state>`
 }
 
@@ -332,7 +329,7 @@ export default async ({ directory }) => {
           const templates = loadBreadcrumbs(resolveWorkflowMd(ctx, directory, platformInput))
           const task = getActiveTask(ctx, platformInput)
           const breadcrumb = task
-            ? buildBreadcrumb(task.id, task.status, templates, task.candidates)
+            ? buildBreadcrumb(task.id, task.status, templates, task.phaseStatus)
             : buildBreadcrumb(null, "no_task", templates)
 
           prependEphemeralText(messages, breadcrumb)

package/dist/templates/shared-hooks/inject-shell-session-context.py

@@ -4,7 +4,7 @@
 No researched platform exports a session id into its shell tool's child
 process, but every hook-capable one puts that id on hook stdin. So the hook
 that fires just before a shell command writes a short-lived runtime ticket
-whenever the pending command calls `task.py start/replan/current/finish`, and the
+whenever the pending command calls `task.py start/current/finish`, and the
 task script consumes it when it has no native session environment.
 
 Registered on whichever pre-shell event the host provides — Cursor's
@@ -35,7 +35,7 @@ if callable(_stdin_reconfigure):
 DIR_WORKFLOW = ".trellis"
 DIR_RUNTIME = ".runtime"
 DIR_SHELL_TICKETS = "shell-tickets"
-SESSION_SUBCOMMANDS = {"start", "replan", "current", "finish"}
+SESSION_SUBCOMMANDS = {"start", "current", "finish"}
 TICKET_TTL_SECONDS = 30
 CONTEXT_IDENTITY_KEYS = (
     "session_id",
@@ -177,7 +177,7 @@ def _extract_task_subcommands(command: str) -> list[dict[str, str]]:
         if name not in SESSION_SUBCOMMANDS:
             continue
         item = {"name": name}
-        if name in {"start", "replan"} and index + 2 < len(tokens):
+        if name == "start" and index + 2 < len(tokens):
             item["task_ref"] = tokens[index + 2]
         subcommands.append(item)
     return subcommands