Skip to content

Use removes a hand-made file added since, leaves an object folded inside since as it is, and puts a file where a folder stands; the conversion's merge always writes drama-cli's bytes - #264

Merged
SitgesRun merged 1 commit into
stagingfrom
a4-fix-forward
Nov 16, 2026
Merged

SitgesRun merged 1 commit into
stagingfrom
a4-fix-forward

Conversation

@SitgesRun

Copy link
Copy Markdown
Contributor

These are the fixes for Codex's read-only review of #263 (d57ede8), one commit on staging d57ede8.

Codex finding Fix
Use listed the folder from HEAD before hand changes were recorded, so a new uncommitted file survived applyPersonChange records the changes found on disk before it reads what to write, so every person change reads a HEAD that holds the folder (history keeps the hand-made file)
Nested objects were worked out per revision, so a folder that became an object since could be overwritten filesOfObjectAt takes both revisions, and a nested object at either is left out of both
Restoring a file over a current folder threw EISDIR a person's change deletes first, each deletion with the folders it empties (removeEmptiedFolders, as git's dir.c remove_path), and a path where a folder stands is never "already on disk"
The conversion's merge skipped drama-cli's byte normalization when it added nothing the description is always stripped, with one trailing newline
The smoke test's EP001 click case faked an editable record on a take an episode card's composer is checked without text
quick-start.md:58 and seg.tsx:93 still said the canvas edits episode prompts corrected

Size: production 5 files, +29/−20; tests 3 files, +34/−5; docs +1/−1.

Gates

  • Failing-first (201f4db): the tests only, on d57ede8, FAILED 2 of 338, the new Use test and the conversion's bytes. The other 335 passed.
  • This head c76a4c4: pine-dev PASSED in 99 s. npm test: 338 tests, 337 pass, 0 fail, 1 skipped. Render smoke: 30 of 30 pages (run 20261116T010846-c76a4c4e).

…ide since as it is, and puts a file where a folder stands; the conversion's merge always writes drama-cli's bytes

Codex's read-only review of #263 (d57ede8):

- A person's change records the changes found on disk before it reads what to
  write, not after, so it reads a HEAD that holds the folder: Use's list of the
  folder now includes a file added by hand and not committed, which it removes
  when the result did not have it (history keeps it).
- Use's nested objects are those of the result and of now together
  (filesOfObjectAt takes both revisions), so a folder that became an object of
  its own since is left as it is.
- A person's change deletes first, each deletion with the folders it leaves
  empty (removeEmptiedFolders, as git's dir.c remove_path), and a path where a
  folder stands is never "already on disk", so a file can take a folder's place.
- The conversion's merge gives drama-cli's bytes (stripped, one trailing
  newline) also when it adds nothing.
- The smoke test's episode click case no longer fakes an editable record on a
  take; quick-start and the seg editor no longer say the canvas edits episode
  prompts.

Signed-off-by: SitgesRun <169425442+SitgesRun@users.noreply.github.com>
@SitgesRun
SitgesRun merged commit c76a4c4 into staging Nov 16, 2026
1 check passed
@SitgesRun
SitgesRun deleted the a4-fix-forward branch November 16, 2026 01:11
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