Delphi v5: workspaces as branch roots, synced by refresh/propose

[bracyw]

Summary

This is the simplest version of Delphi so far: plain git and two shell scripts in CI, with no CLI to install. Details are in docs/design.md, docs/goals.md and the README.

   ┌───────────────────────────────┐
   │ main                          │
   │ software/…/workspaces/<name>/ │
   └───────────────────────────────┘
        │                  ▲
        │ refresh          │ merge PR
        │ (CI)             │ (after check.sh)
        ▼                  │
   ┌──────────────────┐  ┌──────────────────┐
   │ ws/<name>        │  │ propose/<name>   │
   │ root = workspace │─►│ PR to main       │
   └──────────────────┘  └──────────────────┘
        │         ▲    propose (CI)
        │ branch  │ merge PR
        ▼         │
   ┌──────────────────┐
   │ your branch      │
   │ edit · commit    │
   └──────────────────┘

• Layout:
  • The org structure exists only under software/, e.g. software/application-software/argos/.
  • Workspaces live at software/<org>/…/workspaces/<name>/. Each has a small workspace.yml (harness, repos), plus CLAUDE.md, .claude/, docs/ and .delphi/setup.sh.
• Branches: each workspace has a branch ws/<name> whose repo root is its folder. Anyone, person or agent, checks it out and works at the root.
• ci/sync.sh [refresh|propose] [<name>] runs with no direction (both) on every push to main or ws/**:
  • Refresh: merges main into ws/<name> with -Xsubtree=<folder>. The first run creates the branch with main as its parent, so there's no unrelated-history conflict.
  • Propose: if ws/<name> has changes main doesn't, builds propose/<name> and opens or updates a PR to main. An unchanged proposal isn't re-pushed.
  • Conflicts are reported per workspace; the other workspaces still sync.
• ci/check.sh runs on PRs to main and validates workspace.yml, unique names, no nesting, no symlinks, and that the per-workspace managed files are identical.
• tools/new-workspace.sh <org-path> <name> creates a workspace from templates/workspace/ and opens a PR.
• .delphi/setup.sh, run inside a checkout, clones repos: into repos/ and git-ignores it.
• Each workspace also carries:
  • .github/workflows/delphi.yml, because GitHub runs a push's workflow from the pushed branch, so the ws/* roots need it;
  • .gitattributes, so line endings stay LF under Git for Windows.
• Removed: the Rust CLI, the context/ scopes and scope.yml, and the delphi-* skills.
• argos-dev: moved to the new location with its skills unchanged, and its CLAUDE.md intro describes this workflow.

Testing

• bash tests/e2e.sh: 30 checks pass, against a sandbox with a bare origin and a stubbed gh. They cover:
  • creating ws/* branches and the workflow at their root;
  • the full propose → merge → refresh round trip;
  • refresh and propose each on their own;
  • conflicts and recovery;
  • unchanged proposals not being re-pushed;
  • check failures, including drifted copies of managed files;
  • setup.sh, including a Windows line-ending (autocrlf) clone;
  • new-workspace.sh;
  • shellcheck.
• ci/check.sh passes on the real repo.

Notes for reviewers

• Repo settings:
  • Enable "Allow GitHub Actions to create pull requests".
  • Merge PRs into main with a merge commit or squash, not rebase.
• Required checks: PRs opened by CI don't trigger check, so it can't be a required status check without a PAT or GitHub App token. sync.sh runs check itself before proposing.
• Not yet run on real GitHub: triggering the workflow from ws/* pushes.
• Untested platforms: setup.sh has only been tried here with Git for Windows' line-ending setting simulated, not on real macOS or Git Bash.
• CODEOWNERS has a placeholder owner (TODO).
• Stale PRs: if a proposal is later undone on ws/<name>, its open PR isn't closed automatically.

🤖 Generated with Claude Code

https://claude.ai/code/session_01FaADA545v1Fw4im5hHFoTq