@blulotus/trellis 0.7.0 → 0.7.2

package/dist/templates/trellis/config.yaml

@@ -19,18 +19,18 @@ max_journal_lines: 2000
 #-------------------------------------------------------------------------------
 
 # Auto-commit behavior for session journal + task archive operations.
-# - true (default): scripts auto-stage and auto-commit journal / task changes
-#   after add_session.py / task.py archive runs.
-# - false: scripts do not touch git. Files (journal-*.md, task archive moves)
-#   are still written to disk; you decide whether to git add / commit.
+# - false (default): scripts do not touch git. Files (journal-*.md, task archive
+#   moves) are still written to disk; you decide whether to git add / commit.
+# - true: scripts auto-stage and auto-commit journal / task changes after
+#   add_session.py / task.py archive runs.
 #
-# Use `false` if your project's .gitignore intentionally excludes `.trellis/`
-# and you want session data kept local-only, or if you prefer to review
-# staged changes manually before each commit.
+# Use `true` if you want session records to land in git without extra steps.
+# With `true` and parallel worktrees/branches, journal-*.md and index.md merges
+# can conflict; resolve by keeping both sides' session blocks.
 #
 # Accepts: true / false / yes / no / 1 / 0 / on / off (case-insensitive).
 #
-# session_auto_commit: true
+session_auto_commit: false
 
 #-------------------------------------------------------------------------------
 # Task Lifecycle Hooks

package/dist/templates/trellis/index.d.ts

@@ -15,8 +15,7 @@
  *   ├── scripts-shell-archive/ # Archived shell scripts (for reference)
  *   ├── workflow.md           # Workflow guide
  *   ├── config.yaml            # Trellis configuration
- *   ├── gitignore.txt         # .gitignore content
- *   └── gitattributes.txt     # project-root .gitattributes content
+ *   └── gitignore.txt         # .gitignore content
  */
 export declare const scriptsInit: string;
 export declare const commonInit: string;
@@ -26,7 +25,6 @@ export declare const commonGitContext: string;
 export declare const commonTaskQueue: string;
 export declare const commonTaskUtils: string;
 export declare const commonActiveTask: string;
-export declare const commonCliAdapter: string;
 export declare const commonConfig: string;
 export declare const commonIo: string;
 export declare const commonLog: string;
@@ -51,7 +49,6 @@ export declare const addSessionScript: string;
 export declare const workflowMdTemplate: string;
 export declare const configYamlTemplate: string;
 export declare const gitignoreTemplate: string;
-export declare const gitattributesTemplate: string;
 export declare const implementAgentTemplate: string;
 export declare const checkAgentTemplate: string;
 /**

package/dist/templates/trellis/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/templates/trellis/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAcH,eAAO,MAAM,WAAW,QAAsC,CAAC;AAG/D,eAAO,MAAM,UAAU,QAA6C,CAAC;AACrE,eAAO,MAAM,WAAW,QAA0C,CAAC;AACnE,eAAO,MAAM,eAAe,QAA8C,CAAC;AAC3E,eAAO,MAAM,gBAAgB,QAAgD,CAAC;AAC9E,eAAO,MAAM,eAAe,QAA+C,CAAC;AAC5E,eAAO,MAAM,eAAe,QAA+C,CAAC;AAC5E,eAAO,MAAM,gBAAgB,QAAgD,CAAC;AAC9E,eAAO,MAAM,gBAAgB,QAAgD,CAAC;AAC9E,eAAO,MAAM,YAAY,QAA2C,CAAC;AACrE,eAAO,MAAM,QAAQ,QAAuC,CAAC;AAC7D,eAAO,MAAM,SAAS,QAAwC,CAAC;AAC/D,eAAO,MAAM,SAAS,QAAwC,CAAC;AAC/D,eAAO,MAAM,WAAW,QAA0C,CAAC;AACnE,eAAO,MAAM,WAAW,QAA0C,CAAC;AACnE,eAAO,MAAM,iBAAiB,QAAiD,CAAC;AAChF,eAAO,MAAM,eAAe,QAA+C,CAAC;AAC5E,eAAO,MAAM,oBAAoB,QAEhC,CAAC;AACF,eAAO,MAAM,qBAAqB,QAEjC,CAAC;AACF,eAAO,MAAM,mBAAmB,QAE/B,CAAC;AACF,eAAO,MAAM,uBAAuB,QAEnC,CAAC;AACF,eAAO,MAAM,mBAAmB,QAE/B,CAAC;AACF,eAAO,MAAM,eAAe,QAA+C,CAAC;AAC5E,eAAO,MAAM,gBAAgB,QAAgD,CAAC;AAC9E,eAAO,MAAM,gBAAgB,QAAgD,CAAC;AAG9E,eAAO,MAAM,kBAAkB,QAA2C,CAAC;AAC3E,eAAO,MAAM,mBAAmB,QAA4C,CAAC;AAC7E,eAAO,MAAM,UAAU,QAAkC,CAAC;AAC1D,eAAO,MAAM,gBAAgB,QAAyC,CAAC;AACvE,eAAO,MAAM,gBAAgB,QAAyC,CAAC;AAGvE,eAAO,MAAM,kBAAkB,QAA8B,CAAC;AAC9D,eAAO,MAAM,kBAAkB,QAA8B,CAAC;AAC9D,eAAO,MAAM,iBAAiB,QAAgC,CAAC;AAC/D,eAAO,MAAM,qBAAqB,QAAoC,CAAC;AAMvE,eAAO,MAAM,sBAAsB,QAAsC,CAAC;AAC1E,eAAO,MAAM,kBAAkB,QAAkC,CAAC;AAElE;;GAEG;AACH,wBAAgB,aAAa,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAwCnD;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAKlD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/templates/trellis/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAcH,eAAO,MAAM,WAAW,QAAsC,CAAC;AAG/D,eAAO,MAAM,UAAU,QAA6C,CAAC;AACrE,eAAO,MAAM,WAAW,QAA0C,CAAC;AACnE,eAAO,MAAM,eAAe,QAA8C,CAAC;AAC3E,eAAO,MAAM,gBAAgB,QAAgD,CAAC;AAC9E,eAAO,MAAM,eAAe,QAA+C,CAAC;AAC5E,eAAO,MAAM,eAAe,QAA+C,CAAC;AAC5E,eAAO,MAAM,gBAAgB,QAAgD,CAAC;AAC9E,eAAO,MAAM,YAAY,QAA2C,CAAC;AACrE,eAAO,MAAM,QAAQ,QAAuC,CAAC;AAC7D,eAAO,MAAM,SAAS,QAAwC,CAAC;AAC/D,eAAO,MAAM,SAAS,QAAwC,CAAC;AAC/D,eAAO,MAAM,WAAW,QAA0C,CAAC;AACnE,eAAO,MAAM,WAAW,QAA0C,CAAC;AACnE,eAAO,MAAM,iBAAiB,QAAiD,CAAC;AAChF,eAAO,MAAM,eAAe,QAA+C,CAAC;AAC5E,eAAO,MAAM,oBAAoB,QAEhC,CAAC;AACF,eAAO,MAAM,qBAAqB,QAEjC,CAAC;AACF,eAAO,MAAM,mBAAmB,QAE/B,CAAC;AACF,eAAO,MAAM,uBAAuB,QAEnC,CAAC;AACF,eAAO,MAAM,mBAAmB,QAE/B,CAAC;AACF,eAAO,MAAM,eAAe,QAA+C,CAAC;AAC5E,eAAO,MAAM,gBAAgB,QAAgD,CAAC;AAC9E,eAAO,MAAM,gBAAgB,QAAgD,CAAC;AAG9E,eAAO,MAAM,kBAAkB,QAA2C,CAAC;AAC3E,eAAO,MAAM,mBAAmB,QAA4C,CAAC;AAC7E,eAAO,MAAM,UAAU,QAAkC,CAAC;AAC1D,eAAO,MAAM,gBAAgB,QAAyC,CAAC;AACvE,eAAO,MAAM,gBAAgB,QAAyC,CAAC;AAGvE,eAAO,MAAM,kBAAkB,QAA8B,CAAC;AAC9D,eAAO,MAAM,kBAAkB,QAA8B,CAAC;AAC9D,eAAO,MAAM,iBAAiB,QAAgC,CAAC;AAM/D,eAAO,MAAM,sBAAsB,QAAsC,CAAC;AAC1E,eAAO,MAAM,kBAAkB,QAAkC,CAAC;AAElE;;GAEG;AACH,wBAAgB,aAAa,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAuCnD;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAKlD"}

package/dist/templates/trellis/index.js

@@ -15,8 +15,7 @@
  *   ├── scripts-shell-archive/ # Archived shell scripts (for reference)
  *   ├── workflow.md           # Workflow guide
  *   ├── config.yaml            # Trellis configuration
- *   ├── gitignore.txt         # .gitignore content
- *   └── gitattributes.txt     # project-root .gitattributes content
+ *   └── gitignore.txt         # .gitignore content
  */
 import { readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
@@ -36,7 +35,6 @@ export const commonGitContext = readTemplate("scripts/common/git_context.py");
 export const commonTaskQueue = readTemplate("scripts/common/task_queue.py");
 export const commonTaskUtils = readTemplate("scripts/common/task_utils.py");
 export const commonActiveTask = readTemplate("scripts/common/active_task.py");
-export const commonCliAdapter = readTemplate("scripts/common/cli_adapter.py");
 export const commonConfig = readTemplate("scripts/common/config.py");
 export const commonIo = readTemplate("scripts/common/io.py");
 export const commonLog = readTemplate("scripts/common/log.py");
@@ -63,7 +61,6 @@ export const addSessionScript = readTemplate("scripts/add_session.py");
 export const workflowMdTemplate = readTemplate("workflow.md");
 export const configYamlTemplate = readTemplate("config.yaml");
 export const gitignoreTemplate = readTemplate("gitignore.txt");
-export const gitattributesTemplate = readTemplate("gitattributes.txt");
 // Channel runtime agent definitions (loaded by
 // `packages/cli/src/commands/channel/agent-loader.ts` from `.trellis/agents/`).
 // These are platform-agnostic Trellis runtime files dispatched at `trellis init`
@@ -85,7 +82,6 @@ export function getAllScripts() {
     scripts.set("common/task_queue.py", commonTaskQueue);
     scripts.set("common/task_utils.py", commonTaskUtils);
     scripts.set("common/active_task.py", commonActiveTask);
-    scripts.set("common/cli_adapter.py", commonCliAdapter);
     scripts.set("common/config.py", commonConfig);
     scripts.set("common/io.py", commonIo);
     scripts.set("common/log.py", commonLog);

package/dist/templates/trellis/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/templates/trellis/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/templates/trellis/index.ts"],"names":[],"mappings":"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"}

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

@@ -4,16 +4,16 @@
 Add a new session to journal file and update index.md.
 
 Usage:
-    python3 add_session.py --title "Title" --commit "hash" --summary "Summary" [--package cli]
-    python3 add_session.py --title "Title" --branch "feat/my-branch"
+    python add_session.py --title "Title" --commit "hash" --summary "Summary" [--package cli]
+    python add_session.py --title "Title" --branch "feat/my-branch"
 
     # Pipe detailed content via stdin (use --stdin to opt in):
-    cat << 'EOF' | python3 add_session.py --stdin --title "Title" --summary "Summary"
+    cat << 'EOF' | python add_session.py --stdin --title "Title" --summary "Summary"
     <session content here>
     EOF
 
     # Structured content (repeatable; a section with no bullets is omitted):
-    python3 add_session.py --title "Title" --change "Did X" --test "Ran Y" --next-step "Do Z"
+    python add_session.py --title "Title" --change "Did X" --test "Ran Y" --next-step "Do Z"
 
 Branch resolution order:
     1. --branch CLI arg (explicit)
@@ -202,9 +202,9 @@ def is_git_worktree(repo_root: Path) -> bool:
 
 
 def warn_if_parallel_worktree(repo_root: Path) -> None:
-    """Non-blocking note: index.md conflicts across parallel worktrees/branches
-    are expected and safe. Only fires when running in a linked git worktree
-    (not the main tree) with `session_auto_commit` enabled (#415 quick-fix tier).
+    """Non-blocking note: workspace merge conflicts across parallel
+    worktrees/branches are expected and safe. Only fires when running in a
+    linked git worktree (not the main tree) with `session_auto_commit` enabled.
     """
     if not get_session_auto_commit(repo_root):
         return
@@ -213,10 +213,11 @@ def warn_if_parallel_worktree(repo_root: Path) -> None:
     print(
         colored(
             "[NOTE] Running in a git worktree with session_auto_commit enabled: "
-            "journal-*.md files auto-merge via .gitattributes, but index.md "
-            "conflicts across parallel worktrees/branches are expected and safe "
-            "to resolve by picking either side (task state lives in task.json, "
-            "not index.md). See .trellis/spec/cli/backend/directory-structure.md "
+            "journal-*.md and index.md conflicts across parallel "
+            "worktrees/branches are expected and safe to resolve by keeping "
+            "both sides' session blocks (task state lives in task.json, not in "
+            "the workspace files). See "
+            ".trellis/spec/cli/backend/directory-structure.md "
             '("Workspace Journal Merge Behavior").',
             Colors.YELLOW,
         ),

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

@@ -86,6 +86,8 @@ from .paths import (
 from .active_task import (
     ActiveTask,
     clear_active_task,
+    is_session_engaged,
+    mark_session_engaged,
     resolve_active_task,
     resolve_context_key,
     set_active_task,

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

@@ -24,15 +24,16 @@ DIR_TASKS = "tasks"
 DIR_RUNTIME = ".runtime"
 DIR_SESSIONS = "sessions"
 DIR_SHELL_TICKETS = "shell-tickets"
-# Pre-0.6.13 name, when the bridge was Cursor-only. Still read so a session that
-# was mid-command across an upgrade does not silently degrade; never written.
-# Tickets are 30-second ephemera, so the old directory ages out by itself —
-# there is nothing to migrate, only a glob on a directory that is normally
-# absent. The alternative (ignore it) would land its one lost command on the
-# platform that works today.
-DIR_LEGACY_CURSOR_SHELL_TICKETS = "cursor-shell"
+# Session engagement lives in its own runtime directory, NOT as a field on the
+# session file. `clear_task_from_sessions` (archive) and `clear_active_task`
+# (`task.py finish`) both *delete* the session file, which would silently
+# un-engage a session that is mid-Phase-3 — dropping the per-turn breadcrumb
+# that enforces 3.4 commit. Keeping the flag on a separate path also leaves the
+# `sessions/` file count that `_resolve_single_session_fallback` depends on
+# exactly as it was.
+DIR_ENGAGED = "engaged"
 SHELL_TICKET_TTL_SECONDS = 30
-TASK_SESSION_COMMANDS = {"start", "current", "finish"}
+TASK_SESSION_COMMANDS = {"start", "current", "finish", "engage"}
 
 _SESSION_KEYS = ("session_id", "sessionId", "sessionID")
 _CONVERSATION_KEYS = ("conversation_id", "conversationId", "conversationID")
@@ -41,39 +42,15 @@ _NESTED_KEYS = ("input", "properties", "event", "hook_input", "hookInput")
 _KNOWN_PLATFORMS = {
     "claude",
     "codex",
-    "cursor",
-    "opencode",
-    "gemini",
-    "droid",
-    "qoder",
-    "codebuddy",
-    "kiro",
-    "copilot",
-    "pi",
-    "trae",
-    "grok",
-    "kimi",
-    "zcode",
-    "snow",
-    "dsh",
 }
 
 # Every name below records how it was checked. Do NOT add a name by analogy
-# with a neighbour: a 2026-08-05 audit of the then-current 21 platforms found
-# 12 declared names had never existed anywhere — they were pattern-guessed from
-# `<PLATFORM>_SESSION_ID` shape no vendor agreed to, and the uniformity was the
-# only "evidence" behind them. A platform with no verified name belongs in no
-# table; it resolves through TRELLIS_CONTEXT_ID or its hook/plugin bridge.
+# with a neighbour: a 2026-08-05 audit found several declared names had never
+# existed anywhere — they were pattern-guessed from `<PLATFORM>_SESSION_ID`
+# shape no vendor agreed to, and the uniformity was the only "evidence" behind
+# them. A platform with no verified name belongs in no table; it resolves
+# through TRELLIS_CONTEXT_ID or its hook bridge.
 _ENV_SESSION_KEYS: tuple[tuple[str, tuple[str, ...]], ...] = (
-    # REAL (reported 2026-08-13 against DSH 0.1.0-rc.6 by @SajoLuo, from a live
-    # run: DSH exports DSH_SESSION_ID plus DSH_SHELL=1 into its managed shell).
-    # MUST STAY FIRST. A DSH session can inherit an outer host's identity — a
-    # DSH launched from Codex still carries CODEX_THREAD_ID — and the untargeted
-    # lookup below walks this table in order, so any earlier entry would claim
-    # the session and write a foreign `codex_<thread>` pointer for DSH work.
-    # DSH_SESSION_ID is the only name here no other vendor sets, so first place
-    # is safe: it cannot mis-claim a non-DSH session.
-    ("dsh", ("DSH_SESSION_ID",)),
     # REAL, undocumented (verified 2026-08-05 in a live Claude Code 2.1.221 bash
     # child; absent from code.claude.com/docs/en/env-vars). CLAUDE_SESSION_ID
     # was removed here — verified absent from that same live environment.
@@ -82,80 +59,9 @@ _ENV_SESSION_KEYS: tuple[tuple[str, tuple[str, ...]], ...] = (
     # into shell children, absent from the parent env; openai/codex#19937).
     # CODEX_SESSION_ID was removed — absent from a live `codex exec` env.
     ("codex", ("CODEX_THREAD_ID",)),
-    # REAL but HOOK-SCOPE ONLY (verified 2026-08-05): set by Gemini's
-    # hookRunner.ts. Its shell tool builds the child env in
-    # shellExecutionService.ts and adds only GEMINI_CLI/TERM/PAGER/GIT_PAGER, so
-    # this never reaches a bash child — it resolves only inside a hook process.
-    ("gemini", ("GEMINI_SESSION_ID",)),
-    # REAL but HOOK-SCOPE ONLY (verified 2026-08-05): docs.qoder.com/zh/
-    # extensions/hooks documents it as injected during hook execution by the
-    # Qoder *IDE plugin*. Absent from the Qoder CLI hook docs and from Lingma.
-    ("qoder", ("QODER_SESSION_ID",)),
-    # UNVERIFIED (2026-08-05): absent from kiro.dev/docs/hooks/, but Dynatrace
-    # dtctl, oh-my-agent and gastown all key agent detection on it and one notes
-    # it is "set in both interactive and --no-interactive". Kept because that is
-    # absence of evidence, not evidence of absence. To settle: run
-    # `env | grep KIRO` from a Kiro shell-tool call on a machine with Kiro.
-    ("kiro", ("KIRO_SESSION_ID",)),
-    # UNVERIFIED (2026-08-05): absent from docs.github.com/en/copilot/reference/
-    # hooks-reference and from the CLI programmatic reference. To settle: run
-    # `copilot help environment` (the authoritative list per those docs) — not
-    # runnable here, the CLI is not installed and copilot-cli ships no source.
-    ("copilot", ("COPILOT_SESSION_ID", "COPILOT_SESSIONID")),
-    # REASONED, UNVERIFIED (2026-08-05): ZCode is closed-source and not
-    # installable here. It mirrors Claude's naming elsewhere (CLAUDE_PLUGIN_ROOT
-    # / CLAUDE_PLUGIN_DATA compat aliases are in its docs), and the previously
-    # declared CLAUDE_SESSION_ID does not exist on Claude Code either — so the
-    # name ZCode would actually reuse is CLAUDE_CODE_SESSION_ID. Try that first,
-    # keep the historical name as a fallback: if neither exists nothing changes.
-    # Platform-scoped lookup (_iter_env_keys filters by platform name), so the
-    # entry only fires once the resolver detected "zcode" — no collision with
-    # the claude entry above.
-    ("zcode", ("CLAUDE_CODE_SESSION_ID", "CLAUDE_SESSION_ID")),
-    # REAL by vendor design (verified 2026-08-05): Snow's sessionIdentityEnv.ts
-    # exports SNOW_SESSION_ID into hook/terminal/sub-agent children and names
-    # Trellis in its source header. TRELLIS_CONTEXT_ID stays the preferred
-    # override — Snow sets that too.
-    ("snow", ("SNOW_SESSION_ID",)),
-)
-_ENV_CONVERSATION_KEYS: tuple[tuple[str, tuple[str, ...]], ...] = (
-    # REAL in cursor-agent (CLI), undocumented (verified 2026-08-05: the value
-    # matches ~/.cursor/chats/<ws>/<id>). The Cursor *IDE* is unverified — a
-    # 2026-05 forum request for it drew no staff reply. The invented
-    # CURSOR_SESSION_ID was removed from the session table: empty in a live
-    # cursor-agent shell. Cursor's other path is the shell ticket below
-    # (_lookup_shell_ticket_context_key), which is not Cursor-specific.
-    ("cursor", ("CURSOR_CONVERSATION_ID", "CURSOR_CONVERSATIONID")),
-)
-_ENV_TRANSCRIPT_KEYS: tuple[tuple[str, tuple[str, ...]], ...] = (
-    # REAL but HOOK-SCOPE ONLY (verified 2026-08-05): documented for Cursor hook
-    # scripts; empty in the agent's own shell env.
-    ("cursor", ("CURSOR_TRANSCRIPT_PATH",)),
-    # UNVERIFIED — never researched. The 2026-08-05 audit covered the session
-    # table only, so do not infer these are real *or* fake from that work
-    # (CLAUDE_/CODEX_TRANSCRIPT_PATH were removed because those two *were*
-    # checked: absent from docs and from live envs). To settle each: run
-    # `env | grep _TRANSCRIPT_PATH` inside a hook and inside a shell-tool call.
-    ("gemini", ("GEMINI_TRANSCRIPT_PATH",)),
-    ("droid", ("FACTORY_TRANSCRIPT_PATH", "DROID_TRANSCRIPT_PATH")),
-    ("qoder", ("QODER_TRANSCRIPT_PATH",)),
-    ("codebuddy", ("CODEBUDDY_TRANSCRIPT_PATH",)),
 )
 _ENV_PLATFORM_ALIASES = {
     "claude-code": "claude",
-    "factory": "droid",
-    "factory-ai": "droid",
-    "github-copilot": "copilot",
-}
-# ZCode intentionally reuses Claude's session env var name. Hooks know the host
-# is ZCode, while later shell commands see only the shared env name and resolve
-# it through the claude entry. Canonicalize both paths to one runtime filename.
-_CONTEXT_KEY_PLATFORM_ALIASES = {
-    "zcode": "claude",
-    # Factory Droid's config directory is `.factory/`, so a hook that names its
-    # platform after the directory it was installed in reports "factory". Its
-    # sibling hooks report "droid". One runtime filename either way.
-    "factory": "droid",
 }
 
 
@@ -238,6 +144,10 @@ def _runtime_sessions_dir(repo_root: Path) -> Path:
     return repo_root / DIR_WORKFLOW / DIR_RUNTIME / DIR_SESSIONS
 
 
+def _runtime_engaged_dir(repo_root: Path) -> Path:
+    return repo_root / DIR_WORKFLOW / DIR_RUNTIME / DIR_ENGAGED
+
+
 def _sanitize_key(raw: str) -> str:
     safe = re.sub(r"[^A-Za-z0-9._-]+", "_", raw.strip())
     safe = safe.strip("._-")
@@ -284,13 +194,10 @@ def _detect_platform(platform_input: dict[str, Any] | None, platform: str | None
             value = _string_value(platform_input.get(key))
             if value:
                 return _sanitize_key(value) or "session"
-        if _string_value(platform_input.get("cursor_version")):
-            return "cursor"
     return "session"
 
 
 def _context_key(platform_name: str, kind: str, value: str) -> str:
-    platform_name = _CONTEXT_KEY_PLATFORM_ALIASES.get(platform_name, platform_name)
     if kind == "transcript":
         return f"{platform_name}_transcript_{_hash_value(value)}"
     safe_value = _sanitize_key(value)
@@ -337,18 +244,6 @@ def _lookup_env_context_key(platform_name: str | None) -> str | None:
             if value:
                 return _context_key(name, "session", value)
 
-    for name, keys in _iter_env_keys(_ENV_CONVERSATION_KEYS, env_platform_name):
-        for key in keys:
-            value = _string_value(os.environ.get(key))
-            if value:
-                return _context_key(name, "conversation", value)
-
-    for name, keys in _iter_env_keys(_ENV_TRANSCRIPT_KEYS, env_platform_name):
-        for key in keys:
-            value = _string_value(os.environ.get(key))
-            if value:
-                return _context_key(name, "transcript", value)
-
     return None
 
 
@@ -364,10 +259,7 @@ def _find_repo_root_from_cwd() -> Path | None:
 
 def _shell_ticket_dirs(repo_root: Path) -> tuple[Path, ...]:
     runtime_dir = repo_root / DIR_WORKFLOW / DIR_RUNTIME
-    return (
-        runtime_dir / DIR_SHELL_TICKETS,
-        runtime_dir / DIR_LEGACY_CURSOR_SHELL_TICKETS,
-    )
+    return (runtime_dir / DIR_SHELL_TICKETS,)
 
 
 def _remove_file(path: Path) -> bool:
@@ -451,7 +343,8 @@ def _matching_ticket_context_key(
     """Accept a ticket on its merits, never on which platform wrote it.
 
     The `platform` field a ticket carries is debugging metadata; gating on it
-    was what kept this bridge invisible to every platform but Cursor.
+    would make this bridge invisible to every platform but the one that wrote
+    the ticket.
     """
     ticket = _read_json(ticket_path)
     if ticket is None:
@@ -507,28 +400,6 @@ def resolve_context_key(
     scripts and subprocesses. It does not store the task itself.
     """
     if allow_environment_context:
-        # The optional dsh-trellis plugin contributes this managed DSH_* value
-        # per shell execution from the current DSH session header. DSH scrubs
-        # ambient DSH_* values before rebuilding that namespace, so this value
-        # cannot be inherited from an outer Claude/Codex Trellis session. It
-        # must outrank the generic override below, which ordinary child
-        # processes inherit indiscriminately.
-        dsh_override = _string_value(os.environ.get("DSH_TRELLIS_CONTEXT_ID"))
-        if dsh_override:
-            return _sanitize_key(dsh_override) or _hash_value(dsh_override)
-
-        # A real DSH managed shell rebuilds the complete DSH_* namespace: the
-        # paired sentinel and session id cannot be inherited from an outer
-        # Trellis host. Prefer that canonical env-table identity over
-        # a generic override that ordinary process inheritance may carry in.
-        if (
-            _string_value(os.environ.get("DSH_SHELL")) == "1"
-            and _string_value(os.environ.get("DSH_SESSION_ID"))
-        ):
-            dsh_context_key = _lookup_env_context_key("dsh")
-            if dsh_context_key:
-                return dsh_context_key
-
         override = _string_value(os.environ.get("TRELLIS_CONTEXT_ID"))
         if override:
             return _sanitize_key(override) or _hash_value(override)
@@ -615,6 +486,10 @@ def _context_path(repo_root: Path, context_key: str) -> Path:
     return _runtime_sessions_dir(repo_root) / f"{context_key}.json"
 
 
+def _engaged_path(repo_root: Path, context_key: str) -> Path:
+    return _runtime_engaged_dir(repo_root) / f"{context_key}.json"
+
+
 def resolve_active_task(
     repo_root: Path,
     platform_input: dict[str, Any] | None = None,
@@ -628,8 +503,8 @@ def resolve_active_task(
     A stale session task is returned as stale. Missing context identity or a
     missing/empty session context falls back to single-session inference: if
     exactly one session file exists in the runtime, return its task with
-    source_type="session-fallback" — covers pull-based platform sub-agents
-    (copilot, gemini, qoder) that don't inherit the parent's session id. ≥2
+    source_type="session-fallback" — covers pull-based sub-agents that don't
+    inherit the parent's session id. ≥2
     files or 0 files yield ActiveTask(None) — refuses to guess across windows.
     """
     context_key = resolve_context_key(
@@ -703,6 +578,59 @@ def _context_metadata(
     return metadata
 
 
+def mark_session_engaged(
+    repo_root: Path,
+    platform_input: dict[str, Any] | None = None,
+    platform: str | None = None,
+) -> str | None:
+    """Opt this session into the Trellis workflow.
+
+    Context injection is opt-in: `session-start.py` and `inject-workflow-state.py`
+    emit nothing until a session is engaged. The user engages by invoking one of
+    the three lifecycle entry points (`trellis-start` / `trellis-continue` /
+    `trellis-finish-work`), each of which runs `task.py engage` as its first
+    step.
+
+    Returns the context key on success, or None when no session identity is
+    available. Callers must surface that as an error — reporting success without
+    a written flag would leave the hooks permanently silent and the user with no
+    way to tell why.
+    """
+    context_key = resolve_context_key(platform_input, platform)
+    if not context_key:
+        return None
+
+    engaged_path = _engaged_path(repo_root, context_key)
+    record = _read_json(engaged_path) or {}
+    record.update(_context_metadata(platform_input, platform, context_key))
+    record["engaged"] = True
+    # Re-running an entry point in the same session must not reset when the
+    # session first opted in; `last_seen_at` above already carries recency.
+    record.setdefault("engaged_at", _utc_now())
+    if not _write_json(engaged_path, record):
+        return None
+    return context_key
+
+
+def is_session_engaged(
+    repo_root: Path,
+    platform_input: dict[str, Any] | None = None,
+    platform: str | None = None,
+) -> bool:
+    """Report whether THIS session opted into the Trellis workflow.
+
+    Deliberately has no single-session fallback, unlike `resolve_active_task`:
+    inheriting engagement from a file another window left behind is exactly the
+    failure the opt-in model exists to prevent. A new session that never ran an
+    entry point must stay silent even while a task is mid-flight.
+    """
+    context_key = resolve_context_key(platform_input, platform)
+    if not context_key:
+        return False
+    record = _read_json(_engaged_path(repo_root, context_key)) or {}
+    return record.get("engaged") is True
+
+
 def set_active_task(
     task_path: str,
     repo_root: Path,

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

@@ -167,7 +167,7 @@ def _next_content_line(lines: list[str], start: int) -> tuple[int, str]:
 # Defaults
 DEFAULT_SESSION_COMMIT_MESSAGE = "chore: record journal"
 DEFAULT_MAX_JOURNAL_LINES = 2000
-DEFAULT_SESSION_AUTO_COMMIT = True
+DEFAULT_SESSION_AUTO_COMMIT = False
 DEFAULT_CODEX_DISPATCH_MODE = "auto"
 
 CONFIG_FILE = "config.yaml"
@@ -220,14 +220,14 @@ def get_session_auto_commit(repo_root: Path | None = None) -> bool:
     Governs both ``add_session.py:_auto_commit_workspace`` and
     ``task_store.py:_auto_commit_archive``.
 
-    Default: ``True`` (existing behavior — auto-stage + auto-commit).
-    Set ``session_auto_commit: false`` in ``.trellis/config.yaml`` to skip
-    auto-staging entirely; the journal/archive files are still written to
-    disk, but the user manages ``git add`` / ``git commit`` themselves.
+    Default: ``False`` — the journal / archive files are written to disk and
+    git is left untouched; the user manages ``git add`` / ``git commit``.
+    Set ``session_auto_commit: true`` in ``.trellis/config.yaml`` to let the
+    scripts auto-stage and auto-commit those changes.
 
     Accepts native YAML booleans (``true`` / ``false``) and the string
     aliases ``true / false / yes / no / 1 / 0 / on / off`` (case-insensitive).
-    Invalid values fall back to ``True`` with a stderr warning.
+    Invalid values fall back to ``False`` with a stderr warning.
     """
     config = _load_config(repo_root)
     raw = config.get("session_auto_commit", DEFAULT_SESSION_AUTO_COMMIT)
@@ -239,7 +239,7 @@ def get_session_auto_commit(repo_root: Path | None = None) -> bool:
     if s in ("false", "no", "0", "off"):
         return False
     print(
-        f"[WARN] invalid session_auto_commit value: {raw!r}; using true (default)",
+        f"[WARN] invalid session_auto_commit value: {raw!r}; using false (default)",
         file=sys.stderr,
     )
     return DEFAULT_SESSION_AUTO_COMMIT

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

@@ -69,7 +69,7 @@ def main() -> None:
     )
     parser.add_argument(
         "--platform",
-        help="Platform name for --mode phase, e.g. cursor, claude-code. Filters platform-tagged blocks.",
+        help="Platform name for --mode phase, e.g. claude, codex. Filters platform-tagged blocks.",
     )
     parser.add_argument(
         "--file",

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

@@ -599,7 +599,7 @@ def get_context_text(repo_root: Path | None = None) -> str:
     lines.append("## DEVELOPER")
     if not developer:
         lines.append(
-            f"ERROR: Not initialized. Run: python3 ./{DIR_WORKFLOW}/{DIR_SCRIPTS}/init_developer.py <name>"
+            f"ERROR: Not initialized. Run: python ./{DIR_WORKFLOW}/{DIR_SCRIPTS}/init_developer.py <name>"
         )
         return "\n".join(lines)
 
@@ -818,7 +818,7 @@ def get_context_text_record(repo_root: Path | None = None) -> str:
     developer = get_developer(repo_root)
     if not developer:
         lines.append(
-            f"ERROR: Not initialized. Run: python3 ./{DIR_WORKFLOW}/{DIR_SCRIPTS}/init_developer.py <name>"
+            f"ERROR: Not initialized. Run: python ./{DIR_WORKFLOW}/{DIR_SCRIPTS}/init_developer.py <name>"
         )
         return "\n".join(lines)
 

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

@@ -295,7 +295,7 @@ def assemble_payload(
     _all_index_lines = [_index_line(m) for m in matches]
     _summary_upper = (
         f"- (+{len(matches)} more governing specs over budget — run "
-        f"python3 ./.trellis/scripts/get_context.py --mode spec "
+        f"python ./.trellis/scripts/get_context.py --mode spec "
         f"--file {edited_rel} to list them)"
     )
     _summary_reserve = len("\n\n" + _index_block([_summary_upper]))
@@ -409,7 +409,7 @@ def assemble_payload(
                 noun = "spec" if dropped == 1 else "specs"
                 summary = (
                     f"- (+{dropped} more governing {noun} over budget — run "
-                    f"python3 ./.trellis/scripts/get_context.py --mode spec "
+                    f"python ./.trellis/scripts/get_context.py --mode spec "
                     f"--file {edited_rel} to list them)"
                 )
                 if fits(_index_block([*chosen, summary])):