Repository navigation
revert: Undo merge of #767 into main - #778
Merged
Merged
Conversation
Restores main to pre-#767 tree while keeping work on feat/copilot-harness-migration. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
🟡 Changes recommended
The hook’s false warnings on valid Challenger receipts require correction before approval.
3 open issues
What changed in this PR
Reverts #767 from main, restoring the Local/Agent Host workflow while the harness migration remains on feat/copilot-harness-migration.
Changes:
- Restores prompt adapters, fixed model assignments, and human-selected handoffs.
- Reinstates prompt discovery across validators and context tooling.
- Removes SDK-specific coverage, migration plans, and cutover documentation.
Unresolved findings:
- Moderate, 3 votes: The subagent hook warns on valid
CHALLENGE COMPLETEreceipts. Restore receipt recognition and leave persisted findings validation to the review validator. - Nit, 2 votes: The requirements template contains a nonexistent, incorrectly resolved provenance link. Link to the existing Requirements agent.
- Nit, 1 vote: Deep-review batching omits the required output path and persisted-result handling. Use sequential calls or document the complete file-backed flow.
- Nit, 2 votes: Operational-safety allowlist guidance conflicts with mandatory human selection of main agents. Restrict overrides to permitted leaf workers.
A focused check reproduced the receipt warning; full test suites were not run.
| File | Description |
|---|---|
tools/tests/scripts/test_validate_review_ceiling.py |
Removes review-ceiling regression coverage. |
tools/tests/scripts/test_validate_question_batching.py |
Restores header-error assertion. |
tools/tests/scripts/test_skill_ownership.mjs |
Checks restored prompt adapters. |
tools/tests/scripts/test_risk_authorization.mjs |
Restores supporting-path assertion. |
tools/tests/scripts/test_phase_a_runtime_guidance.mjs |
Restores Local log fixture. |
tools/tests/scripts/test_native_log_parser.py |
Removes native-parser tests. |
tools/tests/scripts/test_host_adapters.mjs |
Restores Host entrypoint expectations. |
tools/tests/scripts/test_guidance_remediation.mjs |
Restores human-handoff assertions. |
tools/tests/scripts/test_context_baseline.mjs |
Restores prompt snapshot coverage. |
tools/tests/lib/npm-script-graph.test.mjs |
Restores prompt-root assertion. |
tools/tests/exec-plans/active/apex-workflow-audit.md |
Restores instruction link. |
tools/tests/bats/subagent-validation.bats |
Removes SDK hook fixtures. |
tools/scripts/validate-skills.mjs |
Restores Host replacement name. |
tools/scripts/validate-orphaned-content.mjs |
Includes planning prompt references. |
tools/scripts/validate-no-hardcoded-counts.mjs |
Removes archive exemption. |
tools/scripts/validate-models.mjs |
Requires mirrored model assignments. |
tools/scripts/validate-mcp-tool-refs.mjs |
Scans restored prompts. |
tools/scripts/validate-instruction-checks.mjs |
Restores prompt instruction checks. |
tools/scripts/validate-explorer-graph.mjs |
Restores prompt source roots. |
tools/scripts/validate-agent-registry.mjs |
Restores model cross-check behavior. |
tools/scripts/validate_question_batching.py |
Restores askQuestions validation. |
tools/scripts/snapshot-agent-context.sh |
Includes prompt roots. |
tools/scripts/safe-shell.mjs |
Restores prompt scanning and guidance. |
tools/scripts/lint-json.mjs |
Removes archive exclusion. |
tools/scripts/generate-model-catalog.mjs |
Restores assignment documentation. |
tools/scripts/generate-explorer-graph.mjs |
Restores prompts; removes built-in reviewer node. |
tools/scripts/diff-context-baseline.sh |
Restores prompt comparison categories. |
tools/scripts/check-repository-links.mjs |
Removes missing-file skip. |
tools/scripts/_lib/paths.mjs |
Restores prompt-root constants. |
tools/scripts/_lib/model-helpers.mjs |
Restores assignment descriptions. |
tools/schemas/workflow-graph.schema.json |
Restores reviewer-role description. |
tools/schemas/model-catalog.schema.json |
Restores fixed-model contract. |
tools/schemas/agent-scorecard.schema.json |
Restores assessment prompt reference. |
tools/schemas/agent-registry.schema.json |
Requires model metadata. |
tools/registry/count-manifest.json |
Restores Local prompt inventory. |
tools/plans/copilot-harness-migration/roadmap.md |
Removes migration roadmap. |
tools/plans/copilot-harness-migration/issues/CHM-08-release-readiness.md |
Removes release-readiness packet. |
tools/plans/copilot-harness-migration/issues/CHM-07-published-docs.md |
Removes documentation packet. |
tools/plans/copilot-harness-migration/issues/CHM-06-observability.md |
Removes telemetry packet. |
tools/plans/copilot-harness-migration/issues/CHM-05-mcp-hooks.md |
Removes MCP/hooks packet. |
tools/plans/copilot-harness-migration/issues/CHM-04-workflow-smoke.md |
Removes workflow-smoke packet. |
tools/plans/copilot-harness-migration/issues/CHM-03-worker-readiness.md |
Removes worker-readiness packet. |
tools/plans/copilot-harness-migration/issues/CHM-02-source-acceptance.md |
Removes source-acceptance packet. |
tools/plans/copilot-harness-migration/issues/CHM-01-ci-format.md |
Removes formatting packet. |
tools/apex-prompts/workflow-prompts/10-challenger-review.prompt.md |
Restores review adapter. |
tools/apex-prompts/workflow-prompts/09-diagnose-resource.prompt.md |
Restores diagnostics adapter. |
tools/apex-prompts/workflow-prompts/08-as-built.prompt.md |
Restores documentation adapter. |
tools/apex-prompts/workflow-prompts/07t-terraform-deploy.prompt.md |
Restores Terraform deployment adapter. |
tools/apex-prompts/workflow-prompts/07b-bicep-deploy.prompt.md |
Restores Bicep deployment adapter. |
tools/apex-prompts/workflow-prompts/06t-terraform-codegen.prompt.md |
Restores Terraform generation adapter. |
tools/apex-prompts/workflow-prompts/06b-bicep-codegen.prompt.md |
Restores Bicep generation adapter. |
tools/apex-prompts/workflow-prompts/05-iac-planner.prompt.md |
Restores planning adapter. |
tools/apex-prompts/workflow-prompts/04g-governance.prompt.md |
Restores governance adapter. |
tools/apex-prompts/workflow-prompts/04-design.prompt.md |
Restores design adapter. |
tools/apex-prompts/workflow-prompts/03-architect.prompt.md |
Restores architecture adapter. |
tools/apex-prompts/workflow-prompts/02-requirements.prompt.md |
Restores requirements adapter. |
tools/apex-prompts/workflow-prompts/00-resume-workflow.prompt.md |
Restores resume adapter. |
tools/apex-prompts/utility-prompts/review-imported-iac.prompt.md |
Restores imported-IaC adapter. |
tools/apex-prompts/utility-prompts/project-wide-review.prompt.md |
Restores project-review adapter. |
tools/apex-prompts/utility-prompts/plan-fourLayerAgentAssessment.prompt.md |
Restores assessment-history reference. |
tools/apex-prompts/utility-prompts/merge-sensei-free-pr.prompt.md |
Restores merge adapter. |
tools/apex-prompts/utility-prompts/execution-subagent.prompt.md |
Restores execution-contract reference. |
tools/apex-prompts/utility-prompts/execution-subagent-gpt.prompt.md |
Restores GPT worker reference. |
tools/apex-prompts/utility-prompts/context-audit.prompt.md |
Restores context-audit adapter. |
tools/apex-prompts/utility-prompts/assess-github-folder.prompt.md |
Restores folder-assessment adapter. |
tools/apex-prompts/utility-prompts/assess-agents.prompt.md |
Restores agent-assessment adapter. |
tools/apex-prompts/utility-prompts/as-built-from-azure.prompt.md |
Restores Azure discovery adapter. |
README.md |
Restores Local/Host overview. |
package.json |
Removes readiness command. |
eslint.config.mjs |
Removes archive exclusion. |
CHANGELOG.md |
Removes migration release notes. |
AGENTS.md |
Restores human-selected workflow contract. |
.github/workflows/ci.yml |
Removes extra Python setup. |
.github/terminology-blocklist.json |
Removes archive exemption. |
.github/skills/README.md |
Restores Host skill names. |
.github/skills/apex-workflow-start/SKILL.md |
Removes SDK workflow entrypoint. |
.github/skills/apex-workflow-engine/templates/workflow-graph.json |
Restores named Challenger worker. |
.github/skills/apex-workflow-engine/SKILL.md |
Restores human-handoff routing. |
.github/skills/apex-workflow-engine/references/review-imported-iac.md |
Restores Local routing and questions. |
.github/skills/apex-workflow-engine/references/project-wide-review.md |
Restores prompt inventory guidance. |
.github/skills/apex-workflow-engine/references/operational-safety.md |
Restores utility execution boundaries. |
.github/skills/apex-workflow-engine/references/handoff-validation-rules.md |
Restores named-worker validation rules. |
.github/skills/apex-iac-common/references/placeholder-scan-protocol.md |
Restores question-tool guidance. |
.github/skills/apex-iac-common/references/iac-planner-approval-gate.md |
Restores decision-panel tool reference. |
.github/skills/apex-iac-common/references/deploy-validation-checklist.md |
Restores placeholder-input guidance. |
.github/skills/apex-iac-common/references/deploy-shared-workflow.md |
Restores deployment question-tool guidance. |
.github/skills/apex-iac-common/references/codegen-shared-workflow.md |
Restores batched-question guidance. |
.github/skills/apex-iac-common/references/codegen-do-dont.md |
Restores reviewer and tool names. |
.github/skills/apex-host-workflow-start/SKILL.md |
Restores manual Host workflow entry. |
.github/skills/apex-host-git-commit/SKILL.md |
Restores manual Host commit entry. |
.github/skills/apex-host-debug-log-export/SKILL.md |
Restores manual Host export entry. |
.github/skills/apex-golden-principles/references/principles.md |
Restores human-selected review recovery. |
.github/skills/apex-github-operations/SKILL.md |
Restores Host commit reference. |
.github/skills/apex-github-operations/references/merge-sensei-free-pr.md |
Restores adapter and instruction links. |
.github/skills/apex-github-operations/references/git-commit.md |
Restores PR question-tool reference. |
.github/skills/apex-git-commit/SKILL.md |
Removes SDK commit entrypoint. |
.github/skills/apex-debug-log-export/SKILL.md |
Removes SDK export entrypoint. |
.github/skills/apex-context-management/SKILL.md |
Restores Local log-audit guidance. |
.github/skills/apex-context-management/references/context-audit.md |
Restores Local log locations. |
.github/skills/apex-context-management/references/audit-setup.md |
Restores Local audit prerequisites. |
.github/skills/apex-azure-governance-discovery/references/resume-checks.md |
Restores model-based freshness wording. |
.github/skills/apex-azure-governance-discovery/references/reconciliation-disposition.md |
Restores Challenger recovery ownership. |
.github/skills/apex-azure-governance-discovery/references/inline-resolution-gate.md |
Restores resolution question-tool reference. |
.github/skills/apex-azure-governance-discovery/references/baseline-check.md |
Restores baseline-selection interaction. |
.github/skills/apex-azure-defaults/references/vnet-planning.md |
Restores planning question terminology. |
.github/skills/apex-azure-defaults/references/plan-design-decisions.md |
Restores decision-panel references. |
.github/skills/apex-azure-defaults/references/cost-estimate-parent-contract.md |
Restores fixed routing summary. |
.github/skills/apex-azure-defaults/references/cost-alerts-baseline.md |
Restores email-input tool reference. |
.github/skills/apex-azure-defaults/references/adversarial-review-deep.md |
Restores named-worker batch guidance. |
.github/skills/apex-azure-artifacts/templates/01-requirements.template.md |
Restores provenance footer. |
.github/skills/apex-agent-authoring/SKILL.md |
Restores fixed-model authoring guidance. |
.github/skills/apex-agent-authoring/references/runtime-guardrails.md |
Restores human fallback guidance. |
.github/skills/apex-agent-authoring/references/assess-github-folder.md |
Restores Local adapter link. |
.github/skills/apex-agent-authoring/references/assess-agents.md |
Restores assessment reference paths. |
.github/skills/apex-agent-authoring/references/agent-file-structure.md |
Restores Local/Host metadata guidance. |
.github/prompts/apex-resume-workflow.prompt.md |
Restores Local resume command. |
.github/prompts/apex-git-commit.prompt.md |
Restores Local commit command. |
.github/prompts/apex-debug-log-export.prompt.md |
Restores Local export command. |
.github/instructions/sku-manifest.instructions.md |
Restores preference-input tool reference. |
.github/instructions/references/precedence-matrix.md |
Restores prompt instruction mappings. |
.github/instructions/no-interactive-shell.instructions.md |
Restores prompt scope and input guidance. |
.github/instructions/markdown.instructions.md |
Restores prompt Markdown scope. |
.github/instructions/context-optimization.instructions.md |
Restores Local/Host distinction. |
.github/instructions/agent-skills.instructions.md |
Restores split-harness entry guidance. |
.github/instructions/agent-operating-frame.instructions.md |
Restores human-handoff boundaries. |
.github/hooks/subagent-validation/subagent-validation.sh |
Restores legacy advisory handling. |
.github/copilot-instructions.md |
Restores fixed-model runtime boundaries. |
.github/CODEOWNERS |
Restores prompt ownership entries. |
.github/agents/09-diagnose.agent.md |
Restores model and direct interaction. |
.github/agents/_subagents/terraform-validate-subagent.agent.md |
Restores model; removes handshake. |
.github/agents/_subagents/terraform-plan-subagent.agent.md |
Restores model; removes handshake. |
.github/agents/_subagents/policy-precheck-subagent.agent.md |
Restores model; removes handshake. |
.github/agents/_subagents/cost-estimate-subagent.agent.md |
Restores model; removes handshake. |
.github/agents/_subagents/challenger-review-subagent.agent.md |
Restores model-based review metadata. |
.github/agents/_subagents/bicep-whatif-subagent.agent.md |
Restores model; removes handshake. |
.github/agents/_subagents/bicep-validate-subagent.agent.md |
Restores model; removes handshake. |
.archive/pre-cpharness/README.md |
Removes migration archive guidance. |
Review effort: Balanced
Comment on lines
+39
to
41
| # Challenger subagents must emit a structured findings array (checked before the | ||
| # generic length heuristic). | ||
| if "challenger" in lower: |
|
|
||
| _Requirements captured by [02-Requirements](../../../agents/02-requirements.agent.md) | ||
| using the [workflow entry contract](../../apex-workflow-engine/references/workflow-entry.md)._ | ||
| _Requirements captured using [plan-requirements.prompt.md](../../.github/prompts/plan-requirements.prompt.md) template_ |
Comment on lines
+23
to
+25
| - Workers use the [execution contract](execution-subagent.md): no user questions, | ||
| parent todos, nested delegation, or automatic model fallback. Explicit caller | ||
| allowlists control invocation despite recipient model-invocation flags. |
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.
Reverts #767 on
mainso the migration remains onfeat/copilot-harness-migrationwithout merging tomain.