appstore-precheck 1.6.0 → 1.7.0

package/CHANGELOG.md

@@ -5,6 +5,34 @@ All notable changes to this project are documented here. Versioning follows
 
 ## [Unreleased]
 
+## [1.7.0] - 2026-07-02
+
+Smarter analysis (roadmap #2b): the scanner now resolves the iOS source directory
+and `Info.plist` from the Xcode **project model** (`.pbxproj`) instead of a pure
+grep heuristic, eliminating the dominant remaining false-positive source in
+monorepo / SPM / multi-target layouts. Zero new runtime dependencies (pure
+bash + awk), READ-ONLY preserved, and default text output stays byte-identical for
+any repo without a `.pbxproj`.
+
+### Added
+- **Project-model detection** (`skills/appstore-precheck/scripts/project-model.sh`):
+  parses `.pbxproj` to find the primary `application`-type target and resolve its
+  source dir + `INFOPLIST_FILE` authoritatively, across ALL `.xcodeproj` in a
+  monorepo. `detect_ios_dir` now chains: config `.iosSourceDir` > project-model
+  parse > the original grep heuristic (unchanged, kept as fallback).
+- Per-target `INFOPLIST_FILE` attribution via the build-config graph
+  (target → `buildConfigurationList` → `XCBuildConfiguration`), used as a last
+  resort so already-correct apps are untouched; unexpanded build-variable paths
+  (`$(SRCROOT)` etc.) are guarded, and app targets under vendored paths
+  (`ThirdParty`/`Vendor`) are deprioritized so a vendored sample app never wins.
+
+### Measured impact (18-app open-source panel, candidate/directional labels)
+- Corrects detection on `wikipedia-ios`, `pocket-casts-ios`, `cwa-app-ios`
+  (now read their real custom-named plists) and `brave-ios` (real app over a
+  vendored sample). `usage-description-crosscheck` false positives 9 → 6, with
+  content-grounded findings surfaced by finally reading the correct plist; zero
+  true-positive loss. See `docs/fp-reduction-report.md`.
+
 ## [1.6.0] - 2026-07-01
 
 Measurement release: structured findings, suppression, and a published

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appstore-precheck",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "Read-only iOS App Store pre-submission check, packaged as a portable Agent Skill with native Claude Code, Cursor, and Codex plugins, plus an npx CLI.",
   "license": "MIT",
   "author": "Berkay Turk (https://github.com/berkayturk)",

package/skills/appstore-precheck/SKILL.md

@@ -4,7 +4,7 @@ description: Read-only pre-submission check for an iOS app before App Store revi
 license: MIT
 metadata:
   author: Berkay Turk
-  version: 1.6.0
+  version: 1.7.0
 allowed-tools: Bash Read Grep Glob WebFetch
 ---
 

package/skills/appstore-precheck/scripts/project-model.sh

@@ -0,0 +1,190 @@
+#!/usr/bin/env bash
+# project-model.sh — resolve the primary app target's source dir + Info.plist from
+# an Xcode project model (.pbxproj), authoritatively and dependency-free.
+# Sourced by scan.sh. Pure bash + awk. READ-ONLY. Bash 3.2 compatible.
+
+# pm_app_targets <pbxproj> -> names of targets whose productType is the application type.
+# .pbxproj PBXNativeTarget blocks list `name` before `productType`; the block closes
+# with a bare `};`. Nested lists close with `)`, never `};`, so `};` reliably ends a block.
+pm_app_targets() {
+  awk '
+    /isa = PBXNativeTarget;/ { in_t=1; name=""; pt=""; next }
+    in_t && /^[[:space:]]*name = / {
+      l=$0; sub(/^[[:space:]]*name = /,"",l); sub(/;[[:space:]]*$/,"",l); gsub(/^"|"$/,"",l); name=l
+    }
+    in_t && /^[[:space:]]*productType = / {
+      l=$0; sub(/^[[:space:]]*productType = /,"",l); sub(/;[[:space:]]*$/,"",l); gsub(/^"|"$/,"",l); pt=l
+    }
+    in_t && /^[[:space:]]*};[[:space:]]*$/ {
+      if (pt == "com.apple.product-type.application" && name != "") print name
+      in_t=0
+    }
+  ' "$1"
+}
+
+# pm_infoplist_files <pbxproj> -> every INFOPLIST_FILE value, unquoted, sorted, deduped.
+pm_infoplist_files() {
+  awk '/^[[:space:]]*INFOPLIST_FILE = /{
+    l=$0; sub(/^[[:space:]]*INFOPLIST_FILE = /,"",l); sub(/;[[:space:]]*$/,"",l); gsub(/^"|"$/,"",l); print l
+  }' "$1" | sort -u
+}
+
+# pm_target_infoplist <pbxproj> <target> -> the target's own INFOPLIST_FILE via its
+# build configurations (first non-empty), or non-zero. Handles quoted paths with spaces.
+#
+# A repo may declare INFOPLIST_FILE for several targets whose leading path
+# component does not match the target name (e.g. Client's plist lives under
+# "iOS/Supporting Files"). pm_infoplist_files() alone cannot attribute a given
+# plist to a specific target, so this walks the actual pbxproj graph:
+# PBXNativeTarget "name = X" -> buildConfigurationList = <UUID> -> the
+# XCConfigurationList block for that UUID -> its buildConfigurations list ->
+# each XCBuildConfiguration block, looking for INFOPLIST_FILE.
+#
+# NOTE: this returns the FIRST build config's plist, which is only reliable
+# when all configs agree. Per-configuration plists (Debug vs Release) can
+# legitimately differ (e.g. cwa-app-ios's ENA target), so pm_resolve() only
+# calls this as a LAST RESORT — after the leading-component match and the
+# GENERATE dir-name branch have both failed. Callers must also guard against
+# unexpanded Xcode build variables (e.g. "$(SRCROOT)/...") in the returned
+# path, since those can never resolve to a real file on disk.
+pm_target_infoplist() {
+  local pbx="$1" target="$2" cl u ip
+  cl="$(awk -v t="$target" '
+    /isa = PBXNativeTarget;/{inb=1;nm="";c="";next}
+    inb&&/^[[:space:]]*name = /{l=$0;sub(/^[[:space:]]*name = /,"",l);sub(/;[[:space:]]*$/,"",l);gsub(/^"|"$/,"",l);nm=l}
+    inb&&/^[[:space:]]*buildConfigurationList = /{l=$0;sub(/^[[:space:]]*buildConfigurationList = /,"",l);sub(/;[[:space:]]*$/,"",l);sub(/ .*/,"",l);c=l}
+    inb&&/^[[:space:]]*};[[:space:]]*$/{if(nm==t&&c!=""){print c;exit}inb=0}
+  ' "$pbx")"
+  [[ -z "$cl" ]] && return 1
+  # Match only the block-OPENING line for a UUID (ends in "{"), never a
+  # reference to that UUID inside some other list (e.g. the UUID also
+  # appears as a bare list item "CFG1 /* Debug */," inside the
+  # buildConfigurations array itself, which would otherwise false-match).
+  local bcs; bcs="$(awk -v cl="$cl" '
+    $0 ~ ("^[[:space:]]*" cl "[[:space:]]") && /\{[[:space:]]*$/ {inb=1}
+    inb&&/buildConfigurations = \(/{inl=1;next}
+    inb&&inl&&/\)/{exit}
+    inb&&inl{l=$0;sub(/\/\*.*/,"",l);gsub(/[[:space:]]/,"",l);sub(/,$/,"",l);if(l!="")print l}
+  ' "$pbx")"
+  [[ -z "$bcs" ]] && return 1
+  for u in $bcs; do
+    ip="$(awk -v u="$u" '
+      $0 ~ ("^[[:space:]]*" u "[[:space:]]") && /\{[[:space:]]*$/ {inb=1}
+      inb&&/^[[:space:]]*INFOPLIST_FILE = /{l=$0;sub(/^[[:space:]]*INFOPLIST_FILE = /,"",l);sub(/;[[:space:]]*$/,"",l);gsub(/^"|"$/,"",l);print l;exit}
+      inb&&/^[[:space:]]*};[[:space:]]*$/{exit}
+    ' "$pbx")"
+    [[ -n "$ip" ]] && { printf '%s\n' "$ip"; return 0; }
+  done
+  return 1
+}
+
+# Vendored dirs whose .xcodeproj must never win detection.
+PM_PRUNE_DIRS='node_modules|Pods|Carthage|\.build|DerivedData|\.git'
+
+# App targets whose project lives under a vendored/sample path are deprioritized:
+# they only win when no primary (non-vendored) app target exists. This is a
+# deprioritization heuristic (mirrors scan.sh's NONAPP_TARGET), bounded on
+# purpose: a sample app under a clearly-vendored path (ThirdParty/Vendor)
+# loses to a primary app, but the heuristic deliberately does NOT match
+# Demo/Sample/Example-named dirs, because those often hold a library repo's
+# real deliverable app rather than a throwaway sample (Pods/Carthage/
+# node_modules are already fully pruned by PM_PRUNE_DIRS in
+# pm_find_pbxprojs, so they need not be listed here either).
+PM_SAMPLE_PATH='(^|/)(ThirdParty|Vendor(ed)?)(/|$)'
+
+# pm_find_pbxprojs <root> -> all project.pbxproj under *.xcodeproj (pruned), deterministic order.
+pm_find_pbxprojs() {
+  local root="${1:-.}"
+  find "$root" -name 'project.pbxproj' -path '*.xcodeproj/*' 2>/dev/null \
+    | grep -Ev "/($PM_PRUNE_DIRS)/" \
+    | LC_ALL=C sort
+}
+
+# pm_resolve <root> -> "DIR<TAB>PLIST" (ROOT-relative; PLIST may be empty) for the
+# primary app target, or non-zero with no output.
+#
+# A monorepo may contain several .xcodeproj (samples, sub-projects, the real
+# app). The shallowest one is not necessarily the real app, so every pbxproj
+# is resolved on its own terms (against its own SRCROOT-relative projdir) and
+# the single global best — most *.swift sources — wins across all of them.
+pm_resolve() {
+  local root="${1:-.}" pbx rel projdir apps plists app plist dir n cand_dir cand_plist
+  # "best" is the primary (non-vendored/sample) bucket; "alt" collects app
+  # targets whose project lives under a vendored/sample path (PM_SAMPLE_PATH).
+  # alt only wins when no primary candidate exists at all — see the tail.
+  local best="" best_plist="" best_n=-1
+  local alt="" alt_plist="" alt_n=-1
+  local found=0
+  # Normalize a trailing slash so the ROOT-relative strip below reliably matches
+  # (root="/" strips to "" and must stay "/"; root="." is untouched).
+  root="${root%/}"; [[ -z "$root" ]] && root="/"
+  while IFS= read -r pbx; do
+    [[ -z "$pbx" ]] && continue
+    apps="$(pm_app_targets "$pbx")"; [[ -z "$apps" ]] && continue
+    found=1
+    # ROOT-relative dir that contains this .xcodeproj (SRCROOT). Its
+    # INFOPLIST_FILE paths and app source dir are relative to this.
+    rel="${pbx#"$root"/}"                 # e.g. ios/App.xcodeproj/project.pbxproj
+    projdir="$(dirname "$(dirname "$rel")")"; projdir="${projdir#./}"
+    [[ "$projdir" == "." ]] && projdir=""
+    plists="$(pm_infoplist_files "$pbx")"
+    while IFS= read -r app; do
+      [[ -z "$app" ]] && continue
+      # Priority 1: a declared plist whose leading path component equals the
+      # app target name.
+      plist="$(printf '%s\n' "$plists" | awk -v a="$app" -F/ '$1==a{print; exit}')"
+      if [[ -n "$plist" ]]; then
+        dir="$(dirname "$plist")"
+      else
+        # Priority 2 (GENERATE_INFOPLIST_FILE): no leading-component plist.
+        # Use the dir named after the target.
+        dir="$(cd "$root${projdir:+/$projdir}" 2>/dev/null && \
+               find . -type d -name "$app" 2>/dev/null | sed 's#^\./##' \
+               | awk '{print length, $0}' | sort -n | head -1 | cut -d' ' -f2-)"
+        if [[ -z "$dir" ]]; then
+          # Priority 3 (LAST RESORT — only reached when both of the above
+          # fail, i.e. the target would otherwise be skipped entirely):
+          # attribute the target's OWN INFOPLIST_FILE via the pbxproj's
+          # build-config graph. Works even when the plist's leading path
+          # component doesn't match the target name (e.g. brave-ios's
+          # Client -> "iOS/Supporting Files/Info.plist"), but must not
+          # override a working leading-component or GENERATE resolution
+          # (e.g. eigen's Artsy, cwa-app-ios's ENA), so it stays last.
+          plist="$(pm_target_infoplist "$pbx" "$app" 2>/dev/null)"
+          # A literal, unexpanded Xcode build variable (e.g. $(SRCROOT),
+          # $(PROJECT_DIR)) can never be found on disk — treat it as
+          # unusable rather than resolving to a broken path.
+          [[ "$plist" == *'$('* ]] && plist=""
+          if [[ -n "$plist" ]]; then
+            dir="$(dirname "$plist")"
+          else
+            continue
+          fi
+        fi
+      fi
+      n="$(cd "$root${projdir:+/$projdir}" 2>/dev/null && \
+           find "$dir" -name '*.swift' 2>/dev/null | wc -l | tr -d ' ')"
+      # Prefix the projdir so paths are ROOT-relative before comparing/storing.
+      cand_dir="${projdir:+$projdir/}$dir"
+      cand_plist=""
+      [[ -n "$plist" ]] && cand_plist="${projdir:+$projdir/}$plist"
+      if [[ "$projdir" =~ $PM_SAMPLE_PATH ]]; then
+        if (( n > alt_n )); then
+          alt_n=$n; alt="$cand_dir"; alt_plist="$cand_plist"
+        fi
+      else
+        if (( n > best_n )); then
+          best_n=$n; best="$cand_dir"; best_plist="$cand_plist"
+        fi
+      fi
+    done <<< "$apps"
+  done <<< "$(pm_find_pbxprojs "$root")"
+  [[ $found -eq 0 ]] && return 1
+  if [[ -n "$best" ]]; then
+    printf '%s\t%s\n' "$best" "$best_plist"
+  elif [[ -n "$alt" ]]; then
+    printf '%s\t%s\n' "$alt" "$alt_plist"
+  else
+    return 1
+  fi
+}

package/skills/appstore-precheck/scripts/scan.sh

@@ -14,6 +14,7 @@ cd "$ROOT" || { echo "FAIL: repo-root — could not enter repository root"; exit
 
 source "$(dirname "${BASH_SOURCE[0]}")/findings.sh"
 source "$(dirname "${BASH_SOURCE[0]}")/suppress.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/project-model.sh"
 FINDINGS_TMP="$(mktemp)"; export FINDINGS_TMP
 trap 'rm -f "$FINDINGS_TMP"' EXIT
 FORMAT="text"
@@ -109,9 +110,21 @@ NONAPP_TARGET='(Watch|Extension|Widget|Intents|Clip|Notification|Share|Sticker|T
 # can land on a Watch app, an app extension, or a framework instead of the real app.
 # We score candidates by Swift-file count and deprioritize obvious non-app targets, so
 # they only win when nothing app-like exists.
+# Sets the globals IOS_DIR (and, when resolved via the project model, PM_INFO_PLIST)
+# directly rather than echoing a result — this function MUST be called without
+# command substitution (no `IOS_DIR="$(detect_ios_dir)"`) so its assignments run
+# in the caller's shell instead of a subshell, where they would be discarded.
 detect_ios_dir() {
   local d; d=$(cfg '.iosSourceDir')
-  [[ -n "$d" ]] && { echo "$d"; return; }
+  [[ -n "$d" ]] && { IOS_DIR="$d"; return; }
+  # Authoritative: parse the Xcode project model when a .pbxproj exists.
+  local pm; pm="$(pm_resolve . 2>/dev/null)"
+  if [[ -n "$pm" ]]; then
+    PM_INFO_PLIST="$(printf '%s' "$pm" | cut -f2)"
+    IOS_DIR="$(printf '%s' "$pm" | cut -f1)"
+    return
+  fi
+  # Fallback: the original grep heuristic (unchanged).
   local candidates plist entry
   candidates=$(
     find . "${PRUNE[@]}" -name Info.plist 2>/dev/null | while IFS= read -r plist; do dirname "$plist"; done
@@ -129,17 +142,18 @@ detect_ios_dir() {
       (( n > best_n )) && { best_n=$n; best="$dir"; }
     fi
   done <<< "$candidates"
-  [[ -n "$best" ]] && { echo "$best"; return; }
-  echo "$alt"
+  if [[ -n "$best" ]]; then IOS_DIR="$best"; else IOS_DIR="$alt"; fi
 }
 
-IOS_DIR="$(detect_ios_dir)"
+PM_INFO_PLIST=""
+IOS_DIR=""
+detect_ios_dir
 META_DIR="$(cfg '.metadataDir')";      [[ -z "$META_DIR" ]]   && META_DIR="$(detect_first -type d -name metadata -path '*fastlane*')"
 SCREEN_DIR="$(cfg '.screenshotsDir')"; [[ -z "$SCREEN_DIR" ]] && SCREEN_DIR="$(detect_first -type d -name screenshots -path '*fastlane*')"
 XCSTRINGS="$(cfg '.xcstringsPath')";   [[ -z "$XCSTRINGS" ]]  && XCSTRINGS="$(detect_first -name 'Localizable.xcstrings')"
 [[ -z "$XCSTRINGS" ]] && XCSTRINGS="$(detect_first -name '*.xcstrings')"
 PRIVACY_FILE="$(detect_first -name 'PrivacyInfo.xcprivacy')"
-INFO_PLIST="${IOS_DIR%/}/Info.plist"
+INFO_PLIST="${PM_INFO_PLIST:-${IOS_DIR%/}/Info.plist}"
 REVIEW_PREP="$(cfg '.reviewPrepNotes')"
 
 # Paywall / subscription views. A real app spreads its purchase UI across several files