Skip to content

chore(deep-scan): reconcile finding convergence with main - #762

Open
Hughhhhcoder wants to merge 8 commits into
openai:mainfrom
Hughhhhcoder:codex/codex-security-lineage-convergence
Open

chore(deep-scan): reconcile finding convergence with main#762
Hughhhhcoder wants to merge 8 commits into
openai:mainfrom
Hughhhhcoder:codex/codex-security-lineage-convergence

Conversation

@Hughhhhcoder

@Hughhhhcoder Hughhhhcoder commented Aug 31, 2026 •
edited by mldangelo-oai
Loading

Copy link
Copy Markdown
Contributor

Summary

PR #1912 incorporated the alias-consolidation case proposed here and shipped in
version 0.7.0, resolving #711. When the reducer merges two accepted aliases and
preserves all their source references, it counts zero new findings.

Changes

Merge current main into the contributor branch. The resulting tree is identical
to main.

Testing

The same alias merge was rejected in version 0.6.0 and accepted in 0.7.0. Ten
writer cases and twelve saved-result replays covered consolidation and
independent findings. After a coordinator restart with a local worker fixture,
the updated branch retained the findings and the correct no-new streak. All five
portable plugin checks passed.

Risk and rollout

There is no product change to release.

Public disclosure review

  • No customer, partner, prospect, or user identities, data, or identifying details are included.
  • No credentials, personal data, private source, scan findings, or nonpublic links or tickets are included.
  • I reviewed the branch name, title, description, commits, changes, comments, logs, screenshots, attachments, and links for public disclosure.

@github-actions github-actions Bot added the bug Something isn't working label Aug 31, 2026
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Aug 31, 2026 •
edited
Loading

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-01T10:27:06.028886Z 10f7f13 New commits
🔒 Security Review ✅ Completed 2026-09-04T10:45:47.873177Z 4746e9a New commits
ℹ️ 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@Hughhhhcoder

Hughhhhcoder commented Aug 31, 2026

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Aug 31, 2026

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Hooray!

Reviewed commit: 27e1271fab

ℹ️ 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".

@Hughhhhcoder
Merge remote-tracking branch 'origin/main' into codex/codex-security-…
eba4473 
…lineage-convergence

# Conflicts:
#	plugins/codex-security/mcp-app/src/deep-scan/artifact-validation.ts
@Hughhhhcoder

Hughhhhcoder commented Sep 4, 2026

Copy link
Copy Markdown
Contributor Author

Updated this branch with a normal merge commit (eba4473) from the current main to resolve the merge conflict. The resolution retains the alias-convergence/lineage checks from this PR and the current coverage-free DeepReductionInput contract from main.

Validation on the merged tree:

  • targeted deep-scan artifact validation: passed
  • MCP app TypeScript typecheck: passed
  • MCP app suite: 21/23 passed; the two remaining integration tests could not start because this clean worktree lacks the ignored sdk/typescript/_bundled_plugin build output, and rebuilding it was blocked by local disk space.
  • git diff --check: passed

No force-push was used.

@Hughhhhcoder

Hughhhhcoder commented Sep 4, 2026

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Sep 4, 2026

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. You're on a roll.

Reviewed commit: eba4473fda

ℹ️ 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".

@Hughhhhcoder

Hughhhhcoder commented Sep 4, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

I refreshed this branch with the latest main at f9b686a60ae127665858c1106a61677764f6a3bf using a regular merge (no force-push), producing 4746e9aa08213afc252c726e7bbb865524f2bfcf.

Validation after the update:

  • node tests/test_deep_scan_artifact_validation.mjs — passed
  • npm run typecheck — passed
  • git diff --check origin/main...HEAD — passed

The focused regression coverage still exercises discovery validation, reducer validation, lineage convergence, and empty-artifact handling.

@Hughhhhcoder

Hughhhhcoder commented Sep 8, 2026

Copy link
Copy Markdown
Contributor Author

Friendly follow-up at the one-week mark: this remains mergeable and ready for maintainer review on head 4746e9aa. The focused artifact-validation test, MCP app typecheck, and diff check pass, and the automated code/security reviews found no issue. Please let me know if you would like any scope adjustment or additional validation.

@Hughhhhcoder
Merge remote-tracking branch 'origin/main' into HEAD
490276b 
# Conflicts:
#	plugins/codex-security/mcp-app/src/deep-scan/artifact-validation.ts
#	plugins/codex-security/mcp-app/tests/test_deep_scan_artifact_validation.mjs
@Hughhhhcoder

Hughhhhcoder commented Sep 27, 2026

Copy link
Copy Markdown
Contributor Author

Resolved the new merge conflicts with current main using a regular merge; no force-push was used. The lineage-based convergence behavior remains intact alongside the newer deep-reducer parsing and validation changes.\n\nValidation on the merged head:\n- deep scan artifact validation regression suite: passed\n- MCP app TypeScript typecheck: passed\n- Prettier check for both touched files: passed

@mldangelo-oai mldangelo-oai added area:deep-scan Deep Scan coordination, worker scheduling, coverage, convergence, and resume. area:findings Finding schemas, identity, deduplication, severity, and comparison decisions. and removed area:findings Finding schemas, identity, deduplication, severity, and comparison decisions. area:deep-scan Deep Scan coordination, worker scheduling, coverage, convergence, and resume. labels Oct 8, 2026
@Hughhhhcoder
Merge remote-tracking branch 'origin/main' into codex/codex-security-…
05810b8 
…lineage-convergence

# Conflicts:
#	plugins/codex-security/mcp-app/src/deep-scan/artifact-validation.ts
#	plugins/codex-security/mcp-app/tests/test_deep_scan_artifact_validation.ts
@Hughhhhcoder
Merge remote-tracking branch 'fork/codex/codex-security-lineage-conve…
736e5e5 
…rgence' into codex/codex-security-lineage-convergence

# Conflicts:
#	plugins/codex-security/mcp-app/tests/test_deep_scan_artifact_validation.ts
@Hughhhhcoder

Hughhhhcoder commented Oct 9, 2026

Copy link
Copy Markdown
Contributor Author

I merged current main normally and resolved the conflicts in the lineage reconciliation path and regression test. The alias-convergence behavior remains covered, with the test using the current TypeScript fixture.\n\nValidation on head 736e5e5:\n- Focused lineage regression test — passed.\n- Prettier check and git diff checks — passed.\n- Full MCP suite — 287 passed, 6 failed, 1 skipped. The local full-suite run was not clean because of environment-dependent startup, path, and bundled-artifact failures; the focused regression passed.\n- Typecheck remains blocked locally by module-resolution errors outside the changed files, so I am not claiming a clean package-wide typecheck.

@Hughhhhcoder

Hughhhhcoder commented Oct 10, 2026

Copy link
Copy Markdown
Contributor Author

Resolved the conflict with current base d549f60a in artifact-validation.ts using a normal merge (55474cf6; no force-push). The alias-convergence lineage checks and regression test are preserved.

Validation on the merged head:

  • Focused artifact-validation regression test — passed.
  • TypeScript no-emit check on the changed module and test — passed.
  • Prettier and changed-file diff checks — passed.
  • I am not claiming the full MCP suite or package-wide typecheck is green; the prior broader local run had environment and generated-bundle failures.

The PR is mergeable; CI is queued.

This was referenced Oct 19, 2026
Closed
Merged
@mldangelo-oai mldangelo-oai changed the title fix(deep-scan): preserve convergence across alias consolidation chore(deep-scan): reconcile finding convergence with main Nov 1, 2026
@github-actions github-actions Bot removed the bug Something isn't working label Nov 1, 2026

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Hughhhhcoder @mldangelo-oai