Skip to content

Point PermissionFlow at upstream and select Xcode 26.3 in CI - #3

Merged
LPFchan merged 7 commits into
mainfrom
upstream-permissionflow
Sep 26, 2026
Merged

LPFchan merged 7 commits into
mainfrom
upstream-permissionflow

Conversation

@LPFchan

@LPFchan LPFchan commented Sep 26, 2026

Copy link
Copy Markdown
Owner

Summary

Points the project back at upstream jaywcjlove/PermissionFlow at v2.11.2, replacing the LPFchan/PermissionFlow fork, and moves CI from Xcode 16 to Xcode 26.3.

The fork existed for exactly one reason: upstream's manifest used swift-tools-version: 6.2, which SwiftPM refused to resolve under Xcode 16. The dev machine now runs Xcode 26.3, which handles the 6.2 manifest natively, so the fork is unnecessary.

Changes

  • Aware.xcodeproj/project.pbxproj + Package.resolved: fork → upstream, 2.11.2-swift6.1.1 → 2.11.2
  • .github/workflows/build.yml, release.yml, publish-appcast.yml: setup-xcode now selects 26.3

Validation

  • xcodebuild -resolvePackageDependencies resolves PermissionFlow from upstream at 2.11.2
  • xcodebuild Debug build of the Aware scheme succeeds on Xcode 26.3 (17C529)

After merge

The LPFchan/PermissionFlow fork can be archived/deleted once Threek (LPFchan/Threek#16) and this PR both land.

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Sep 26, 2026 •

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-09-26T19:24:53.519422Z b80ac21 Manual request
ℹ️ 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.

@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: 92eac63605

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

Comment on lines +362 to +365
repositoryURL = "https://github.com/jaywcjlove/PermissionFlow";
requirement = {
kind = exactVersion;
version = "2.11.2-swift6.1.1";
version = "2.11.2";

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 Update the canonical PermissionFlow guidance

When this switches the package to upstream v2.11.2, the canonical AGENTS.md guidance remains unchanged and still tells future contributors that Aware uses LPFchan/PermissionFlow at 2.11.2-swift6.1.1 and should carry its patches forward. Because agents are required to read that file before working, this stale instruction can cause later dependency updates to restore the obsolete fork or otherwise misrepresent the build requirements; update the Local Divergence entry alongside this package change.

AGENTS.md reference: AGENTS.md:L50-L50

Useful? React with 👍 / 👎.

LPFchan added a commit that referenced this pull request Sep 26, 2026
timestamp: 2026-09-27 02-18-51 KST
changes:
- AGENTS.md: the Local Divergence entry now documents upstream jaywcjlove/PermissionFlow at v2.11.2 with Xcode 26+ as the requirement, and keeps the fork's @sendable crash fix as reference for any Xcode 16 fallback
rationale:
- Codex review on PR #3 flagged that the old entry still told contributors to use the fork and carry its patches forward, which would mislead future dependency updates
checks:
- wording preserves the crash context (Xcode 16 SDK + missing @sendable) so a future downgrade knows what to restore

project: aware
agent: codex
role: worker
commit: LOG-20260927-021851-codex
@LPFchan

LPFchan commented Sep 26, 2026

Copy link
Copy Markdown
Owner Author

@codex review

@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: ffe6b0c9f2

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

uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '16'
xcode-version: '26.3'

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Run Xcode 26.3 jobs on a compatible runner

Checked all three changed workflows: each still uses macos-15, but Xcode 26.3 requires macOS Tahoe and is absent from the macOS 15 runner inventory. The setup-xcode action only selects an installed matching version, so the build, release, and appcast jobs will fail during setup before running their scripts; move these jobs to a compatible macOS runner while retaining the repository's Xcode 26+ requirement.

AGENTS.md reference: AGENTS.md:L50-L50

Useful? React with 👍 / 👎.

LPFchan added a commit that referenced this pull request Sep 26, 2026
timestamp: 2026-09-27 02-58-46 KST
changes:
- .github/workflows/build.yml, release.yml, publish-appcast.yml: runs-on macos-15 -> macos-26
rationale:
- Codex review on PR #3 flagged that the macos-15 runner image has no Xcode 26.x; setup-xcode can only select installed versions, so the jobs would fail during setup. The macos-26 image ships Xcode 26.3 at /Applications/Xcode_26.3.app
checks:
- verified against the runner-images macos-26 readme: Xcode 26.3 (17C529) is installed

project: aware
agent: codex
role: worker
commit: LOG-20260927-025846-codex
@LPFchan

LPFchan commented Sep 26, 2026

Copy link
Copy Markdown
Owner Author

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. What shall we delve into next?

Reviewed commit: 226516d239

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

timestamp: 2026-09-27 02-13-27 KST
changes:
- Aware.xcodeproj/project.pbxproj and Package.resolved: replace the LPFchan/PermissionFlow fork with jaywcjlove/PermissionFlow at v2.11.2
- .github/workflows/build.yml, release.yml, publish-appcast.yml: select Xcode 26.3 instead of 16
rationale:
- The fork only existed because upstream's swift-tools-version 6.2 manifest would not resolve under Xcode 16; the dev machine now runs Xcode 26.3, so the fork is unnecessary and CI must match
checks:
- xcodebuild resolves PermissionFlow from upstream at 2.11.2
- xcodebuild Debug build of the Aware scheme succeeds on Xcode 26.3 (17C529)

project: aware
agent: codex
role: worker
commit: LOG-20260927-021327-codex
timestamp: 2026-09-27 02-18-51 KST
changes:
- AGENTS.md: the Local Divergence entry now documents upstream jaywcjlove/PermissionFlow at v2.11.2 with Xcode 26+ as the requirement, and keeps the fork's @sendable crash fix as reference for any Xcode 16 fallback
rationale:
- Codex review on PR #3 flagged that the old entry still told contributors to use the fork and carry its patches forward, which would mislead future dependency updates
checks:
- wording preserves the crash context (Xcode 16 SDK + missing @sendable) so a future downgrade knows what to restore

project: aware
agent: codex
role: worker
commit: LOG-20260927-021851-codex
timestamp: 2026-09-27 02-58-46 KST
changes:
- .github/workflows/build.yml, release.yml, publish-appcast.yml: runs-on macos-15 -> macos-26
rationale:
- Codex review on PR #3 flagged that the macos-15 runner image has no Xcode 26.x; setup-xcode can only select installed versions, so the jobs would fail during setup. The macos-26 image ships Xcode 26.3 at /Applications/Xcode_26.3.app
checks:
- verified against the runner-images macos-26 readme: Xcode 26.3 (17C529) is installed

project: aware
agent: codex
role: worker
commit: LOG-20260927-025846-codex
@LPFchan
LPFchan force-pushed the upstream-permissionflow branch from 226516d to e251917 Compare September 26, 2026 18:18
@LPFchan

LPFchan commented Sep 26, 2026

Copy link
Copy Markdown
Owner Author

@codex review

@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: e2519178d6

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

Comment thread AGENTS.md
- Do not write chatty transcripts where the repo expects normalized records.
- Do not bypass commit provenance checks unless the commit is an explicit bootstrap or migration exception.

## Local Divergence

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 Preserve the AGENTS template boundary

Move this local-divergence block after the <!-- template-managed:end --> marker rather than removing the markers. On the next scheduled .github/workflows/template-sync.yml run, scripts/sync-from-template.sh will enter its marker-less migration path; because ## Code Review Rules is the final heading, it computes an empty local tail and replaces this file with only the template scaffold, silently deleting all of the newly restored Aware-specific guidance, including the PermissionFlow/Xcode requirement.

Useful? React with 👍 / 👎.

…end marker

timestamp: 2026-09-27 03-24-46 KST
changes:
- AGENTS.md: restore the template-managed:begin/end markers from main and move the Local Divergence section below the end marker
rationale:
- Codex review on PR #3 flagged that the previous resolution dropped the markers, which would make the next template sync compute an empty local tail and silently delete all Aware-specific guidance
checks:
- AGENTS.md now matches main byte-for-byte through the template-managed:end marker, with local content appended after it

project: aware
agent: codex
role: worker
commit: LOG-20260927-032446-codex
@LPFchan

LPFchan commented Sep 26, 2026

Copy link
Copy Markdown
Owner Author

@codex review

@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: e8dcbfe01a

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

Comment thread AGENTS.md Outdated
Comment on lines +64 to +65
TAILOFEOF'MARKER
git diff --stat

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 Remove leaked shell text from AGENTS.md

Delete these two stray lines: they appear to be a leaked heredoc delimiter and shell command rather than repository guidance. Because every future agent is directed to treat this file as the canonical instruction surface, leaving git diff --stat in the Local Divergence section creates an ambiguous command-like instruction, and the template sync will preserve it as part of the local tail.

AGENTS.md reference: AGENTS.md:L4-L4

Useful? React with 👍 / 👎.

timestamp: 2026-09-27 03-31-30 KST
changes:
- AGENTS.md: delete the stray TAILOFEOF'MARKER and git diff --stat lines at the end of the file
rationale:
- A malformed heredoc during the marker-boundary fix leaked its delimiter and a shell command into the file; Codex review on PR #3 flagged them
checks:
- tail of AGENTS.md now ends at the upstream-intake bullet with no trailing shell text

project: aware
agent: codex
role: worker
commit: LOG-20260927-033130-codex
@LPFchan

LPFchan commented Sep 26, 2026

Copy link
Copy Markdown
Owner Author

@codex review

@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: 6123d4c555

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

jobs:
build:
runs-on: macos-15
runs-on: macos-26

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Keep tagged releases compatible with Intel Macs

When a v* tag triggers this workflow, the macos-26 runner is Arm64, while the release build at line 51 supplies no ARCHS override; Xcode therefore packages an Arm64-only Aware.app. The previous macos-15 job produced an x86_64 app that also ran under Rosetta, so the next DMG will stop launching on Intel Macs despite the project still targeting macOS 13. Build the release for both arm64 and x86_64 (or otherwise retain an Intel release path).

Useful? React with 👍 / 👎.

timestamp: 2026-09-27 03-57-56 KST
changes:
- .github/workflows/release.yml: pass ARCHS="arm64 x86_64" ONLY_ACTIVE_ARCH=NO to the release xcodebuild invocation
rationale:
- Codex review on PR #3 flagged that macos-26 runners are arm64-only, so tagged releases would ship an arm64-only app despite the project targeting macOS 13 and previously producing Intel-compatible DMGs on macos-15
checks:
- local Release build with the same flags produces a universal binary (lipo reports x86_64 arm64)

project: aware
agent: codex
role: worker
commit: LOG-20260927-035756-codex
@LPFchan

LPFchan commented Sep 26, 2026

Copy link
Copy Markdown
Owner Author

@codex review

@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: 33d443511f

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

Comment thread AGENTS.md Outdated
- Commit provenance setup: `scripts/install-hooks.sh` configures the tracked `commit-msg` hook locally.
- Commit provenance checks: `scripts/check-commit-standards.sh <commit-message-file>` and `scripts/check-commit-range.sh <base> <head>`
- There is no dedicated automated test suite in the repo today. For runtime changes, use the build plus focused manual validation.
- Preserve the product and workflow constraints in `SPEC.md`: menu bar-only UX, local presence detection, no telemetry or analytics, and safe failure when camera access is denied or unavailable.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P3 Badge Point the constraint reminder to records/SPEC.md

The reviewed tree has no root-level SPEC.md; the canonical document is records/SPEC.md. A future contributor following this newly added reminder is therefore directed to a nonexistent path, so update the reference to the actual file.

AGENTS.md reference: AGENTS.md:L8-L13

Useful? React with 👍 / 👎.

timestamp: 2026-09-27 04-22-23 KST
changes:
- AGENTS.md: the Local Divergence constraint reminder now references records/SPEC.md
rationale:
- Codex review on PR #3 flagged that the repo has no root-level SPEC.md; the canonical document lives at records/SPEC.md
checks:
- records/SPEC.md exists; no other references to a root-level SPEC.md remain in AGENTS.md

project: aware
agent: codex
role: worker
commit: LOG-20260927-042223-codex
@LPFchan

LPFchan commented Sep 26, 2026

Copy link
Copy Markdown
Owner Author

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Bravo.

Reviewed commit: b80ac210e8

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

@LPFchan
LPFchan merged commit ed49d47 into main Sep 26, 2026
1 check passed
@LPFchan
LPFchan deleted the upstream-permissionflow branch September 26, 2026 19:52
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