Skip to content

Delphi 0.3.0: workspace-inherit/ and workspace-defaults/: share files down the tree - #52

Merged
bracyw merged 3 commits into
mainfrom
workspace-inherit
Oct 12, 2026
Merged

bracyw merged 3 commits into
mainfrom
workspace-inherit

Conversation

@bracyw

@bracyw bracyw commented Oct 12, 2026

Copy link
Copy Markdown
Contributor

Workspaces can now share files through two folders at different levels of the tree, with one copy of each file, edited on main.

  • workspace-inherit/ (new): can sit in any folder from software/ down to a project folder.
    • CI writes its files onto the ws/* branch of every workspace below that folder on each sync, and never proposes them back.
    • A workspace's own edit to an inherited file is undone on the next refresh.
    • To keep its own copy, a workspace lists the path under opt-out: in its workspace.yml, which can be set from the workspace's branch.
  • workspace-defaults/ (renamed from defaults/): what a new workspace directly in that project starts with. It's copied once, as before, and is still the only place CLAUDE.md content comes from.
  • The four general skills (new-worktree, switch-workspace, setup-workspace, journal) move from the template and each workspace folder into software/workspace-inherit/. Their copies had drifted to 4 versions of new-worktree and 2 of journal. The tighter versions win, with new-worktree now saying to stay at the workspace root.
  • check.sh fails on:
    • a path inherited from two levels;
    • a workspace file at an inherited path it hasn't opted out of;
    • an opt-out: that matches nothing;
    • CLAUDE.md, workspace.yml, .delphi/, or settings.json inside workspace-inherit/;
    • a leftover defaults/.

Testing:

  • tests/e2e.sh: 107 checks pass, 14 of them new.
  • Dry run on a local mirror of this repo: all three workspaces refreshed with no conflicts and ended up with identical skills, nothing was proposed, and a second sync was a no-op.

.delphi/ is unchanged, so there's no version bump.

…ws/* branch at each sync (opt-out: in workspace.yml skips one); defaults/ becomes workspace-defaults/; the general skills move from the template to software/workspace-inherit/
@bracyw bracyw self-assigned this Oct 12, 2026
@bracyw bracyw changed the title workspace-inherit/ and workspace-defaults/: share files down the tree Delphi 0.4.0: workspace-inherit/ and workspace-defaults/: share files down the tree Oct 12, 2026
@bracyw bracyw changed the title Delphi 0.4.0: workspace-inherit/ and workspace-defaults/: share files down the tree Delphi 0.3.0: workspace-inherit/ and workspace-defaults/: share files down the tree Oct 12, 2026
@bracyw
bracyw merged commit 21d86ef into main Oct 12, 2026
2 checks passed
bracyw added a commit that referenced this pull request Oct 12, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant