Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/docs/Dictionary/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ The *how* of a capability: the approach and the thing built, kept beside its spe

Guidance written to be declarative and directional β€” it states what must be true and the direction to move, and leaves the *how* to the doer. Standards, principles, and specs are written as directives.

### Git Worktree

A checkout of a branch in its own directory, backed by a single bare clone that every worktree shares β€” so several branches are checked out at once, each in its own folder. It is purely a *local development* convenience: it lets one person, a person and an agent, or several agents work on multiple issues in the same repository in parallel, with no stashing or branch-switching. It changes nothing about how a repository is built, reviewed, or shipped. See [Git Worktrees](../Ways-of-Working/Git-Worktrees.md).

### Initiative

A product that makes the vision real β€” a framework, a set of reusable actions, or an editor extension. See [Initiatives](../Initiatives/index.md).
Expand Down
3 changes: 3 additions & 0 deletions src/docs/Ways-of-Working/Agentic-Development.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,11 @@ The workspace is a git-isolated clone of the central repositories under `~/.msx`

Each clone carries repository-local git config only, so the workspace never modifies the global git config or the repository the agent is working in β€” git still reads them, but only repository-local config is written. The setup is one idempotent script β€” [`bootstrap/Initialize-MsxWorkspace.ps1`](https://github.com/MSXOrg/docs/blob/main/bootstrap/Initialize-MsxWorkspace.ps1) β€” that clones what is missing and attempts to fast-forward the rest, leaving a repository as-is if it cannot. This keeps "start at the same point" literal: every agent, in every repository, begins from the same local docs and memory.

The workspace makes the *central* context present locally; the same local-first stance shapes how each working repository is laid out. Repositories are cloned as [git worktrees](Git-Worktrees.md) β€” one working directory per branch β€” so a person and an agent, or several agents, can work on multiple issues in the same repository at once without stashing or switching branches.

## Where this connects

- [Git Worktrees](Git-Worktrees.md) β€” how this framework is implemented on a local machine, so several pieces of work run in parallel.
- [Documentation Model](Documentation-Model.md) β€” the discipline this specification follows.
- [Principles](Principles/index.md) β€” the beliefs this specification rests on, including the three-layer agent context model.
- [README-Driven Context](Readme-Driven-Context.md) β€” why the repository's own context comes first.
Expand Down
12 changes: 10 additions & 2 deletions src/docs/Ways-of-Working/Git-Worktrees.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
---
title: Git Worktrees
description: Bare-clone and worktree layout for parallel, conflict-free work.
description: How agentic development is implemented locally β€” a bare-clone and worktree layout for working on several things at once.
---

# Git Worktrees

All repositories are set up as **bare clones with worktrees**. This enables parallel work β€” multiple agents (or a human and an agent) can work on different issues in the same repository simultaneously without conflicts, stashing, or context-switching.
Git worktrees are how [agentic development](Agentic-Development.md) is implemented on a local machine. They are purely a **local development** convenience: a way for one person β€” or a person and an agent, or several agents β€” to work on multiple issues in the same repository at the same time, without stashing, committing half-finished work, or switching branches. They change nothing about how a repository is built, reviewed, or shipped β€” that still happens through branches and pull requests, exactly as it would with an ordinary clone.

All repositories are set up as **bare clones with worktrees**. Each piece of work gets its own worktree β€” an independent working directory for one branch β€” so parallel work never collides.

## Why worktrees

Expand Down Expand Up @@ -117,3 +119,9 @@ git -C .bare branch -D 42-add-pagination
# Prune if needed (removes stale worktree references)
git -C .bare worktree prune
```

## Where this connects

- [Agentic Development](Agentic-Development.md) β€” the framework these worktrees implement locally, so several pieces of work run in parallel.
- [Branching and Merging](Branching-and-Merging.md) β€” the branch-per-issue model each worktree holds.
- [Workflow](Workflow.md) β€” where creating a worktree fits in the flow from issue to delivery.
2 changes: 1 addition & 1 deletion src/docs/Ways-of-Working/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ This section documents the principles, processes, and norms that every contribut
| [Spec-Driven Development](Spec-Driven-Development.md) | The specification is the source of truth β€” the spec (why and what), its design (how), and how a change moves from need to shipped. |
| [Evolutionary Development](Evolutionary-Development.md) | Grow software as bets under selection β€” variation, feedback, and survival of the fittest, run as one tight loop. |
| [Agentic Development](Agentic-Development.md) | How ways of working, standards, and documentation are authored once and consumed by both humans and agents. |
| [Git Worktrees](Git-Worktrees.md) | How agentic development is implemented locally β€” a bare-clone and worktree layout for working on several things at once. |
| [Organization Standard](Organization-Standard.md) | What every initiative organization must define centrally so humans and agents share the same expectations. |
| [Repository Standard](Repository-Standard.md) | The baseline files and behaviours every repository must expose so it is understandable, secure, and maintainable. |
| [Principles](Principles/index.md) | The foundational beliefs and product mindset behind every decision. |
Expand All @@ -36,7 +37,6 @@ This section documents the principles, processes, and norms that every contribut
| [Review Etiquette](Review-Etiquette.md) | Tone, scope, severity, and how to disagree well. |
| [Repository Segmentation](Repository-Segmentation.md) | What belongs in a repository, and when to split or combine. |
| [README-Driven Context](Readme-Driven-Context.md) | Why the README is the front door and the source of truth. |
| [Git Worktrees](Git-Worktrees.md) | Bare-clone and worktree layout for parallel, conflict-free work. |
| [Continuous Practices](Continuous-Practices.md) | The Continuous X family, Continuous AI, and the DevOps Dojo pillars. |
| [DevOps Reference](DevOps-Reference.md) | A curated reading list and the principles behind how we work. |

Expand Down
6 changes: 4 additions & 2 deletions src/zensical.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ nav = [
{"Documentation Model" = "Ways-of-Working/Documentation-Model.md"},
{"Spec-Driven Development" = "Ways-of-Working/Spec-Driven-Development.md"},
{"Evolutionary Development" = "Ways-of-Working/Evolutionary-Development.md"},
{"Agentic Development" = "Ways-of-Working/Agentic-Development.md"},
{"Agentic Development" = [
"Ways-of-Working/Agentic-Development.md",
{"Git Worktrees" = "Ways-of-Working/Git-Worktrees.md"},
]},
{"Organization Standard" = "Ways-of-Working/Organization-Standard.md"},
{"Repository Standard" = "Ways-of-Working/Repository-Standard.md"},
{"Principles" = [
Expand All @@ -54,7 +57,6 @@ nav = [
{"Review Etiquette" = "Ways-of-Working/Review-Etiquette.md"},
{"Repository Segmentation" = "Ways-of-Working/Repository-Segmentation.md"},
{"README-Driven Context" = "Ways-of-Working/Readme-Driven-Context.md"},
{"Git Worktrees" = "Ways-of-Working/Git-Worktrees.md"},
{"Continuous Practices" = "Ways-of-Working/Continuous-Practices.md"},
{"DevOps Reference" = "Ways-of-Working/DevOps-Reference.md"},
]},
Expand Down