Skip to content

merge: reconcile main into dev - #105

Merged
frobel0520 merged 20 commits into
devfrom
feature/reconcile-main-dev
Aug 23, 2026
Merged

merge: reconcile main into dev#105
frobel0520 merged 20 commits into
devfrom
feature/reconcile-main-dev

Conversation

@frobel0520

@frobel0520 frobel0520 commented Aug 23, 2026

Copy link
Copy Markdown
Owner

Summary

  • Merge origin/main into origin/dev to resolve the release drift.
  • Preserve main hardening fixes for CI/CD, Deploy, Logs, PostgreSQL, Unit, REST, Build and accessibility.
  • Keep dev curriculum changes and remove all merge conflict markers.

Verification

  • npm --prefix frontend test (84 files, 277 tests)
  • npm --prefix frontend run lint
  • npm --prefix frontend run build
  • npm --prefix frontend run build:pages
  • git diff --check

frobel0520 and others added 20 commits August 15, 2026 02:30
@frobel0520
Merge pull request #2 from frobel0520/dev
0d98863 
Run CI for dev and main branches (#1)
@frobel0520
release: promote workshop curriculum updates to main (#49)
ba13cf2 
* Sync CI triggers and ignore local artifacts (#3)

* Run CI for dev and main branches

* Ignore local session artifacts

* docs: refine task dependency breakdown (#4)

* docs: add project plan SA and SD (#5)

* docs: refine task dependency breakdown

* docs: add project plan SA and SD

* docs: define guardrail rebuild integration (#6)

* feat: define TopicModule contract (#7)

* feat: add progress repository adapter

* feat: add route registry contract

* docs: add accessibility acceptance checklist

* test: add simulator test harness

* feat: add shared topic lesson and lab shell

* docs: define remote collaboration acceptance

* feat: add remote collaboration lesson fixtures

* fix: make remote sync state explicit

* docs: clarify remote sync state contract

* feat: add remote collaboration simulator

* feat: add core and extension progress aggregation

* docs: define cli acceptance

* feat: add cli lesson fixtures

* feat: add cli simulator

* feat: add cli lab ui

* feat: integrate cli topic

* docs: define ide acceptance

* feat: add ide lesson fixtures

* feat: add ide debugger simulator

* feat: add ide debugger lab ui

* feat: integrate ide topic

* feat: add track-first curriculum flow

* feat: add remote collaboration lab UI

* feat: add remote collaboration lab UI

* feat: integrate remote collaboration topic

* test: update ready counts after remote integration

* feat: add remote collaboration lab UI

* feat: add guardrail lesson fixtures

* feat: add guardrail deterministic simulator

* feat: add guardrail lab UI

* feat: integrate guardrail extension topic

* docs: define package management acceptance contract

* feat: add package management lesson fixtures

* feat: add package management simulator

* feat: add package management lab UI

* feat: integrate package topic

* fix: guard topic routes and ready progress

* docs: sync project status and delivery backlog

* refactor: dispatch topic views through registry

* docs: define Git release acceptance

* feat: expand Git cowork and pipeline lesson

* docs: record Git release review checkpoint

* fix: expose focus ring for form controls

* docs: approve Git release review

* docs: close Git progress status

* feat: add interactive FastAPI request workshop (#48)
@frobel0520
release: promote build and environment workshops
a5be461 
Release validated with 120 tests and production build.
@frobel0520
release: reconcile dev with main for SQL-01
1faca20
@frobel0520
Merge pull request #56 from frobel0520/codex/release-sql-20260818
29de806 
release: promote SQL-01 workshop to main
@frobel0520
Merge all-push CI workflow to main
38685bb 
Release PR CI passed.
@frobel0520
release: ship Core 19/19 to main (#90)
2838d34 
* refactor: align project code with coding standards

* feat: add index and transaction topic

* feat: add problem-solving extension workshop

Add the Problem-solving Extension Lesson and Lab with deterministic nine-check simulator, progress integration, responsive UI, tests, and docs.

* feat: add unit testing workshop

Unit Testing lesson, deterministic six-check Lab, routes, navigation, curriculum readiness, and integration coverage. Local validation: 59 test files / 181 tests, lint, build, and browser QA passed.

* feat: add PostgreSQL topic (#61)

* docs: define integration testing acceptance (#64)docs:

* feat: add integration lesson fixtures (#65)

* feat: add integration simulator (#66)

* feat: add integration lab UI (#67)

* feat: add integration testing topic (#68)

* docs: add logs acceptance contract (#69)

* feat: add logs lesson fixtures (#70)

* feat: add logs simulator (#71)

* feat: add logs lab UI (#72)

* feat: open logs topic (#73)

* docs: sync curriculum status and phase questions (#74)

* docs: define Docker workshop acceptance (#75)

* feat: add Docker lesson fixtures (#76)

* feat: add Docker deterministic simulator (#77)

* feat: add Docker interactive lab (#78)

* feat: integrate Docker topic (#79)

* docs: define CI/CD workshop acceptance (#80)

* feat: add CI/CD lesson fixtures (#81)

* feat: add CI/CD deterministic simulator (#82)

* feat: add CI/CD interactive lab (#83)

* feat: integrate CI/CD topic (#84)

* docs: define deployment acceptance contract (#85)

* feat: add deployment lesson fixtures (#86)

* feat: add deployment deterministic simulator (#87)

* feat: add deployment interactive lab (#88)

* feat: integrate deployment topic (#89)

* docs: record M6 release audit
@frobel0520
release: close M6 audit (#92)
2f3f6a2 
* refactor: align project code with coding standards

* feat: add index and transaction topic

* feat: add problem-solving extension workshop

Add the Problem-solving Extension Lesson and Lab with deterministic nine-check simulator, progress integration, responsive UI, tests, and docs.

* feat: add unit testing workshop

Unit Testing lesson, deterministic six-check Lab, routes, navigation, curriculum readiness, and integration coverage. Local validation: 59 test files / 181 tests, lint, build, and browser QA passed.

* feat: add PostgreSQL topic (#61)

* docs: define integration testing acceptance (#64)docs:

* feat: add integration lesson fixtures (#65)

* feat: add integration simulator (#66)

* feat: add integration lab UI (#67)

* feat: add integration testing topic (#68)

* docs: add logs acceptance contract (#69)

* feat: add logs lesson fixtures (#70)

* feat: add logs simulator (#71)

* feat: add logs lab UI (#72)

* feat: open logs topic (#73)

* docs: sync curriculum status and phase questions (#74)

* docs: define Docker workshop acceptance (#75)

* feat: add Docker lesson fixtures (#76)

* feat: add Docker deterministic simulator (#77)

* feat: add Docker interactive lab (#78)

* feat: integrate Docker topic (#79)

* docs: define CI/CD workshop acceptance (#80)

* feat: add CI/CD lesson fixtures (#81)

* feat: add CI/CD deterministic simulator (#82)

* feat: add CI/CD interactive lab (#83)

* feat: integrate CI/CD topic (#84)

* docs: define deployment acceptance contract (#85)

* feat: add deployment lesson fixtures (#86)

* feat: add deployment deterministic simulator (#87)

* feat: add deployment interactive lab (#88)

* feat: integrate deployment topic (#89)

* docs: close M6 release audit (#91)
@frobel0520
release: sync final Pages evidence (#94)
d226b5b 
* refactor: align project code with coding standards

* feat: add index and transaction topic

* feat: add problem-solving extension workshop

Add the Problem-solving Extension Lesson and Lab with deterministic nine-check simulator, progress integration, responsive UI, tests, and docs.

* feat: add unit testing workshop

Unit Testing lesson, deterministic six-check Lab, routes, navigation, curriculum readiness, and integration coverage. Local validation: 59 test files / 181 tests, lint, build, and browser QA passed.

* feat: add PostgreSQL topic (#61)

* docs: define integration testing acceptance (#64)docs:

* feat: add integration lesson fixtures (#65)

* feat: add integration simulator (#66)

* feat: add integration lab UI (#67)

* feat: add integration testing topic (#68)

* docs: add logs acceptance contract (#69)

* feat: add logs lesson fixtures (#70)

* feat: add logs simulator (#71)

* feat: add logs lab UI (#72)

* feat: open logs topic (#73)

* docs: sync curriculum status and phase questions (#74)

* docs: define Docker workshop acceptance (#75)

* feat: add Docker lesson fixtures (#76)

* feat: add Docker deterministic simulator (#77)

* feat: add Docker interactive lab (#78)

* feat: integrate Docker topic (#79)

* docs: define CI/CD workshop acceptance (#80)

* feat: add CI/CD lesson fixtures (#81)

* feat: add CI/CD deterministic simulator (#82)

* feat: add CI/CD interactive lab (#83)

* feat: integrate CI/CD topic (#84)

* docs: define deployment acceptance contract (#85)

* feat: add deployment lesson fixtures (#86)

* feat: add deployment deterministic simulator (#87)

* feat: add deployment interactive lab (#88)

* feat: integrate deployment topic (#89)

* docs: close M6 release audit (#91)

* docs: record final Pages evidence (#93)
@frobel0520
fix(rest): fall back when browsing unrelated code file
3b098ff 
REST file browsing now falls back to the first line when the active stage has no mapping, with status feedback and regression coverage.
@frobel0520
fix(build): add portable Pages build profile
d681fc8 
Pages builds now use a versioned mode profile, with synchronized Vite config, workflow, lessons, fixtures, and acceptance documentation.
@frobel0520
fix(postgresql): create GIN index before explain
ecc4341 
PostgreSQL lesson and simulator now establish and analyze the JSONB GIN index before showing the EXPLAIN fixture.
@frobel0520
fix(unit): align before-fix discount fixtures
c982356 
The Unit lesson now derives all before-fix values from the documented discount-ignoring implementation.
@frobel0520
fix(git): enforce release command allowlist
1936e73 
The Git release simulator now accepts only documented canonical commands and leaves state unchanged for unsupported variants.
@frobel0520
fix(rest): enforce sequential lifecycle stages
60fa74d
@frobel0520
fix(deploy): cover base path mismatch scenario
f806064
@frobel0520
fix(cicd): cover dependency install failure
79abd53
@frobel0520
fix(logs): cover all declared redacted fields
a2618c7
@frobel0520
fix(a11y): complete file tab semantics
a54468f
@frobel0520
merge: reconcile main into dev
7617af3
@frobel0520
frobel0520 merged commit ef03afa into dev Aug 23, 2026
2 checks passed
@frobel0520
frobel0520 deleted the feature/reconcile-main-dev branch August 23, 2026 04:24
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.

1 participant

@frobel0520