Skip to content

Integrate three open upstream mods PRs, rebased onto current main - #3

Merged
adri22235 merged 3 commits into
mainfrom
integration/mods-prs
Oct 2, 2026
Merged

adri22235 merged 3 commits into
mainfrom
integration/mods-prs

Conversation

@adri22235

Copy link
Copy Markdown
Owner

Summary

Applies three open pull requests from anthropics/claude-code that touch mods/, merged onto current main. All three were opened against an older main and conflicted or failed to typecheck, so each needed a small merge by hand. Original authorship is kept on every commit.

Upstream PR What it does Merge work needed
97293 process.run truncation flags and mtimeMs on list entries in the declarations Two test fixtures conflicted with newer main; tests/register.test.ts built an FsEntry without the now-required mtimeMs, so it got mtimeMs: 0
94847 The diff pane leaves the opening to the next edit when a resumed session lists nothing (7 commits, squashed) A doc comment in hooks/register.ts and one test title conflicted; both resolved by taking the PR's side
97688 sec-default: collector records continue past the user tier README event list, fixtures index and test file combined; the new test now answers settings.read, because main hooks plugin.register since the PR was opened

Not applied: upstream PR 97334 (sec-default: rows a conversation keeps continue past the user tier). It overlaps with newer main work in the same mod: both sides created different tests/fixtures/rewording.ts files, and the README and test file conflict in several places. That needs its author to rebase, because sec-default is a security policy mod and I did not want to guess at the merge.

Review notes

  • sec-default is a security policy mod. The only behaviour change is 4 lines in hooks/register.ts that pass telemetry.log collector records on to the append tier, the same pattern as settings.read. Worth a human read.
  • The 94847 resolution replaces main's doc comment in mods/diff/hooks/register.ts with the PR's wording. The tests pass, but whether the comment still matches main's intent is a judgement call.

Test plan

Run as the repo's mod-tests.yml does (tsc 5.9.3 and claude plugin test, CLI 2.1.287):

  • tsc -p mods/tsconfig.json: no errors
  • mods/agents-md: 5 pass
  • mods/diff: 234 pass (210 on main, +24)
  • mods/sec-default: 58 pass (57 on main, +1)
  • mods/telemetry: 34 pass
  • Not run in the fork's CI yet: the Mod tests workflow runs against the CLI from npm and may behave differently

🤖 Generated with Claude Code

https://claude.ai/code/session_01LoLAv3aLaRJocsRMcjFbpv


Generated by Claude Code

poteat and others added 3 commits October 2, 2026 15:43
…entries' mtimeMs; the test fakes answer them
… to the next edit, under test

Applied from anthropics/claude-code PR 94847 (squashed; all 7 commits). Two
conflicts with newer main (a doc comment in hooks/register.ts and a test title
in tests/register.test.ts) were resolved by taking the PR's side.
…nd and reads the entry as the telemetry types give it

Applied from anthropics/claude-code PR 97688 (squashed; both commits). Merged
with newer main: the README event list, the fixtures index and the test file
were combined, and the new collector test answers settings.read like its
neighbours, since main now hooks plugin.register.
@adri22235
adri22235 marked this pull request as ready for review October 2, 2026 16:14
@adri22235
adri22235 merged commit c225b51 into main Oct 2, 2026
2 checks passed

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: a701c730d6

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

tree: { cwd: string; toplevel: string },
): boolean {
const top = normalPathOf(tree.toplevel)
const absolute = Git.isAbsolutePath(path) ? path : `${tree.cwd}/${path}`

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Recognize Windows rooted paths as outside

On Windows, a valid drive-rooted path such as \temp\note.md (and a UNC path) does not satisfy Git.isAbsolutePath, so it is concatenated with cwd and normalized as if it were under the repository. If the working tree already has a session diff—for example, from a preceding Bash command—an external Write using one of these paths can incorrectly trigger the pane's auto-open and repository fetch. Treat Windows rooted/UNC paths as absolute before applying the working-tree check.

Useful? React with 👍 / 👎.

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.

3 participants