timberline 0.1.0__tar.gz

timberline-0.1.0/.gitignore

@@ -0,0 +1,9 @@
+plans/
+.lj/
+__pycache__/
+.venv/
+dist/
+*.egg-info
+.ruff_cache/
+.pytest_cache/
+CLAUDE.md

timberline-0.1.0/.timberline.toml

@@ -0,0 +1,30 @@
+[timberline]
+worktree_dir = ".tl"
+branch_template = "{user}/{type}/{name}"
+user = "nc9"
+default_type = "feature"
+base_branch = "main"
+naming_scheme = "minerals"
+default_agent = "claude"
+
+[timberline.init]
+init_command = "uv sync"
+auto_init = true
+
+[timberline.env]
+auto_copy = true
+patterns = [
+    ".env",
+    ".env.*",
+    "!.env.example",
+    "!.env.template",
+]
+scan_depth = 3
+
+[timberline.submodules]
+auto_init = true
+recursive = true
+
+[timberline.agent]
+auto_launch = false
+inject_context = true

timberline-0.1.0/Makefile

@@ -0,0 +1,29 @@
+.PHONY: dev test lint fmt check link unlink
+
+dev: ## Install in development mode
+	uv sync
+	@echo "✓ Development mode ready"
+
+test: ## Run tests
+	uv run pytest -v
+
+lint: ## Lint + type check
+	uv run ruff check timberline/ tests/
+	uv run basedpyright timberline/
+
+fmt: ## Format + fix imports
+	uv run ruff format timberline/ tests/
+	uv run ruff check --fix timberline/ tests/
+
+check: fmt lint test ## Format, lint, type check, test
+
+link: dev ## Symlink tl to ~/.local/bin for testing
+	@mkdir -p $(HOME)/.local/bin
+	@ln -sf $(CURDIR)/.venv/bin/tl $(HOME)/.local/bin/tl
+	@echo "✓ tl linked to ~/.local/bin/tl"
+
+unlink: ## Remove tl symlink
+	@rm -f $(HOME)/.local/bin/tl
+	@echo "✓ tl unlinked"
+
+.DEFAULT_GOAL := dev

timberline-0.1.0/PKG-INFO

@@ -0,0 +1,112 @@
+Metadata-Version: 2.4
+Name: timberline
+Version: 0.1.0
+Summary: Git worktree manager for parallel Claude Code development
+Author-email: Nik Cubrilovic <git@nikcub.me>
+License-Expression: MIT
+Requires-Python: >=3.11
+Requires-Dist: rich>=13.0
+Requires-Dist: tomli-w>=1.0
+Requires-Dist: typer>=0.12
+Description-Content-Type: text/markdown
+
+# Timberline
+
+Git worktree manager for parallel coding agent development.
+
+## Install
+
+```bash
+uv tool install .
+# or
+uv pip install -e .
+```
+
+## Quick Start
+
+```bash
+cd your-repo
+tl init --defaults          # create .timberline.toml
+tl new auth-refactor        # create worktree + branch
+tl new --type fix           # auto-named fix worktree
+tl ls                       # list all worktrees
+cd $(tl cd auth-refactor)   # jump into worktree
+tl rm auth-refactor         # clean up
+```
+
+## Commands
+
+| Command | Description |
+|---------|-------------|
+| `tl init` | Interactive setup, write `.timberline.toml` |
+| `tl new [name]` | Create worktree (aliases: `create`) |
+| `tl ls` | List worktrees (aliases: `list`). `--json`, `--paths` |
+| `tl rm <name>` | Remove worktree (aliases: `remove`). `--force`, `--keep-branch`, `--all` |
+| `tl cd <name>` | Print worktree path. `--shell` for subshell |
+| `tl status` | Git status across all worktrees |
+| `tl sync [name]` | Rebase/merge on base branch. `--all`, `--merge` |
+| `tl agent [name]` | Launch coding agent in worktree. `--new` |
+| `tl run-init [name]` | Re-run dependency install |
+| `tl env sync [name]` | Re-copy .env files from main repo |
+| `tl env ls` | List discovered .env files |
+| `tl env diff [name]` | Show .env differences |
+| `tl pr [name]` | Create PR via gh CLI. `--draft` |
+| `tl clean` | Prune stale worktrees. `--dry-run` |
+| `tl config show` | Print resolved config |
+| `tl config set <k> <v>` | Set config value |
+| `tl config edit` | Open config in $EDITOR |
+| `tl shell-init` | Output shell integration script |
+
+## Config
+
+`.timberline.toml` in repo root:
+
+```toml
+[timberline]
+worktree_dir = ".tl"
+branch_template = "{user}/{type}/{name}"
+user = "nc9"
+default_type = "feature"
+base_branch = "main"
+naming_scheme = "minerals"  # minerals | cities | compound
+default_agent = "claude"   # claude | codex | opencode | aider
+
+[timberline.init]
+auto_init = true
+# init_command = "bun run init"
+# post_init = ["echo done"]
+
+[timberline.env]
+auto_copy = true
+patterns = [".env", ".env.*", "!.env.example", "!.env.template"]
+scan_depth = 3
+
+[timberline.submodules]
+auto_init = true
+recursive = true
+
+[timberline.agent]
+auto_launch = false
+inject_context = true
+```
+
+## Shell Integration
+
+```bash
+# Add to .zshrc / .bashrc:
+eval "$(tl shell-init)"
+
+# Then use:
+tlcd obsidian       # cd into worktree
+tl-prompt           # worktree name for PS1
+```
+
+## Development
+
+```bash
+uv sync
+make test     # pytest
+make lint     # ruff + basedpyright
+make fmt      # ruff format
+make check    # all of the above
+```

timberline-0.1.0/README.md

@@ -0,0 +1,100 @@
+# Timberline
+
+Git worktree manager for parallel coding agent development.
+
+## Install
+
+```bash
+uv tool install .
+# or
+uv pip install -e .
+```
+
+## Quick Start
+
+```bash
+cd your-repo
+tl init --defaults          # create .timberline.toml
+tl new auth-refactor        # create worktree + branch
+tl new --type fix           # auto-named fix worktree
+tl ls                       # list all worktrees
+cd $(tl cd auth-refactor)   # jump into worktree
+tl rm auth-refactor         # clean up
+```
+
+## Commands
+
+| Command | Description |
+|---------|-------------|
+| `tl init` | Interactive setup, write `.timberline.toml` |
+| `tl new [name]` | Create worktree (aliases: `create`) |
+| `tl ls` | List worktrees (aliases: `list`). `--json`, `--paths` |
+| `tl rm <name>` | Remove worktree (aliases: `remove`). `--force`, `--keep-branch`, `--all` |
+| `tl cd <name>` | Print worktree path. `--shell` for subshell |
+| `tl status` | Git status across all worktrees |
+| `tl sync [name]` | Rebase/merge on base branch. `--all`, `--merge` |
+| `tl agent [name]` | Launch coding agent in worktree. `--new` |
+| `tl run-init [name]` | Re-run dependency install |
+| `tl env sync [name]` | Re-copy .env files from main repo |
+| `tl env ls` | List discovered .env files |
+| `tl env diff [name]` | Show .env differences |
+| `tl pr [name]` | Create PR via gh CLI. `--draft` |
+| `tl clean` | Prune stale worktrees. `--dry-run` |
+| `tl config show` | Print resolved config |
+| `tl config set <k> <v>` | Set config value |
+| `tl config edit` | Open config in $EDITOR |
+| `tl shell-init` | Output shell integration script |
+
+## Config
+
+`.timberline.toml` in repo root:
+
+```toml
+[timberline]
+worktree_dir = ".tl"
+branch_template = "{user}/{type}/{name}"
+user = "nc9"
+default_type = "feature"
+base_branch = "main"
+naming_scheme = "minerals"  # minerals | cities | compound
+default_agent = "claude"   # claude | codex | opencode | aider
+
+[timberline.init]
+auto_init = true
+# init_command = "bun run init"
+# post_init = ["echo done"]
+
+[timberline.env]
+auto_copy = true
+patterns = [".env", ".env.*", "!.env.example", "!.env.template"]
+scan_depth = 3
+
+[timberline.submodules]
+auto_init = true
+recursive = true
+
+[timberline.agent]
+auto_launch = false
+inject_context = true
+```
+
+## Shell Integration
+
+```bash
+# Add to .zshrc / .bashrc:
+eval "$(tl shell-init)"
+
+# Then use:
+tlcd obsidian       # cd into worktree
+tl-prompt           # worktree name for PS1
+```
+
+## Development
+
+```bash
+uv sync
+make test     # pytest
+make lint     # ruff + basedpyright
+make fmt      # ruff format
+make check    # all of the above
+```

timberline-0.1.0/pyproject.toml

@@ -0,0 +1,42 @@
+[project]
+name = "timberline"
+version = "0.1.0"
+description = "Git worktree manager for parallel Claude Code development"
+readme = "README.md"
+license = "MIT"
+authors = [{ name = "Nik Cubrilovic", email = "git@nikcub.me" }]
+requires-python = ">=3.11"
+dependencies = [
+    "typer>=0.12",
+    "rich>=13.0",
+    "tomli-w>=1.0",
+]
+
+[project.scripts]
+tl = "timberline.cli:app"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build.targets.wheel]
+packages = ["timberline"]
+
+[tool.uv]
+dev-dependencies = [
+    "pytest>=8.0",
+    "pytest-tmp-files>=0.0.2",
+    "basedpyright>=1.20",
+    "ruff>=0.8",
+]
+
+[tool.ruff]
+target-version = "py311"
+line-length = 100
+
+[tool.ruff.lint]
+select = ["E", "F", "I", "UP", "B", "SIM"]
+
+[tool.basedpyright]
+pythonVersion = "3.11"
+typeCheckingMode = "standard"

timberline-0.1.0/tests/conftest.py

@@ -0,0 +1,24 @@
+from __future__ import annotations
+
+import subprocess
+from pathlib import Path
+
+import pytest
+
+
+@pytest.fixture
+def tmp_git_repo(tmp_path: Path) -> Path:
+    """Create a temporary git repo with an initial commit."""
+    repo = tmp_path / "repo"
+    repo.mkdir()
+    subprocess.run(["git", "init", "-b", "main"], cwd=repo, capture_output=True, check=True)
+    subprocess.run(
+        ["git", "config", "user.email", "test@test.com"], cwd=repo, capture_output=True, check=True
+    )
+    subprocess.run(
+        ["git", "config", "user.name", "Test"], cwd=repo, capture_output=True, check=True
+    )
+    (repo / "README.md").write_text("# Test")
+    subprocess.run(["git", "add", "."], cwd=repo, capture_output=True, check=True)
+    subprocess.run(["git", "commit", "-m", "init"], cwd=repo, capture_output=True, check=True)
+    return repo

timberline-0.1.0/tests/test_agent.py

@@ -0,0 +1,116 @@
+from __future__ import annotations
+
+from pathlib import Path
+from unittest.mock import patch
+
+import pytest
+
+from timberline.agent import (
+    KNOWN_AGENTS,
+    buildContextBlock,
+    buildEnvVars,
+    detectInstalledAgents,
+    getAgentDef,
+    injectAgentContext,
+)
+from timberline.types import WorktreeInfo
+
+
+def _makeInfo(name: str = "obsidian") -> WorktreeInfo:
+    return WorktreeInfo(
+        name=name,
+        branch=f"nik/feature/{name}",
+        base_branch="main",
+        type="feature",
+        path=f"/repo/.tl/{name}",
+    )
+
+
+def test_buildEnvVars():
+    info = _makeInfo()
+    env = buildEnvVars(info, Path("/repo"))
+    assert env["TL_WORKTREE"] == "obsidian"
+    assert env["TL_BRANCH"] == "nik/feature/obsidian"
+    assert env["TL_BASE"] == "main"
+    assert env["TL_ROOT"] == "/repo"
+    assert env["TL_TYPE"] == "feature"
+
+
+def test_buildContextBlock():
+    info = _makeInfo()
+    others = [_makeInfo("alpha"), _makeInfo("beta")]
+    block = buildContextBlock(info, [info, *others], Path("/repo"))
+    assert "obsidian" in block
+    assert "nik/feature/obsidian" in block
+    assert "alpha" in block
+    assert "beta" in block
+    assert "<!-- timberline:start -->" in block
+    assert "<!-- timberline:end -->" in block
+
+
+def test_injectAgentContext_new_file(tmp_path: Path):
+    info = _makeInfo()
+    agent = KNOWN_AGENTS["claude"]
+    injectAgentContext(agent, tmp_path, info, [info], Path("/repo"))
+    content = (tmp_path / "CLAUDE.md").read_text()
+    assert "<!-- timberline:start -->" in content
+    assert "obsidian" in content
+
+
+def test_injectAgentContext_existing_without_markers(tmp_path: Path):
+    (tmp_path / "CLAUDE.md").write_text("# Existing content\n")
+    info = _makeInfo()
+    agent = KNOWN_AGENTS["claude"]
+    injectAgentContext(agent, tmp_path, info, [info], Path("/repo"))
+    content = (tmp_path / "CLAUDE.md").read_text()
+    assert "# Existing content" in content
+    assert "<!-- timberline:start -->" in content
+
+
+def test_injectAgentContext_replaces_existing_markers(tmp_path: Path):
+    (tmp_path / "CLAUDE.md").write_text(
+        "# Header\n<!-- timberline:start -->\nold content\n<!-- timberline:end -->\n# Footer\n"
+    )
+    info = _makeInfo()
+    agent = KNOWN_AGENTS["claude"]
+    injectAgentContext(agent, tmp_path, info, [info], Path("/repo"))
+    content = (tmp_path / "CLAUDE.md").read_text()
+    assert "old content" not in content
+    assert "obsidian" in content
+    assert "# Header" in content
+    assert "# Footer" in content
+
+
+def test_injectAgentContext_codex_uses_agents_md(tmp_path: Path):
+    info = _makeInfo()
+    agent = KNOWN_AGENTS["codex"]
+    injectAgentContext(agent, tmp_path, info, [info], Path("/repo"))
+    assert (tmp_path / "AGENTS.md").exists()
+    assert not (tmp_path / "CLAUDE.md").exists()
+    content = (tmp_path / "AGENTS.md").read_text()
+    assert "obsidian" in content
+
+
+def test_getAgentDef_known():
+    agent = getAgentDef("claude")
+    assert agent.binary == "claude"
+    assert agent.context_file == "CLAUDE.md"
+
+
+def test_getAgentDef_unknown():
+    with pytest.raises(KeyError, match="Unknown agent"):
+        getAgentDef("nonexistent")
+
+
+def test_detectInstalledAgents_none():
+    with patch("timberline.agent.shutil.which", return_value=None):
+        assert detectInstalledAgents() == []
+
+
+def test_detectInstalledAgents_some():
+    def mock_which(binary: str) -> str | None:
+        return "/usr/bin/claude" if binary == "claude" else None
+
+    with patch("timberline.agent.shutil.which", side_effect=mock_which):
+        result = detectInstalledAgents()
+        assert result == ["claude"]