@jahanxu/trellis 0.5.9 → 0.6.1

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

@@ -10,18 +10,8 @@ Provides:
 
 from __future__ import annotations
 
-import sys
-
-# IMPORTANT: Force stdout to use UTF-8 on Windows
-# This fixes UnicodeEncodeError when outputting non-ASCII characters
-if sys.platform == "win32":
-    import io as _io
-    if hasattr(sys.stdout, "reconfigure"):
-        sys.stdout.reconfigure(encoding="utf-8", errors="replace")  # type: ignore[union-attr]
-    elif hasattr(sys.stdout, "detach"):
-        sys.stdout = _io.TextIOWrapper(sys.stdout.detach(), encoding="utf-8", errors="replace")  # type: ignore[union-attr]
-
 import json
+import sys
 import subprocess
 from pathlib import Path
 
@@ -345,6 +335,117 @@ def get_context_text(repo_root: Path | None = None) -> str:
     return "\n".join(lines)
 
 
+def get_context_text_record(repo_root: Path | None = None) -> str:
+    """Get context as formatted text for record-session mode.
+
+    Focused output: MY ACTIVE TASKS first (with [!!!] emphasis),
+    then GIT STATUS, RECENT COMMITS, CURRENT TASK.
+
+    Args:
+        repo_root: Repository root path. Defaults to auto-detected.
+
+    Returns:
+        Formatted text output for record-session.
+    """
+    if repo_root is None:
+        repo_root = get_repo_root()
+
+    lines: list[str] = []
+    lines.append("========================================")
+    lines.append("SESSION CONTEXT (RECORD MODE)")
+    lines.append("========================================")
+    lines.append("")
+
+    developer = get_developer(repo_root)
+    if not developer:
+        lines.append(
+            f"ERROR: Not initialized. Run: python3 ./{DIR_WORKFLOW}/{DIR_SCRIPTS}/init_developer.py <name>"
+        )
+        return "\n".join(lines)
+
+    # MY ACTIVE TASKS — first and prominent
+    lines.append(f"## [!!!] MY ACTIVE TASKS (Assigned to {developer})")
+    lines.append("[!] Review whether any should be archived before recording this session.")
+    lines.append("")
+
+    tasks_dir = get_tasks_dir(repo_root)
+    my_task_count = 0
+
+    if tasks_dir.is_dir():
+        for d in sorted(tasks_dir.iterdir()):
+            if d.is_dir() and d.name != "archive":
+                t_json = d / FILE_TASK_JSON
+                if t_json.is_file():
+                    data = _read_json_file(t_json)
+                    if data:
+                        assignee = data.get("assignee", "")
+                        status = data.get("status", "planning")
+
+                        if assignee == developer:
+                            title = data.get("title") or data.get("name") or "unknown"
+                            priority = data.get("priority", "P2")
+                            lines.append(f"- [{priority}] {title} ({status}) — {d.name}")
+                            my_task_count += 1
+
+    if my_task_count == 0:
+        lines.append("(no active tasks assigned to you)")
+    lines.append("")
+
+    # GIT STATUS
+    lines.append("## GIT STATUS")
+    _, branch_out, _ = _run_git_command(["branch", "--show-current"], cwd=repo_root)
+    branch = branch_out.strip() or "unknown"
+    lines.append(f"Branch: {branch}")
+
+    _, status_out, _ = _run_git_command(["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_command(["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_command(["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("")
+
+    # CURRENT TASK
+    lines.append("## CURRENT TASK")
+    current_task = get_current_task(repo_root)
+    if current_task:
+        current_task_dir = repo_root / current_task
+        task_json_path = current_task_dir / FILE_TASK_JSON
+        lines.append(f"Path: {current_task}")
+
+        if task_json_path.is_file():
+            data = _read_json_file(task_json_path)
+            if data:
+                t_name = data.get("name") or data.get("id") or "unknown"
+                t_status = data.get("status", "unknown")
+                lines.append(f"Name: {t_name}")
+                lines.append(f"Status: {t_status}")
+    else:
+        lines.append("(none)")
+    lines.append("")
+
+    lines.append("========================================")
+
+    return "\n".join(lines)
+
+
 def output_text(repo_root: Path | None = None) -> None:
     """Output context in text format.
 
@@ -370,11 +471,20 @@ def main() -> None:
         action="store_true",
         help="Output context in JSON format",
     )
+    parser.add_argument(
+        "--mode",
+        "-m",
+        choices=["default", "record"],
+        default="default",
+        help="Output mode: default (full context) or record (for record-session)",
+    )
 
     args = parser.parse_args()
 
     if args.json:
         output_json()
+    elif args.mode == "record":
+        print(get_context_text_record())
     else:
         output_text()
 

package/dist/templates/trellis/scripts/multi_agent/plan.py

@@ -77,7 +77,7 @@ def main() -> int:
     parser.add_argument("--requirement", "-r", required=True, help="Requirement description")
     parser.add_argument(
         "--platform", "-p",
-        choices=["claude", "cursor", "iflow", "opencode"],
+        choices=["claude", "cursor", "iflow", "opencode", "qoder"],
         default=DEFAULT_PLATFORM,
         help="Platform to use (default: claude)"
     )
@@ -173,6 +173,9 @@ def main() -> int:
     env["http_proxy"] = http_proxy
     env["all_proxy"] = all_proxy
 
+    # Clear nested-session detection so the new CLI process can start
+    env.pop("CLAUDECODE", None)
+
     # Set non-interactive env var based on platform
     env.update(adapter.get_non_interactive_env())
 

package/dist/templates/trellis/scripts/multi_agent/start.py

@@ -124,7 +124,7 @@ def main() -> int:
     parser.add_argument("task_dir", help="Task directory path")
     parser.add_argument(
         "--platform", "-p",
-        choices=["claude", "cursor", "iflow", "opencode"],
+        choices=["claude", "cursor", "iflow", "opencode", "qoder"],
         default=DEFAULT_PLATFORM,
         help="Platform to use (default: claude)"
     )
@@ -362,6 +362,10 @@ def main() -> int:
     env["http_proxy"] = http_proxy
     env["all_proxy"] = all_proxy
 
+    # Clear nested-session detection so the new CLI process can start
+    # (when this script runs inside a Claude Code session, CLAUDECODE=1 is inherited)
+    env.pop("CLAUDECODE", None)
+
     # Set non-interactive env var based on platform
     env.update(adapter.get_non_interactive_env())
 

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

@@ -659,6 +659,10 @@ def cmd_archive(args: argparse.Namespace) -> int:
         year_month = archive_dest.parent.name
         print(colored(f"Archived: {dir_name} -> archive/{year_month}/", Colors.GREEN), file=sys.stderr)
 
+        # Auto-commit unless --no-commit
+        if not getattr(args, "no_commit", False):
+            _auto_commit_archive(dir_name, repo_root)
+
         # Return the archive path
         print(f"{DIR_WORKFLOW}/{DIR_TASKS}/{DIR_ARCHIVE}/{year_month}/{dir_name}")
         return 0
@@ -666,6 +670,27 @@ def cmd_archive(args: argparse.Namespace) -> int:
     return 1
 
 
+def _auto_commit_archive(task_name: str, repo_root: Path) -> None:
+    """Stage .trellis/tasks/ changes and commit after archive."""
+    tasks_rel = f"{DIR_WORKFLOW}/{DIR_TASKS}"
+    _run_git_command(["add", "-A", tasks_rel], cwd=repo_root)
+
+    # Check if there are staged changes
+    rc, _, _ = _run_git_command(
+        ["diff", "--cached", "--quiet", "--", tasks_rel], cwd=repo_root
+    )
+    if rc == 0:
+        print("[OK] No task changes to commit.", file=sys.stderr)
+        return
+
+    commit_msg = f"chore(task): archive {task_name}"
+    rc, _, err = _run_git_command(["commit", "-m", commit_msg], cwd=repo_root)
+    if rc == 0:
+        print(f"[OK] Auto-committed: {commit_msg}", file=sys.stderr)
+    else:
+        print(f"[WARN] Auto-commit failed: {err.strip()}", file=sys.stderr)
+
+
 # =============================================================================
 # Command: list
 # =============================================================================
@@ -1005,6 +1030,7 @@ def main() -> int:
     # archive
     p_archive = subparsers.add_parser("archive", help="Archive task")
     p_archive.add_argument("name", help="Task name")
+    p_archive.add_argument("--no-commit", action="store_true", help="Skip auto git commit after archive")
 
     # list
     p_list = subparsers.add_parser("list", help="List tasks")

package/dist/types/ai-tools.d.ts

@@ -6,16 +6,16 @@
 /**
  * Supported AI coding tools
  */
-export type AITool = "claude-code" | "cursor" | "opencode" | "iflow" | "codex" | "kilo" | "kiro" | "gemini" | "antigravity";
+export type AITool = "claude-code" | "cursor" | "opencode" | "iflow" | "codex" | "kilo" | "kiro" | "gemini" | "antigravity" | "qoder";
 /**
  * Template directory categories
  */
-export type TemplateDir = "common" | "claude" | "cursor" | "opencode" | "iflow" | "codex" | "kilo" | "kiro" | "gemini" | "antigravity";
+export type TemplateDir = "common" | "claude" | "cursor" | "opencode" | "iflow" | "codex" | "kilo" | "kiro" | "gemini" | "antigravity" | "qoder";
 /**
  * CLI flag names for platform selection (e.g., --claude, --cursor, --kilo, --kiro, --gemini, --antigravity)
  * Must match keys in InitOptions (src/commands/init.ts)
  */
-export type CliFlag = "claude" | "cursor" | "opencode" | "iflow" | "codex" | "kilo" | "kiro" | "gemini" | "antigravity";
+export type CliFlag = "claude" | "cursor" | "opencode" | "iflow" | "codex" | "kilo" | "kiro" | "gemini" | "antigravity" | "qoder";
 /**
  * Configuration for an AI tool
  */

package/dist/types/ai-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ai-tools.d.ts","sourceRoot":"","sources":["../../src/types/ai-tools.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AACH,MAAM,MAAM,MAAM,GACd,aAAa,GACb,QAAQ,GACR,UAAU,GACV,OAAO,GACP,OAAO,GACP,MAAM,GACN,MAAM,GACN,QAAQ,GACR,aAAa,CAAC;AAElB;;GAEG;AACH,MAAM,MAAM,WAAW,GACnB,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,UAAU,GACV,OAAO,GACP,OAAO,GACP,MAAM,GACN,MAAM,GACN,QAAQ,GACR,aAAa,CAAC;AAElB;;;GAGG;AACH,MAAM,MAAM,OAAO,GACf,QAAQ,GACR,QAAQ,GACR,UAAU,GACV,OAAO,GACP,OAAO,GACP,MAAM,GACN,MAAM,GACN,QAAQ,GACR,aAAa,CAAC;AAElB;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,+BAA+B;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,kDAAkD;IAClD,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,kEAAkE;IAClE,SAAS,EAAE,MAAM,CAAC;IAClB,qEAAqE;IACrE,OAAO,EAAE,OAAO,CAAC;IACjB,yEAAyE;IACzE,cAAc,EAAE,OAAO,CAAC;IACxB,+EAA+E;IAC/E,cAAc,EAAE,OAAO,CAAC;CACzB;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAyEjD,CAAC;AAEF;;GAEG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAExD;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,EAAE,CAE3D"}
+{"version":3,"file":"ai-tools.d.ts","sourceRoot":"","sources":["../../src/types/ai-tools.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AACH,MAAM,MAAM,MAAM,GACd,aAAa,GACb,QAAQ,GACR,UAAU,GACV,OAAO,GACP,OAAO,GACP,MAAM,GACN,MAAM,GACN,QAAQ,GACR,aAAa,GACb,OAAO,CAAC;AAEZ;;GAEG;AACH,MAAM,MAAM,WAAW,GACnB,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,UAAU,GACV,OAAO,GACP,OAAO,GACP,MAAM,GACN,MAAM,GACN,QAAQ,GACR,aAAa,GACb,OAAO,CAAC;AAEZ;;;GAGG;AACH,MAAM,MAAM,OAAO,GACf,QAAQ,GACR,QAAQ,GACR,UAAU,GACV,OAAO,GACP,OAAO,GACP,MAAM,GACN,MAAM,GACN,QAAQ,GACR,aAAa,GACb,OAAO,CAAC;AAEZ;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,+BAA+B;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,kDAAkD;IAClD,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,kEAAkE;IAClE,SAAS,EAAE,MAAM,CAAC;IAClB,qEAAqE;IACrE,OAAO,EAAE,OAAO,CAAC;IACjB,yEAAyE;IACzE,cAAc,EAAE,OAAO,CAAC;IACxB,+EAA+E;IAC/E,cAAc,EAAE,OAAO,CAAC;CACzB;AAED;;;;;;;;;;GAUG;AACH,eAAO,MAAM,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAiFjD,CAAC;AAEF;;GAEG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAExD;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,EAAE,CAE3D"}

package/dist/types/ai-tools.js

@@ -87,6 +87,14 @@ export const AI_TOOLS = {
         defaultChecked: false,
         hasPythonHooks: false,
     },
+    qoder: {
+        name: "Qoder",
+        templateDirs: ["common", "qoder"],
+        configDir: ".qoder",
+        cliFlag: "qoder",
+        defaultChecked: false,
+        hasPythonHooks: false,
+    },
 };
 /**
  * Get the configuration for a specific AI tool

package/dist/types/ai-tools.js.map

@@ -1 +1 @@
-{"version":3,"file":"ai-tools.js","sourceRoot":"","sources":["../../src/types/ai-tools.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAgEH;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAiC;IACpD,aAAa,EAAE;QACb,IAAI,EAAE,aAAa;QACnB,YAAY,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;QAClC,SAAS,EAAE,SAAS;QACpB,OAAO,EAAE,QAAQ;QACjB,cAAc,EAAE,IAAI;QACpB,cAAc,EAAE,IAAI;KACrB;IACD,MAAM,EAAE;QACN,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;QAClC,SAAS,EAAE,SAAS;QACpB,OAAO,EAAE,QAAQ;QACjB,cAAc,EAAE,IAAI;QACpB,cAAc,EAAE,KAAK;KACtB;IACD,QAAQ,EAAE;QACR,IAAI,EAAE,UAAU;QAChB,YAAY,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC;QACpC,SAAS,EAAE,WAAW;QACtB,OAAO,EAAE,UAAU;QACnB,cAAc,EAAE,KAAK;QACrB,cAAc,EAAE,KAAK;KACtB;IACD,KAAK,EAAE;QACL,IAAI,EAAE,WAAW;QACjB,YAAY,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC;QACjC,SAAS,EAAE,QAAQ;QACnB,OAAO,EAAE,OAAO;QAChB,cAAc,EAAE,KAAK;QACrB,cAAc,EAAE,IAAI;KACrB;IACD,KAAK,EAAE;QACL,IAAI,EAAE,OAAO;QACb,YAAY,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC;QACjC,SAAS,EAAE,gBAAgB;QAC3B,OAAO,EAAE,OAAO;QAChB,cAAc,EAAE,KAAK;QACrB,cAAc,EAAE,KAAK;KACtB;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,UAAU;QAChB,YAAY,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC;QAChC,SAAS,EAAE,WAAW;QACtB,OAAO,EAAE,MAAM;QACf,cAAc,EAAE,KAAK;QACrB,cAAc,EAAE,KAAK;KACtB;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,WAAW;QACjB,YAAY,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC;QAChC,SAAS,EAAE,cAAc;QACzB,OAAO,EAAE,MAAM;QACf,cAAc,EAAE,KAAK;QACrB,cAAc,EAAE,KAAK;KACtB;IACD,MAAM,EAAE;QACN,IAAI,EAAE,YAAY;QAClB,YAAY,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;QAClC,SAAS,EAAE,SAAS;QACpB,OAAO,EAAE,QAAQ;QACjB,cAAc,EAAE,KAAK;QACrB,cAAc,EAAE,KAAK;KACtB;IACD,WAAW,EAAE;QACX,IAAI,EAAE,aAAa;QACnB,YAAY,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC;QACvC,SAAS,EAAE,kBAAkB;QAC7B,OAAO,EAAE,aAAa;QACtB,cAAc,EAAE,KAAK;QACrB,cAAc,EAAE,KAAK;KACtB;CACF,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;AACxB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC;AACrC,CAAC"}
+{"version":3,"file":"ai-tools.js","sourceRoot":"","sources":["../../src/types/ai-tools.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAmEH;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAiC;IACpD,aAAa,EAAE;QACb,IAAI,EAAE,aAAa;QACnB,YAAY,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;QAClC,SAAS,EAAE,SAAS;QACpB,OAAO,EAAE,QAAQ;QACjB,cAAc,EAAE,IAAI;QACpB,cAAc,EAAE,IAAI;KACrB;IACD,MAAM,EAAE;QACN,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;QAClC,SAAS,EAAE,SAAS;QACpB,OAAO,EAAE,QAAQ;QACjB,cAAc,EAAE,IAAI;QACpB,cAAc,EAAE,KAAK;KACtB;IACD,QAAQ,EAAE;QACR,IAAI,EAAE,UAAU;QAChB,YAAY,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC;QACpC,SAAS,EAAE,WAAW;QACtB,OAAO,EAAE,UAAU;QACnB,cAAc,EAAE,KAAK;QACrB,cAAc,EAAE,KAAK;KACtB;IACD,KAAK,EAAE;QACL,IAAI,EAAE,WAAW;QACjB,YAAY,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC;QACjC,SAAS,EAAE,QAAQ;QACnB,OAAO,EAAE,OAAO;QAChB,cAAc,EAAE,KAAK;QACrB,cAAc,EAAE,IAAI;KACrB;IACD,KAAK,EAAE;QACL,IAAI,EAAE,OAAO;QACb,YAAY,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC;QACjC,SAAS,EAAE,gBAAgB;QAC3B,OAAO,EAAE,OAAO;QAChB,cAAc,EAAE,KAAK;QACrB,cAAc,EAAE,KAAK;KACtB;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,UAAU;QAChB,YAAY,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC;QAChC,SAAS,EAAE,WAAW;QACtB,OAAO,EAAE,MAAM;QACf,cAAc,EAAE,KAAK;QACrB,cAAc,EAAE,KAAK;KACtB;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,WAAW;QACjB,YAAY,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC;QAChC,SAAS,EAAE,cAAc;QACzB,OAAO,EAAE,MAAM;QACf,cAAc,EAAE,KAAK;QACrB,cAAc,EAAE,KAAK;KACtB;IACD,MAAM,EAAE;QACN,IAAI,EAAE,YAAY;QAClB,YAAY,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;QAClC,SAAS,EAAE,SAAS;QACpB,OAAO,EAAE,QAAQ;QACjB,cAAc,EAAE,KAAK;QACrB,cAAc,EAAE,KAAK;KACtB;IACD,WAAW,EAAE;QACX,IAAI,EAAE,aAAa;QACnB,YAAY,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC;QACvC,SAAS,EAAE,kBAAkB;QAC7B,OAAO,EAAE,aAAa;QACtB,cAAc,EAAE,KAAK;QACrB,cAAc,EAAE,KAAK;KACtB;IACD,KAAK,EAAE;QACL,IAAI,EAAE,OAAO;QACb,YAAY,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC;QACjC,SAAS,EAAE,QAAQ;QACnB,OAAO,EAAE,OAAO;QAChB,cAAc,EAAE,KAAK;QACrB,cAAc,EAAE,KAAK;KACtB;CACF,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;AACxB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC;AACrC,CAAC"}

package/dist/utils/proxy.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Proxy detection and configuration for network requests.
+ *
+ * Detects HTTP_PROXY / HTTPS_PROXY / ALL_PROXY environment variables
+ * and configures undici's global dispatcher so that all fetch() calls
+ * (including those made internally by giget) go through the proxy.
+ */
+/**
+ * Mask credentials in a proxy URL for safe logging.
+ *
+ * Replaces username and password with "***" so that credentials
+ * are never printed to the console or written to log files.
+ */
+export declare function maskProxyUrl(url: string): string;
+/**
+ * Set up a global proxy dispatcher if proxy environment variables are present.
+ *
+ * Uses undici's ProxyAgent and setGlobalDispatcher so that all fetch() calls
+ * go through the proxy. The try/catch handles malformed proxy URLs (e.g.
+ * socks5://, missing protocol) that would cause `new ProxyAgent()` to throw.
+ *
+ * @returns The proxy URL string if a proxy was configured, or null otherwise.
+ */
+export declare function setupProxy(): string | null;
+//# sourceMappingURL=proxy.d.ts.map

package/dist/utils/proxy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/utils/proxy.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAWhD;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,IAAI,MAAM,GAAG,IAAI,CAyB1C"}

package/dist/utils/proxy.js

@@ -0,0 +1,60 @@
+/**
+ * Proxy detection and configuration for network requests.
+ *
+ * Detects HTTP_PROXY / HTTPS_PROXY / ALL_PROXY environment variables
+ * and configures undici's global dispatcher so that all fetch() calls
+ * (including those made internally by giget) go through the proxy.
+ */
+import { ProxyAgent, setGlobalDispatcher } from "undici";
+/**
+ * Mask credentials in a proxy URL for safe logging.
+ *
+ * Replaces username and password with "***" so that credentials
+ * are never printed to the console or written to log files.
+ */
+export function maskProxyUrl(url) {
+    try {
+        const parsed = new URL(url);
+        if (parsed.username || parsed.password) {
+            parsed.username = "***";
+            parsed.password = "***";
+        }
+        return parsed.toString();
+    }
+    catch {
+        return "***";
+    }
+}
+/**
+ * Set up a global proxy dispatcher if proxy environment variables are present.
+ *
+ * Uses undici's ProxyAgent and setGlobalDispatcher so that all fetch() calls
+ * go through the proxy. The try/catch handles malformed proxy URLs (e.g.
+ * socks5://, missing protocol) that would cause `new ProxyAgent()` to throw.
+ *
+ * @returns The proxy URL string if a proxy was configured, or null otherwise.
+ */
+export function setupProxy() {
+    const candidates = [
+        process.env.HTTPS_PROXY,
+        process.env.https_proxy,
+        process.env.HTTP_PROXY,
+        process.env.http_proxy,
+        process.env.ALL_PROXY,
+        process.env.all_proxy,
+    ];
+    const proxyUrl = candidates.find((v) => v != null && v !== "");
+    if (!proxyUrl) {
+        return null;
+    }
+    try {
+        const agent = new ProxyAgent(proxyUrl);
+        setGlobalDispatcher(agent);
+        return proxyUrl;
+    }
+    catch {
+        console.warn("Warning: Could not configure proxy. The proxy URL may be malformed.");
+        return null;
+    }
+}
+//# sourceMappingURL=proxy.js.map

package/dist/utils/proxy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../src/utils/proxy.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAEzD;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,GAAW;IACtC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACvC,MAAM,CAAC,QAAQ,GAAG,KAAK,CAAC;YACxB,MAAM,CAAC,QAAQ,GAAG,KAAK,CAAC;QAC1B,CAAC;QACD,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC;IAC3B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,UAAU;IACxB,MAAM,UAAU,GAAG;QACjB,OAAO,CAAC,GAAG,CAAC,WAAW;QACvB,OAAO,CAAC,GAAG,CAAC,WAAW;QACvB,OAAO,CAAC,GAAG,CAAC,UAAU;QACtB,OAAO,CAAC,GAAG,CAAC,UAAU;QACtB,OAAO,CAAC,GAAG,CAAC,SAAS;QACrB,OAAO,CAAC,GAAG,CAAC,SAAS;KACtB,CAAC;IACF,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;IAE/D,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC;QACvC,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAC3B,OAAO,QAAQ,CAAC;IAClB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,IAAI,CACV,qEAAqE,CACtE,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}

package/dist/utils/template-fetcher.d.ts

@@ -4,6 +4,14 @@
  * Fetches spec templates from the official docs repository:
  * https://github.com/mindfold-ai/docs/tree/main/marketplace
  */
+export declare const TEMPLATE_INDEX_URL = "https://raw.githubusercontent.com/mindfold-ai/docs/main/marketplace/index.json";
+/** Timeout constants for network operations */
+export declare const TIMEOUTS: {
+    /** Timeout for fetching the template index (ms) */
+    readonly INDEX_FETCH_MS: 5000;
+    /** Timeout for downloading a template via giget (ms) */
+    readonly DOWNLOAD_MS: 30000;
+};
 export interface SpecTemplate {
     id: string;
     type: string;
@@ -15,7 +23,7 @@ export interface SpecTemplate {
 export type TemplateStrategy = "skip" | "overwrite" | "append";
 /**
  * Fetch available templates from the remote index
- * Returns empty array on network error (allows fallback to blank)
+ * Returns empty array on network error or timeout (allows fallback to blank)
  */
 export declare function fetchTemplateIndex(): Promise<SpecTemplate[]>;
 /**
@@ -41,9 +49,10 @@ export declare function downloadWithStrategy(templatePath: string, destDir: stri
  * @param cwd - Current working directory
  * @param templateId - Template ID from the index
  * @param strategy - How to handle existing directory
+ * @param template - Optional pre-fetched SpecTemplate to avoid double-fetch
  * @returns Object with success status and message
  */
-export declare function downloadTemplateById(cwd: string, templateId: string, strategy: TemplateStrategy): Promise<{
+export declare function downloadTemplateById(cwd: string, templateId: string, strategy: TemplateStrategy, template?: SpecTemplate): Promise<{
     success: boolean;
     message: string;
     skipped?: boolean;

package/dist/utils/template-fetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template-fetcher.d.ts","sourceRoot":"","sources":["../../src/utils/template-fetcher.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AA4BH,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAOD,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,WAAW,GAAG,QAAQ,CAAC;AAM/D;;;GAGG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC,CAYlE;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAG9B;AAMD;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAGxE;AAED;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,OAAO,CAAC,CAmClB;AA2BD;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,CA6CnE"}
+{"version":3,"file":"template-fetcher.d.ts","sourceRoot":"","sources":["../../src/utils/template-fetcher.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAWH,eAAO,MAAM,kBAAkB,mFACmD,CAAC;AAYnF,+CAA+C;AAC/C,eAAO,MAAM,QAAQ;IACnB,mDAAmD;;IAEnD,wDAAwD;;CAEhD,CAAC;AAMX,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAOD,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,WAAW,GAAG,QAAQ,CAAC;AAgC/D;;;GAGG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC,CAclE;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAG9B;AAMD;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAGxE;AAED;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,OAAO,CAAC,CAuElB;AA2BD;;;;;;;;GAQG;AACH,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,gBAAgB,EAC1B,QAAQ,CAAC,EAAE,YAAY,GACtB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,CAgEnE"}

package/dist/utils/template-fetcher.js

@@ -11,7 +11,7 @@ import { downloadTemplate } from "giget";
 // =============================================================================
 // Constants
 // =============================================================================
-const TEMPLATE_INDEX_URL = "https://raw.githubusercontent.com/mindfold-ai/docs/main/marketplace/index.json";
+export const TEMPLATE_INDEX_URL = "https://raw.githubusercontent.com/mindfold-ai/docs/main/marketplace/index.json";
 const TEMPLATE_REPO = "gh:mindfold-ai/docs";
 /** Map template type to installation path */
 const INSTALL_PATHS = {
@@ -20,16 +20,42 @@ const INSTALL_PATHS = {
     command: ".claude/commands",
     full: ".", // Entire project root
 };
+/** Timeout constants for network operations */
+export const TIMEOUTS = {
+    /** Timeout for fetching the template index (ms) */
+    INDEX_FETCH_MS: 5_000,
+    /** Timeout for downloading a template via giget (ms) */
+    DOWNLOAD_MS: 30_000,
+};
+// =============================================================================
+// Helpers
+// =============================================================================
+/**
+ * Race a promise against a timeout.
+ * giget does not support AbortSignal, so we use Promise.race instead.
+ * The timer is cleaned up on success to avoid keeping the process alive.
+ */
+function withTimeout(promise, ms, label) {
+    let timer;
+    const timeoutPromise = new Promise((_, reject) => {
+        timer = setTimeout(() => reject(new Error(`${label} timed out after ${ms / 1000}s`)), ms);
+    });
+    return Promise.race([promise, timeoutPromise]).finally(() => {
+        clearTimeout(timer);
+    });
+}
 // =============================================================================
 // Fetch Template Index
 // =============================================================================
 /**
  * Fetch available templates from the remote index
- * Returns empty array on network error (allows fallback to blank)
+ * Returns empty array on network error or timeout (allows fallback to blank)
  */
 export async function fetchTemplateIndex() {
     try {
-        const res = await fetch(TEMPLATE_INDEX_URL);
+        const res = await fetch(TEMPLATE_INDEX_URL, {
+            signal: AbortSignal.timeout(TIMEOUTS.INDEX_FETCH_MS),
+        });
         if (!res.ok) {
             throw new Error(`HTTP ${res.status}`);
         }
@@ -37,7 +63,7 @@ export async function fetchTemplateIndex() {
         return index.templates;
     }
     catch {
-        // Network error - return empty array, caller will fallback to blank
+        // Network error or timeout - return empty array, caller will fallback to blank
         return [];
     }
 }
@@ -80,12 +106,27 @@ export async function downloadWithStrategy(templatePath, destDir, strategy) {
     if (strategy === "append" && exists) {
         const tempDir = path.join(os.tmpdir(), `trellis-template-${Date.now()}`);
         try {
-            await downloadTemplate(`${TEMPLATE_REPO}/${templatePath}`, {
+            await withTimeout(downloadTemplate(`${TEMPLATE_REPO}/${templatePath}`, {
                 dir: tempDir,
                 preferOffline: true,
-            });
+            }), TIMEOUTS.DOWNLOAD_MS, "Template download");
             await copyMissing(tempDir, destDir);
         }
+        catch (error) {
+            // Clean up partially written files on timeout.
+            // Note: giget does not support AbortSignal, so the background download may
+            // still be running. Removing the directory causes it to fail with ENOENT,
+            // which settles the orphaned promise harmlessly.
+            if (error instanceof Error && error.message.includes("timed out")) {
+                try {
+                    fs.rmSync(tempDir, { recursive: true, force: true });
+                }
+                catch {
+                    // Best-effort cleanup
+                }
+            }
+            throw error;
+        }
         finally {
             // Clean up temp directory
             await fs.promises.rm(tempDir, { recursive: true, force: true });
@@ -93,10 +134,27 @@ export async function downloadWithStrategy(templatePath, destDir, strategy) {
         return true;
     }
     // Default: Direct download (for new directory or after overwrite)
-    await downloadTemplate(`${TEMPLATE_REPO}/${templatePath}`, {
-        dir: destDir,
-        preferOffline: true,
-    });
+    try {
+        await withTimeout(downloadTemplate(`${TEMPLATE_REPO}/${templatePath}`, {
+            dir: destDir,
+            preferOffline: true,
+        }), TIMEOUTS.DOWNLOAD_MS, "Template download");
+    }
+    catch (error) {
+        // Clean up partially written files on timeout.
+        // Note: giget does not support AbortSignal, so the background download may
+        // still be running. Removing the directory causes it to fail with ENOENT,
+        // which settles the orphaned promise harmlessly.
+        if (error instanceof Error && error.message.includes("timed out")) {
+            try {
+                fs.rmSync(destDir, { recursive: true, force: true });
+            }
+            catch {
+                // Best-effort cleanup
+            }
+        }
+        throw error;
+    }
     return true;
 }
 /**
@@ -127,26 +185,27 @@ async function copyMissing(src, dest) {
  * @param cwd - Current working directory
  * @param templateId - Template ID from the index
  * @param strategy - How to handle existing directory
+ * @param template - Optional pre-fetched SpecTemplate to avoid double-fetch
  * @returns Object with success status and message
  */
-export async function downloadTemplateById(cwd, templateId, strategy) {
-    // Find template in index
-    const template = await findTemplate(templateId);
-    if (!template) {
+export async function downloadTemplateById(cwd, templateId, strategy, template) {
+    // Use pre-fetched template or find from index
+    const resolved = template ?? (await findTemplate(templateId));
+    if (!resolved) {
         return {
             success: false,
             message: `Template "${templateId}" not found`,
         };
     }
     // Only support spec type in MVP
-    if (template.type !== "spec") {
+    if (resolved.type !== "spec") {
         return {
             success: false,
-            message: `Template type "${template.type}" is not supported yet (only "spec" is supported)`,
+            message: `Template type "${resolved.type}" is not supported yet (only "spec" is supported)`,
         };
     }
     // Get destination path
-    const destDir = getInstallPath(cwd, template.type);
+    const destDir = getInstallPath(cwd, resolved.type);
     // Check if directory exists for skip strategy
     if (strategy === "skip" && fs.existsSync(destDir)) {
         return {
@@ -157,7 +216,7 @@ export async function downloadTemplateById(cwd, templateId, strategy) {
     }
     // Download template
     try {
-        await downloadWithStrategy(template.path, destDir, strategy);
+        await downloadWithStrategy(resolved.path, destDir, strategy);
         return {
             success: true,
             message: `Downloaded template "${templateId}" to ${destDir}`,
@@ -165,9 +224,23 @@ export async function downloadTemplateById(cwd, templateId, strategy) {
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : "Unknown error";
+        // Classify errors for user-friendly messages
+        if (errorMessage.includes("timed out")) {
+            return {
+                success: false,
+                message: "Download timed out. Check your network connection and try again.",
+            };
+        }
+        if (errorMessage.includes("Failed to download") ||
+            errorMessage.includes("Failed to fetch")) {
+            return {
+                success: false,
+                message: "Could not reach template server. Check your network connection.",
+            };
+        }
         return {
             success: false,
-            message: `Failed to download template: ${errorMessage}`,
+            message: `Download failed: ${errorMessage}`,
         };
     }
 }