Repository navigation
fix(journey): 다중 턴 상태·Lookup 필터·CLARIFY_OR_SCOPE 계약 및 AI Compose 배선 정비 (#811) - #862
Merged
SHcommit merged 1 commit intoNov 18, 2026
Merged
Conversation
|
Important
This repository does not receive automatic reviews because it has fewer than 10 stars.
|
Member
Author
|
연관 AI Engine PR 확인 완료: YRootLab/onmaru-ai-engine#84 (Plan/Execute staging runbook 기준 |
This was referenced Nov 19, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
배경
onmaru-ai-engine과의 Plan/Execute 다중 턴 연동 및 스테이징/운영 배포 준비 과정에서 확인된 Spring BE 측 누락 사항과 계약·인프라 배선을 정비합니다.(
onmaru.ai.plan-execute-enabled및ONMARU_AI_PLAN_EXECUTE_ENABLED기본값은 스테이징 합동 E2E 및 AI Engine 사전조건 충족 전까지 계속false를 유지합니다.)변경 사항
JdbcExplorationStore/ExplorationService/ExplorationState/InMemoryExplorationStore:base_version을 현재 탐색의state_version으로 기록하고pinned_refs/excluded_refs를 JSONB로 저장·복원하도록 수정해 2번째 이상 턴 및 Pin/Exclude가 영속화되도록 보완했습니다.JdbcJourneyCandidateProvider: AI 실패 시 Baseline 폴백 경로에서도excludedPlaceIds를 제외하도록 반영했습니다.CLARIFY_OR_SCOPE경로 및 재질문 전달PlanExecuteAiProposalClient,JourneyWorkerPlan,JourneyWorkerService,FinishRunCommand,JdbcJourneyRunStore:Route.CLARIFY_OR_SCOPE수신 시QueryGrant//execute호출을 생략하고CLARIFICATION_REQUIRED를 반환하며,resultStore.persist를 건너뛰어 기존board와state_version을 보존합니다.JourneyQueryToolResponse:status: "OK" | "NO_MATCH"필드를 포함하도록 확장했습니다.JourneyQueryToolController,PlaceQueryPort,JdbcPlaceQueryAdapter,ApprovedPlaceReader:placeIds(null=무제한,[]=0건,[...]=허용 목록)와excludedPlaceIds를LIMIT이전에 SQL에서 필터링하고PUBLISHED리비전을 함께 검사합니다.PlanAuthorityGateTests:pinnedPlaceIds존재 +proposedFilters.placeIds == null+ 5개 Retrieval Route +CLARIFY_OR_SCOPE게이트 승인 검증 추가ExecutionResultMapperCrossRepoTests:SQL_ONLY+NOT_RUN+ 빈places→NO_RESULTS매핑 검증 추가PlanExecuteAiProposalClientTests,JourneyWorkerServiceTests,JourneyQueryToolControllerTests,JdbcApprovedPlaceReadTests,JdbcDurableExplorationWorkerTests보강infra/lightsail/staging/compose.yaml(staging-ai-engine) 및infra/lightsail/compose.yaml(ai-engine)에ONMARU_AI_DB_DSN(ONMARU_DB_AI_RUNTIME_USER기반),database네트워크,depends_on: postgres를 연결했습니다.infra/lightsail/compose.yaml(ai-engine)에ONMARU_SPRING_BASE_URL을 추가했습니다.infra/lightsail/staging/compose.yaml의postgres이미지를pgvector포함 기본값(${ONMARU_POSTGRES_IMAGE:-onmaru/postgres:17-postgis-pgvector})으로 맞췄습니다.관련 이슈
검증
./gradlew :modules:journey:test :modules:catalog:test :apps:spring-api:test --tests "*PlanAuthorityGate*" --tests "*ExecutionResultMapperCrossRepo*" --tests "*PlanExecute*" --tests "*HttpAiPlanExecute*" --tests "*JourneyQueryTool*" --tests "*JdbcApprovedPlaceReadTests*" --tests "*JdbcDurableExplorationWorkerTests*" --tests "*JdbcExplorationStoreIntegrationTests*" --tests "*JdbcJourneyRunStoreTests*" --tests "*JourneyWorkerServiceTests*"통과./gradlew :apps:spring-api:test --tests "*JourneyContractE2ETests*" --tests "*ExplorationWebBoundaryTests*" --tests "*ExplorationSnapshotHydratorTests*" --tests "*ModuleBoundaryArchUnitTests*"통과./gradlew :modules:journey:test :modules:catalog:test :apps:spring-api:bootJar --no-daemon및git diff --check통과docker compose --env-file infra/lightsail/.env.example -f infra/lightsail/compose.yaml --profile ai-engine config --quiet및docker compose --env-file infra/lightsail/staging/.env.example -f infra/lightsail/staging/compose.yaml config --quiet통과node --test scripts/test/deploy-pipeline.test.mjs scripts/test/production-blue-green-deploy.test.mjs scripts/test/staging-release-gate.test.mjs(29 passed, 0 failed)