wade-cli 1.2.14__tar.gz → 1.2.16__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {wade_cli-1.2.14 → wade_cli-1.2.16}/AGENTS.md +6 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/CHANGELOG.md +12 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/KNOWLEDGE.md +6 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/KNOWLEDGE.ratings.jsonl +17 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/PKG-INFO +13 -1
- {wade_cli-1.2.14 → wade_cli-1.2.16}/README.md +12 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/docs/dev/architecture.md +26 -1
- {wade_cli-1.2.14 → wade_cli-1.2.16}/pyproject.toml +1 -1
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/__init__.py +1 -1
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/git/branch.py +132 -17
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/git/repo.py +3 -2
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/implementation_service/draft_pr.py +4 -4
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/implementation_service/lifecycle.py +78 -52
- wade_cli-1.2.16/tests/concurrency/test_stash_race.py +201 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/e2e/test_implement_work_done_contract.py +40 -0
- wade_cli-1.2.16/tests/integration/test_scaffold_retarget.py +366 -0
- wade_cli-1.2.16/tests/unit/test_git/test_reset_collision_identity.py +68 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_implementation_service.py +197 -65
- {wade_cli-1.2.14 → wade_cli-1.2.16}/uv.lock +1 -1
- wade_cli-1.2.14/tests/concurrency/test_stash_race.py +0 -90
- {wade_cli-1.2.14 → wade_cli-1.2.16}/.gitattributes +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/.github/workflows/auto-version.yml +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/.github/workflows/ci.yml +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/.github/workflows/pr-title-lint.yml +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/.github/workflows/publish.yml +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/.github/workflows/release.yml +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/.gitignore +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/.pre-commit-config.yaml +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/.wade.yml +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/CONTRIBUTING.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/assets/wade.png +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/docker-compose.e2e.yml +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/docs/dev/crossby-native-planning-checkpoint.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/docs/dev/documentation-policies.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/docs/dev/extending.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/docs/dev/native-cli-plan-verification.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/docs/dev/skills-system.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/docs/dev/testing.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/docs/dev/workflows-and-skills.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/install.sh +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/scripts/auto_version.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/scripts/changelog.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/scripts/check-all.sh +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/scripts/check.sh +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/scripts/fmt.sh +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/scripts/hooks/pre-push +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/scripts/install-hooks.sh +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/scripts/probe_native_plan_handoff.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/scripts/release.sh +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/scripts/setup-worktree.sh +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/scripts/test-concurrency.sh +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/scripts/test-e2e-docker.sh +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/scripts/test-e2e.sh +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/scripts/test-live-ai-taskr.sh +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/scripts/test-live-ai.sh +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/scripts/test-live-gh.sh +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/scripts/test.sh +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/__main__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/cli/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/cli/admin.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/cli/autocomplete.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/cli/deps_session.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/cli/hook.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/cli/implementation_session.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/cli/knowledge.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/cli/main.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/cli/plan_session.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/cli/review.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/cli/review_pr_comments_session.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/cli/session.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/cli/session_shared.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/cli/skills.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/cli/task.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/cli/worktree.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/config/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/config/loader.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/config/migrations.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/config/schema.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/git/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/git/hooks.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/git/pr.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/git/stash.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/git/sync.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/git/worktree.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/hooks/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/hooks/cli.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/hooks/policies.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/logging/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/logging/context.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/logging/setup.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/models/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/models/batch.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/models/config.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/models/delegation.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/models/deps.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/models/events.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/models/hooks.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/models/interactive_plan.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/models/permission.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/models/plan_bundle.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/models/readiness.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/models/review.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/models/review_cycle.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/models/session.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/models/session_manifest.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/models/skill.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/models/task.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/models/workflow.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/models/worktree.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/providers/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/providers/_pr_delegate.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/providers/base.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/providers/clickup.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/providers/github.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/providers/markdown.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/providers/registry.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/ai_resolution.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/batch_review_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/bot_trigger.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/check_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/delegation_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/deps_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/documentation_receipt_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/implementation_service/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/implementation_service/_shared.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/implementation_service/batch.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/implementation_service/bootstrap.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/implementation_service/cleanup.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/implementation_service/core.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/implementation_service/done.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/implementation_service/sync.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/implementation_service/usage_tracking.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/init_service/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/init_service/auth.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/init_service/commands.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/init_service/config_io.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/init_service/manifest.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/init_service/migrations.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/init_service/prompts_ai.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/init_service/prompts_setup.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/init_service/shell.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/interactive_plan_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/knowledge_recovery.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/knowledge_search.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/knowledge_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/native_plan_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/plan_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/prompt_delivery.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/review_cycle_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/review_delegation_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/review_record_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/review_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/review_settle.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/session_composition_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/skill_diagnostics_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/skill_invocation_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/smart_start.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/services/task_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/skills/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/skills/catalog.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/skills/discovery.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/skills/doc_targets.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/skills/installer.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/skills/materializer.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/skills/pointer.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/skills/resolver.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/skills/validation.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/ui/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/ui/console.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/ui/prompts.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/utils/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/utils/body_markers.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/utils/clipboard.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/utils/conventional.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/utils/filelock.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/utils/gitref.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/utils/http.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/utils/install.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/utils/knowledge_file.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/utils/markdown.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/utils/markers.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/utils/paths.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/utils/plan_validation.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/utils/process.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/utils/runtime_env.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/utils/safe_state.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/utils/slug.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/utils/stale_base.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/utils/templates.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/utils/terminal.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/utils/token_usage_markdown.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/src/wade/utils/update_check.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/agents-pointer.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/hooks/commit-msg +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/hooks/pre-commit +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/hooks/pre-push +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/prompts/deps-analysis.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/prompts/implement-context.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/prompts/plan-session.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/prompts/review-batch.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/prompts/review-code.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/prompts/review-finding-admission.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/prompts/review-plan.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/prompts/review-pr-comments.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/prompts/review-result-batch.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/prompts/review-result-code.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/prompts/review-result-deps.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/prompts/review-result-full-branch.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/prompts/review-result-implementation.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/prompts/review-result-plan.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/prompts/review-result-pr-comments.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/prompts/session-start-implement.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/prompts/session-start-plan.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/prompts/session-start-review.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/setup-worktree.sh.example +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/skills/batch-review/SKILL.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/skills/code-review/SKILL.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/skills/dependency-analysis/SKILL.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/skills/feedback-fix-review/SKILL.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/skills/implementation/SKILL.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/skills/knowledge/SKILL.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/skills/plan-review/SKILL.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/skills/planning/SKILL.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/skills/review-comments/SKILL.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/skills/task/SKILL.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/skills/task/examples.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/skills/task/plan-format.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/skills/task/reference/session-summary-format.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/statusline-command.sh +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/workflows/_partials/completion.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/workflows/_partials/documentation-step.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/workflows/_partials/interaction-policy.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/workflows/_partials/knowledge-step.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/workflows/_partials/review-budget.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/workflows/implementation.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/workflows/plan.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/workflows/reference/documentation.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/workflows/reference/new-plan.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/workflows/reference/plan-output-contract.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/workflows/reference/pr-summary-format.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/workflows/reference/recovery.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/workflows/reference/session-summary-format.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/workflows/reference/tracking-issues.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/templates/workflows/review-pr-comments.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/concurrency/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/concurrency/test_batch_multi_pr.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/concurrency/test_knowledge_merge.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/concurrency/test_lock_retry.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/conftest.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/e2e/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/e2e/_support.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/e2e/conftest.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/e2e/mock_gh_script.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/e2e/test_admin_contract.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/e2e/test_check_contract.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/e2e/test_knowledge_contract.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/e2e/test_mock_gh_contract.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/e2e/test_plan_contract.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/e2e/test_review_contract.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/e2e/test_smart_start_contract.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/e2e/test_task_contract.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/e2e/test_work_sync_list_contract.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/fixtures/live/taskr_header_hi_body.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/fixtures/live/taskr_header_howdy_body.md +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/fixtures/transcripts/claude_session.txt +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/fixtures/transcripts/codex_session.txt +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/fixtures/transcripts/copilot_session.txt +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/fixtures/transcripts/generic_session.txt +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/integration/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/integration/test_auto_version.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/integration/test_autostash.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/integration/test_check.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/integration/test_dynamic_skill_sessions.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/integration/test_git.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/integration/test_implementation_lifecycle.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/integration/test_init.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/integration/test_knowledge.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/integration/test_markdown_provider.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/integration/test_skill_context_budget.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/integration/test_skill_install.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/live/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/live/test_wade_live_ai.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/live/test_wade_live_ai_taskr.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/live/test_wade_live_gh.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/test_cli_basics.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/conftest.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_cli/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_cli/test_autocomplete.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_cli/test_done_doc_pass_advisory.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_cli/test_done_review_hint.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_cli/test_knowledge_cli.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_cli/test_review_cli.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_cli/test_session_subapps.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_cli/test_shell_init.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_cli/test_skills_session_cli.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_cli/test_task_cli.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_cli/test_work_ai_flags.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_cli/test_work_cli.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_config/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_config/test_bot_review_config.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_config/test_dynamic_skill_config.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_config/test_loader.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_config/test_merge_strategy_migration.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_config/test_migrations.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_config/test_migrations_atomic.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_console.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_effort.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_git/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_git/test_all_patches_present.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_git/test_branch_list.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_git/test_branch_slugify.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_git/test_detached_worktree.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_git/test_is_merged_into.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_git/test_main_checkout_root.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_git/test_merge_count.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_git/test_pr_base.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_git/test_pr_lookup.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_git/test_pr_retry.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_git/test_pr_title.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_git/test_repo.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_git/test_reset_branch.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_git/test_scaffold_commit.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_git/test_stash_drop.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_git/test_sync_conflicted_files.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_git/test_tip_commit_is_empty.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_git/test_worktree_remove.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_hooks/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_hooks/test_hook_cli.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_hooks/test_policies.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_hooks/test_post_tool_use.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_hooks/test_session_start.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_models/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_models/test_batch.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_models/test_config_models.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_models/test_delegation.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_models/test_deps_models.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_models/test_deps_partition.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_models/test_review.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_models/test_review_expectation.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_models/test_task_models.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_models/test_workflow_models.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_permission_mode.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_providers/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_providers/test_clickup.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_providers/test_github.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_providers/test_github_pr.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_providers/test_markdown.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_scripts/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_scripts/test_auto_version.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_scripts/test_changelog.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_scripts/test_probe_native_plan_handoff.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_ai_resolution.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_batch_build_cmd.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_batch_pr_index.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_batch_review_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_bootstrap_allowlist.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_bootstrap_guard_matcher.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_bootstrap_hook_timeout.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_bootstrap_post_tool_use.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_bootstrap_pre_push.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_bootstrap_session_start.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_bot_trigger.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_catchup.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_catchup_reconcile.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_check.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_cleanup_loss_guard.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_codex_worktree_launch_context.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_delegation_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_deps_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_documentation_receipt.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_done_gates.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_done_idempotent.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_done_plan_flag.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_done_pr_body_read.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_done_pr_title_sync.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_draft_pr_base_fetch.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_draft_pr_retarget.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_implementation_done_sync.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_implementation_launch_context.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_implementation_service_resume.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_init.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_init_shell_integration.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_interactive_plan_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_knowledge_recovery.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_knowledge_search.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_knowledge_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_managed_git_hooks.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_native_plan_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_no_direct_git.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_plan_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_plan_startup_events.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_poll_for_reviews.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_post_implementation_lifecycle.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_pr_lookup_guards.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_pr_summary_path.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_pre_push_backstop.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_preserve_session_data.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_prompt_delivery.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_push_recovery.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_resolve_task_branch.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_resume_autonomy.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_review_cycle_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_review_delegation_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_review_receipts.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_review_records.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_review_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_review_status_block.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_skill_diagnostics_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_skill_invocation_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_smart_start.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_smart_start_resume.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_stale_base_surface.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_sync_base_branch.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_task_service.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_tracked_managed_files.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_services/test_worktree_gitignore.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_skills/test_crossby_contract.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_skills/test_doc_targets.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_skills/test_dynamic_skills.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_skills/test_generic_builtin_boundaries.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_skills/test_knowledge_attributes.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_skills/test_managed_gitignore.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_skills/test_pointer.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_skills/test_review_budget_partial.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_utils/__init__.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_utils/test_body_markers.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_utils/test_conventional.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_utils/test_filelock.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_utils/test_gitref.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_utils/test_http.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_utils/test_install.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_utils/test_markdown.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_utils/test_markers.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_utils/test_plan_validation.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_utils/test_process.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_utils/test_prompts.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_utils/test_runtime_env.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_utils/test_safe_state.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_utils/test_slug.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_utils/test_stale_base.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_utils/test_terminal.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_utils/test_terminal_launch.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_utils/test_update_check.py +0 -0
- {wade_cli-1.2.14 → wade_cli-1.2.16}/tests/unit/test_yolo.py +0 -0
|
@@ -114,6 +114,12 @@ CLI modules are thin dispatch — they parse flags via Typer, then call service
|
|
|
114
114
|
- **Synchronous Only**: No asyncio. Process-level parallelism via multiple terminals.
|
|
115
115
|
- **Pydantic Everywhere**: All data structures are Pydantic `BaseModel` subclasses, not dicts.
|
|
116
116
|
|
|
117
|
+
Scaffold retargets use a guarded git-layer hard reset: tracked edits and
|
|
118
|
+
untracked/ignored paths obstructing the pinned destination tree must refuse
|
|
119
|
+
before mutation. Noncolliding session output remains allowed. The guard also
|
|
120
|
+
applies to rollback; an obstructed rollback preserves data and reports manual
|
|
121
|
+
recovery, rather than claiming branch/PR consistency was restored.
|
|
122
|
+
|
|
117
123
|
## Design Principles
|
|
118
124
|
|
|
119
125
|
### Determinism via Services
|
|
@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
|
|
|
4
4
|
|
|
5
5
|
The format is based on [Conventional Commits](https://conventionalcommits.org/).
|
|
6
6
|
|
|
7
|
+
## [v1.2.16] — 2026-10-14
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
- restore post-merge stashes by identity across worktrees (#528) (d141f0b)
|
|
12
|
+
|
|
13
|
+
## [v1.2.15] — 2026-10-14
|
|
14
|
+
|
|
15
|
+
### Bug Fixes
|
|
16
|
+
|
|
17
|
+
- preserve untracked files when retargeting scaffold branches (#526) (8c51aee)
|
|
18
|
+
|
|
7
19
|
## [v1.2.14] — 2026-10-14
|
|
8
20
|
|
|
9
21
|
### Bug Fixes
|
|
@@ -791,3 +791,9 @@ For issue #480, delegation_service.delegate() remains the one dispatcher for dep
|
|
|
791
791
|
For issue #480 sandbox tests, the autouse conftest fixture clears both SANDBOX_SIGNAL_ENV_VARS and real Codex identity markers in CODEX_IDENTITY_ENV_VARS. Tests that need another enclosing runtime still set or clear competing identity markers deliberately; do not claim the fixture never clears identity markers.
|
|
792
792
|
|
|
793
793
|
---
|
|
794
|
+
|
|
795
|
+
## cce7d3161157 | 2026-10-14 | implementation | tags: git, stash, concurrency | Issue #493
|
|
796
|
+
|
|
797
|
+
`drop_stash_by_sha` verifies a positional stash ref before deleting it in a separate Git command; a competing push after verification can still shift that ref. Callers that must never delete another worktree's entry need to retain the owned stash after applying its captured SHA rather than assume verification makes deletion atomic. Inspect SHA/ref/message pairs and verify the chosen entry before manual cleanup.
|
|
798
|
+
|
|
799
|
+
---
|
|
@@ -192,6 +192,23 @@
|
|
|
192
192
|
{"dir": "stale", "event_id": "86da7ec333234953869f880b857ce682", "id": "6cd9b543", "ts": "2026-09-15T15:24:19.088735+00:00"}
|
|
193
193
|
{"dir": "up", "event_id": "5bf57cae39ae477f9295c18a3ac6d6c9", "id": "7c6526983755", "ts": "2026-09-16T22:22:59.183519+00:00"}
|
|
194
194
|
{"dir": "up", "event_id": "6cccca145ffa471abd9ee11f3c2d259b", "id": "2bc8b5ab31d3", "ts": "2026-09-24T18:50:40.963016+00:00"}
|
|
195
|
+
{"dir": "up", "event_id": "67a2e5a1810e4cc194a0c2f45ec5ea55", "id": "13459084", "ts": "2026-10-14T15:01:56.538334+00:00"}
|
|
196
|
+
{"dir": "up", "event_id": "e448d2ad-c2c7-5893-8024-3629031fae8d", "handoff_id": "79c68452-fc4e-4ef1-ac9a-1d664b4af3ad", "id": "851bb6ec", "ts": "2026-10-14T14:36:49.064147+00:00"}
|
|
197
|
+
{"dir": "up", "event_id": "18189d48-7acd-5df6-9462-c2369fb63050", "handoff_id": "79c68452-fc4e-4ef1-ac9a-1d664b4af3ad", "id": "4d419ec6629c", "ts": "2026-10-14T14:36:49.087316+00:00"}
|
|
198
|
+
{"dir": "stale", "event_id": "7c01d033-920b-52b5-a8b5-21aa95555c14", "handoff_id": "10da6311-38f1-4e5e-9298-4c36697b14d1", "id": "5d2c207a05e7", "ts": "2026-10-14T14:44:11.649935+00:00"}
|
|
199
|
+
{"dir": "up", "event_id": "414f2c62-62b0-5abf-a37b-63b1b318a0e3", "handoff_id": "10da6311-38f1-4e5e-9298-4c36697b14d1", "id": "7c6526983755", "ts": "2026-10-14T14:44:11.676327+00:00"}
|
|
200
|
+
{"dir": "stale", "event_id": "29d4c704-d33d-51dc-8547-c4c82f8aa5f6", "handoff_id": "10da6311-38f1-4e5e-9298-4c36697b14d1", "id": "e3197457516b", "ts": "2026-10-14T14:44:11.701802+00:00"}
|
|
201
|
+
{"dir": "up", "event_id": "a6dd2e53-46df-5552-b3da-a8f975dbfb87", "handoff_id": "10da6311-38f1-4e5e-9298-4c36697b14d1", "id": "59d157b2d6fb", "ts": "2026-10-14T14:44:11.726587+00:00"}
|
|
202
|
+
{"dir": "up", "event_id": "7342699b-5f40-5d2c-a3b2-2455cd93e88d", "handoff_id": "10da6311-38f1-4e5e-9298-4c36697b14d1", "id": "90d404af3f3c", "ts": "2026-10-14T14:44:11.753078+00:00"}
|
|
203
|
+
{"dir": "up", "event_id": "e62cf65c-922b-5e7b-b3c1-80394ff20cce", "handoff_id": "10da6311-38f1-4e5e-9298-4c36697b14d1", "id": "2bc8b5ab31d3", "ts": "2026-10-14T14:44:11.779052+00:00"}
|
|
204
|
+
{"dir": "up", "event_id": "8b01a42f-11fb-5050-bc76-5cc39633dbc0", "handoff_id": "10da6311-38f1-4e5e-9298-4c36697b14d1", "id": "0be3e1a62282", "ts": "2026-10-14T14:44:11.803153+00:00"}
|
|
205
|
+
{"dir": "stale", "event_id": "16909c2484254f4cb8a4968bc6b81f0f", "id": "5d2c207a05e7", "ts": "2026-10-14T14:56:15.412823+00:00"}
|
|
206
|
+
{"dir": "up", "event_id": "48186f86824242a8912941977e13e798", "id": "7c6526983755", "ts": "2026-10-14T14:56:15.653563+00:00"}
|
|
207
|
+
{"dir": "stale", "event_id": "7dec60cd4b6642a2853f241d80d01aae", "id": "e3197457516b", "ts": "2026-10-14T14:56:15.891260+00:00"}
|
|
208
|
+
{"dir": "up", "event_id": "98c08f8b7a0b4beabe6b1a0edcc888e0", "id": "59d157b2d6fb", "ts": "2026-10-14T14:56:16.122477+00:00"}
|
|
209
|
+
{"dir": "up", "event_id": "8888ada20be941ef96096e111f2a30e3", "id": "90d404af3f3c", "ts": "2026-10-14T14:56:16.360881+00:00"}
|
|
210
|
+
{"dir": "up", "event_id": "c457fd5c67b14e4ebede1a2ef246f188", "id": "2bc8b5ab31d3", "ts": "2026-10-14T14:56:16.615813+00:00"}
|
|
211
|
+
{"dir": "up", "event_id": "8c248c11e9904aea815f06b5e5b8bbeb", "id": "0be3e1a62282", "ts": "2026-10-14T14:56:16.893694+00:00"}
|
|
195
212
|
{"dir": "up", "event_id": "a0a414dbdfc44ee88b8c77d05e61ff26", "id": "4d419ec6629c", "ts": "2026-10-14T14:38:56.313716+00:00"}
|
|
196
213
|
{"dir": "up", "event_id": "f156766ddcf8451891f4d20ef9f6a9d4", "id": "851bb6ec", "ts": "2026-10-14T14:54:52.737233+00:00"}
|
|
197
214
|
{"dir": "up", "event_id": "5c97dee9-80d8-5d18-9a6a-637139e7bbc3", "handoff_id": "4fbe04a3-c1f7-4635-8820-8e1e90f04a17", "id": "cb42b47b0a78", "ts": "2026-10-14T14:44:55.828705+00:00"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.5
|
|
2
2
|
Name: wade-cli
|
|
3
|
-
Version: 1.2.
|
|
3
|
+
Version: 1.2.16
|
|
4
4
|
Summary: WADE — Workflow for AI-Driven Engineering
|
|
5
5
|
Project-URL: Homepage, https://github.com/ivanviragine/wade
|
|
6
6
|
Project-URL: Repository, https://github.com/ivanviragine/wade
|
|
@@ -387,6 +387,8 @@ wade implement 42 --base develop # branch from, target, and merge into develop
|
|
|
387
387
|
|
|
388
388
|
`--base` overrides the plan-declared base and retargets the existing draft PR to match. A malformed base value is rejected up front — whether declared in the plan (fails `wade plan-session done`) or passed as `--base` (fails fast when you run `wade implement`); a well-formed base branch that does not exist fails draft-PR creation with an actionable message. Changing the base of a PR whose work is already in flight — whether by re-running planning or by `wade implement --base` — is not applied silently: it requires explicit confirmation, because the branch's existing history cannot be moved onto the new base without discarding it.
|
|
389
389
|
|
|
390
|
+
A scaffold branch checked out in a worktree can be moved onto a different base only when its tracked files are clean and no untracked or ignored paths obstruct the destination tree. Colliding files, symlinks, and directories cause refusal before the branch or PR base changes; noncolliding generated session files remain allowed. Preserve or move the reported paths outside the affected worktree before retrying. Ignored files receive the same protection as ordinary untracked work. Retarget and rollback explicitly leave submodule worktrees unchanged, including when `submodule.recurse` is enabled; update submodules separately when needed.
|
|
391
|
+
|
|
390
392
|
## Reviews & bot triggers
|
|
391
393
|
|
|
392
394
|
WADE splits review into an **AI review pass** you or the agent can invoke, and
|
|
@@ -666,6 +668,16 @@ review outcome — reviewed at `<sha>`, reviewer changed, skipped via
|
|
|
666
668
|
binding's pass cap. A skipped, stale-reviewer, or never-run review is therefore
|
|
667
669
|
visible to reviewers rather than hidden in worktree state.
|
|
668
670
|
|
|
671
|
+
After a PR merge, WADE updates the main checkout and restores any tracked local
|
|
672
|
+
changes using the exact stash SHA it captured, even if another worktree pushes
|
|
673
|
+
its own stash meanwhile. WADE preserves any remaining owned stash entry after
|
|
674
|
+
restoration because removing a positional stash entry can race with another push. Inspect the
|
|
675
|
+
reported checkout with `git stash list --format='%H %gd %gs'` and verify the
|
|
676
|
+
selected entry matches the reported SHA before manually dropping its ref. If
|
|
677
|
+
restoration conflicts or its object is unavailable, follow the printed recovery
|
|
678
|
+
instructions; resolve conflicts before retrying the reported `stash apply <sha>`
|
|
679
|
+
command. Local recovery warnings do not mean the remote PR merge failed.
|
|
680
|
+
|
|
669
681
|
## Task Providers
|
|
670
682
|
|
|
671
683
|
WADE can pull tasks from three backends — pick one when you run `wade init`:
|
|
@@ -351,6 +351,8 @@ wade implement 42 --base develop # branch from, target, and merge into develop
|
|
|
351
351
|
|
|
352
352
|
`--base` overrides the plan-declared base and retargets the existing draft PR to match. A malformed base value is rejected up front — whether declared in the plan (fails `wade plan-session done`) or passed as `--base` (fails fast when you run `wade implement`); a well-formed base branch that does not exist fails draft-PR creation with an actionable message. Changing the base of a PR whose work is already in flight — whether by re-running planning or by `wade implement --base` — is not applied silently: it requires explicit confirmation, because the branch's existing history cannot be moved onto the new base without discarding it.
|
|
353
353
|
|
|
354
|
+
A scaffold branch checked out in a worktree can be moved onto a different base only when its tracked files are clean and no untracked or ignored paths obstruct the destination tree. Colliding files, symlinks, and directories cause refusal before the branch or PR base changes; noncolliding generated session files remain allowed. Preserve or move the reported paths outside the affected worktree before retrying. Ignored files receive the same protection as ordinary untracked work. Retarget and rollback explicitly leave submodule worktrees unchanged, including when `submodule.recurse` is enabled; update submodules separately when needed.
|
|
355
|
+
|
|
354
356
|
## Reviews & bot triggers
|
|
355
357
|
|
|
356
358
|
WADE splits review into an **AI review pass** you or the agent can invoke, and
|
|
@@ -630,6 +632,16 @@ review outcome — reviewed at `<sha>`, reviewer changed, skipped via
|
|
|
630
632
|
binding's pass cap. A skipped, stale-reviewer, or never-run review is therefore
|
|
631
633
|
visible to reviewers rather than hidden in worktree state.
|
|
632
634
|
|
|
635
|
+
After a PR merge, WADE updates the main checkout and restores any tracked local
|
|
636
|
+
changes using the exact stash SHA it captured, even if another worktree pushes
|
|
637
|
+
its own stash meanwhile. WADE preserves any remaining owned stash entry after
|
|
638
|
+
restoration because removing a positional stash entry can race with another push. Inspect the
|
|
639
|
+
reported checkout with `git stash list --format='%H %gd %gs'` and verify the
|
|
640
|
+
selected entry matches the reported SHA before manually dropping its ref. If
|
|
641
|
+
restoration conflicts or its object is unavailable, follow the printed recovery
|
|
642
|
+
instructions; resolve conflicts before retrying the reported `stash apply <sha>`
|
|
643
|
+
command. Local recovery warnings do not mean the remote PR merge failed.
|
|
644
|
+
|
|
633
645
|
## Task Providers
|
|
634
646
|
|
|
635
647
|
WADE can pull tasks from three backends — pick one when you run `wade init`:
|
|
@@ -1517,6 +1517,20 @@ including under YOLO. Successful vote flushing and cleanup remain required.
|
|
|
1517
1517
|
|
|
1518
1518
|
`wade implementation-session done` handles PR creation / update. The post-work lifecycle prompt handles the merge decision.
|
|
1519
1519
|
|
|
1520
|
+
After a successful remote merge, `lifecycle._pull_main_after_merge()` routes its
|
|
1521
|
+
bounded pull-recovery loop to the main checkout. It stashes tracked changes
|
|
1522
|
+
once with `git.stash.create_named_stash`, using the main checkout's actual
|
|
1523
|
+
branch, and carries the returned SHA/message through success and rollback.
|
|
1524
|
+
Restoration applies that exact SHA once; it never pops the shared stack or
|
|
1525
|
+
falls back to another entry. Successful apply preserves any remaining owned
|
|
1526
|
+
entry for manual cleanup: the shared `drop_stash_by_sha` helper verifies a positional ref
|
|
1527
|
+
before a separate drop, leaving a concurrent-push window this caller avoids by
|
|
1528
|
+
not deleting. Conflicts, unavailable identities, and stash-creation failures
|
|
1529
|
+
report recovery while preserving any remaining entries. Untracked move-aside
|
|
1530
|
+
and rollback ordering stay intact; local rollback is best effort rather than
|
|
1531
|
+
crash-safe or an exact no-op when restoration fails. Local warnings do not
|
|
1532
|
+
change the already-successful remote merge result.
|
|
1533
|
+
|
|
1520
1534
|
## Determinism via Services
|
|
1521
1535
|
|
|
1522
1536
|
All deterministic operations — git commands, state transitions, file manipulation, API calls — **must live in service/utility code**, never in AI agent reasoning. Agents are non-deterministic; code is deterministic. The boundary is:
|
|
@@ -1542,7 +1556,18 @@ When wade installs skills into a target project (per session, via worktree boots
|
|
|
1542
1556
|
**`wade implement`:**
|
|
1543
1557
|
- `--detach` — Launch AI in a new terminal tab/window (non-blocking). Uses `build_launch_command()` + `launch_in_new_terminal()`.
|
|
1544
1558
|
- `--cd` — Create worktree, print its path to stdout, and exit without launching AI. Deterministic setup still runs first (for example worktree bootstrap and draft-PR bootstrap when needed). Used internally by `wade cd`.
|
|
1545
|
-
- `--base <branch>` — Base branch to branch from, target, and merge into. Precedence at implement time: explicit `--base` (or the chain-derived base threaded by `--chain`) > the existing draft PR's base (read from the PR lookup's `baseRefName`, recorded at plan time from a plan file's optional `## Base Branch` section) > `config.project.main_branch` (or `detect_main_branch`). An explicit `--base` is validated for well-formedness up front (`is_valid_git_ref`, symmetric with the plan-declared path checked at plan-done) so a malformed value fails fast instead of surfacing later as a murkier "does not exist"; a chain-derived base is a generated branch name and always passes. Reading the base off the already-verified lookup (rather than a second `get_pr_base_branch` query, whose `None` conflates "no base" with "gh failed") avoids a silent fallback to `main`. The resolved base is persisted to `.wade/base_branch` before startup catchup so `sync`/`done` merge into it — and cleared when the effective base resolves back to `main` (e.g. `--base main` retargeting a reused worktree's PR), so a stale pin never keeps targeting the old base. `sync`/`done` treat the stored base as **authoritative**: they no longer gate on a local/`origin/<base>` existence check (which a single-branch / narrow-refspec clone can fail even for a valid base), and instead let the fetch/merge path surface an unresolvable base as an error rather than silently falling back to `main`. An explicit `--base` that differs from the draft PR's base retargets the PR via `update_pr_base`; a failed retarget aborts rather than leaving a stale base. Editing the PR base does **not** rewrite the head branch's ancestry, so a **scaffold-only** branch (only its scaffold commit beyond the old base) is first re-rooted on the new base and force-pushed (`reroot_scaffold_branch_for_retarget`, shared by the plan and implement retarget paths) — otherwise the old base's commits would leak into the new base's diff and merge into it. When the scaffold branch is **not** checked out it is moved with `git branch -f`; when it **is** checked out (the `wade implement --cd` case) it is re-rooted *in place* with a hard reset inside its worktree (`reset_worktree_hard`), since `git branch -f` refuses a checked-out branch. The reroot **aborts** rather than retarget onto a stale branch when it can't be done loss-free: an unresolvable old base (can't prove the branch is scaffold-only — a reset might discard commits), a checked-out worktree with uncommitted **tracked** changes (`has_tracked_changes`) or one whose path can't be resolved, or an unresolvable new base. A branch carrying **real work** (`_branch_has_real_work`: more than the scaffold commit past its base — measured against the local head or `origin/<branch>` when the head lives only on the remote) cannot be rewritten without discarding it, so `start()` guards that case — confirm in a TTY, else abort — instead of silently flipping the base and polluting the PR, mirroring the plan flow's `_base_retarget_is_safe`. `--chain` remains hidden and threads the previous task's branch as the next task's base (treated exactly like an explicit `--base`).
|
|
1559
|
+
- `--base <branch>` — Base branch to branch from, target, and merge into. Precedence at implement time: explicit `--base` (or the chain-derived base threaded by `--chain`) > the existing draft PR's base (read from the PR lookup's `baseRefName`, recorded at plan time from a plan file's optional `## Base Branch` section) > `config.project.main_branch` (or `detect_main_branch`). An explicit `--base` is validated for well-formedness up front (`is_valid_git_ref`, symmetric with the plan-declared path checked at plan-done) so a malformed value fails fast instead of surfacing later as a murkier "does not exist"; a chain-derived base is a generated branch name and always passes. Reading the base off the already-verified lookup (rather than a second `get_pr_base_branch` query, whose `None` conflates "no base" with "gh failed") avoids a silent fallback to `main`. The resolved base is persisted to `.wade/base_branch` before startup catchup so `sync`/`done` merge into it — and cleared when the effective base resolves back to `main` (e.g. `--base main` retargeting a reused worktree's PR), so a stale pin never keeps targeting the old base. `sync`/`done` treat the stored base as **authoritative**: they no longer gate on a local/`origin/<base>` existence check (which a single-branch / narrow-refspec clone can fail even for a valid base), and instead let the fetch/merge path surface an unresolvable base as an error rather than silently falling back to `main`. An explicit `--base` that differs from the draft PR's base retargets the PR via `update_pr_base`; a failed retarget aborts rather than leaving a stale base. Editing the PR base does **not** rewrite the head branch's ancestry, so a **scaffold-only** branch (only its scaffold commit beyond the old base) is first re-rooted on the new base and force-pushed (`reroot_scaffold_branch_for_retarget`, shared by the plan and implement retarget paths) — otherwise the old base's commits would leak into the new base's diff and merge into it. When the scaffold branch is **not** checked out it is moved with `git branch -f`; when it **is** checked out (the `wade implement --cd` case) it is re-rooted *in place* with a hard reset inside its worktree (`reset_worktree_hard`), since `git branch -f` refuses a checked-out branch. The reroot **aborts** rather than retarget onto a stale branch when it can't be done loss-free: an unresolvable old base (can't prove the branch is scaffold-only — a reset might discard commits), a checked-out worktree with uncommitted **tracked** changes (`has_tracked_changes`), untracked or ignored filesystem paths obstructing the destination tree, or one whose path can't be resolved, or an unresolvable new base. A branch carrying **real work** (`_branch_has_real_work`: more than the scaffold commit past its base — measured against the local head or `origin/<branch>` when the head lives only on the remote) cannot be rewritten without discarding it, so `start()` guards that case — confirm in a TTY, else abort — instead of silently flipping the base and polluting the PR, mirroring the plan flow's `_base_retarget_is_safe`. `--chain` remains hidden and threads the previous task's branch as the next task's base (treated exactly like an explicit `--base`).
|
|
1560
|
+
|
|
1561
|
+
Scaffold hard resets pin the destination commit and inspect its complete tree against
|
|
1562
|
+
the index and filesystem before mutation. The git-layer guard includes ignored
|
|
1563
|
+
files, empty/nested directories, symlinks without following them, and filesystem
|
|
1564
|
+
case aliases; inspection errors refuse. Tree-entry modes distinguish gitlinks:
|
|
1565
|
+
resets explicitly pass `--no-recurse-submodules` to leave submodule directories
|
|
1566
|
+
and their contents alone even when `submodule.recurse=true`.
|
|
1567
|
+
The same guard applies to scaffold
|
|
1568
|
+
rollback after a failed PR-base edit. An obstructed rollback preserves the new
|
|
1569
|
+
user data and reports the existing branch/PR divergence for manual recovery.
|
|
1570
|
+
This preflight does not provide isolation from concurrent filesystem writers.
|
|
1546
1571
|
|
|
1547
1572
|
**`wade implementation-session done`:**
|
|
1548
1573
|
- `target` (positional) — Optional issue number, worktree name, or plan file path. When a file path is given, creates the issue first; when a number/name, finds the worktree; when omitted, detects from current branch.
|
|
@@ -2,11 +2,14 @@
|
|
|
2
2
|
|
|
3
3
|
from __future__ import annotations
|
|
4
4
|
|
|
5
|
+
import os
|
|
6
|
+
import stat
|
|
7
|
+
import subprocess
|
|
5
8
|
from pathlib import Path
|
|
6
9
|
|
|
7
10
|
import structlog
|
|
8
11
|
|
|
9
|
-
from wade.git.repo import _run_git, _run_git_with_retry
|
|
12
|
+
from wade.git.repo import GitError, _run_git, _run_git_with_retry
|
|
10
13
|
from wade.utils.slug import slugify
|
|
11
14
|
|
|
12
15
|
log = structlog.get_logger(__name__)
|
|
@@ -153,26 +156,138 @@ def reset_branch(
|
|
|
153
156
|
_run_git_with_retry("branch", "-f", branch_name, start_point, cwd=repo_root)
|
|
154
157
|
|
|
155
158
|
|
|
156
|
-
def
|
|
157
|
-
"""
|
|
159
|
+
def _reset_inventory(worktree: Path, *args: str) -> tuple[str, ...]:
|
|
160
|
+
"""Read a NUL-delimited Git inventory without newline or quoted-path conversion."""
|
|
161
|
+
try:
|
|
162
|
+
result = subprocess.run(["git", *args], cwd=worktree, capture_output=True, check=True)
|
|
163
|
+
except (OSError, subprocess.CalledProcessError) as exc:
|
|
164
|
+
raise GitError(f"Cannot inspect reset paths in {worktree}: {exc}") from exc
|
|
165
|
+
if result.stdout and not result.stdout.endswith(b"\0"):
|
|
166
|
+
raise GitError(f"Invalid reset path inventory in {worktree}")
|
|
167
|
+
return tuple(os.fsdecode(path) for path in result.stdout.split(b"\0") if path)
|
|
158
168
|
|
|
159
|
-
``git branch -f`` refuses to move a checked-out branch, so re-root such a branch by
|
|
160
|
-
running ``git reset --hard`` *inside its worktree* instead. This discards uncommitted
|
|
161
|
-
changes to **tracked** files in that worktree (untracked files are left in place), so
|
|
162
|
-
callers must confirm the worktree carries no tracked changes first (see
|
|
163
|
-
:func:`wade.git.repo.has_tracked_changes`). Used to re-root a scaffold-only branch
|
|
164
|
-
that is checked out — e.g. after ``wade implement --cd`` — before retargeting its PR,
|
|
165
|
-
so the old base's commits don't leak into the new base's diff (#376 review).
|
|
166
169
|
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
start_point: Commit, branch, or tag to move the branch (and worktree) onto.
|
|
170
|
+
def _reset_collisions(worktree: Path, destination: str) -> tuple[str, ...]:
|
|
171
|
+
"""Find occupied untracked/ignored nodes the complete destination would replace.
|
|
170
172
|
|
|
171
|
-
|
|
172
|
-
|
|
173
|
+
Inspect filesystem occupancy rather than Git's ignored/untracked listing, which
|
|
174
|
+
can omit empty directories and collapse nested repositories. Never follow a
|
|
175
|
+
symlink. Resolve actual directory-entry spellings to handle case aliases on
|
|
176
|
+
filesystems that permit them, without conflating distinct hard-linked paths.
|
|
173
177
|
"""
|
|
174
|
-
|
|
175
|
-
|
|
178
|
+
indexed = _reset_inventory(worktree, "ls-files", "-z")
|
|
179
|
+
target = _reset_inventory(worktree, "ls-tree", "-r", "-z", destination)
|
|
180
|
+
# Path equality case-folds on Windows even in case-sensitive directories.
|
|
181
|
+
# Use exact actual spellings for cache and tracked identity on every host.
|
|
182
|
+
directories: dict[str, tuple[Path, ...]] = {}
|
|
183
|
+
|
|
184
|
+
def children(directory: Path) -> tuple[Path, ...]:
|
|
185
|
+
key = os.fspath(directory)
|
|
186
|
+
if key not in directories:
|
|
187
|
+
with os.scandir(directory) as entries:
|
|
188
|
+
directories[key] = tuple(sorted(Path(e.path) for e in entries))
|
|
189
|
+
return directories[key]
|
|
190
|
+
|
|
191
|
+
def entry(directory: Path, name: str) -> Path | None:
|
|
192
|
+
requested = directory / name
|
|
193
|
+
try:
|
|
194
|
+
info = requested.lstat()
|
|
195
|
+
except FileNotFoundError:
|
|
196
|
+
return None
|
|
197
|
+
entries = children(directory)
|
|
198
|
+
exact = next((path for path in entries if path.name == name), None)
|
|
199
|
+
if exact is not None:
|
|
200
|
+
return exact
|
|
201
|
+
# The requested spelling exists, but isn't the actual entry spelling.
|
|
202
|
+
# This can happen with case/Unicode aliases. Multiple inode matches are
|
|
203
|
+
# ambiguous (hard links); refusing is safer than treating user data as tracked.
|
|
204
|
+
aliases = [
|
|
205
|
+
path
|
|
206
|
+
for path in entries
|
|
207
|
+
if (details := path.lstat()).st_ino == info.st_ino and details.st_dev == info.st_dev
|
|
208
|
+
]
|
|
209
|
+
if len(aliases) != 1:
|
|
210
|
+
raise OSError(f"Cannot resolve filesystem spelling of {requested}")
|
|
211
|
+
return aliases[0]
|
|
212
|
+
|
|
213
|
+
def existing_index_path(name: str) -> Path | None:
|
|
214
|
+
parts = name.split("/")
|
|
215
|
+
node = worktree
|
|
216
|
+
for position, part in enumerate(parts):
|
|
217
|
+
found = entry(node, part)
|
|
218
|
+
if found is None:
|
|
219
|
+
return None
|
|
220
|
+
node = found
|
|
221
|
+
if position < len(parts) - 1 and not stat.S_ISDIR(node.lstat().st_mode):
|
|
222
|
+
return None
|
|
223
|
+
return node
|
|
224
|
+
|
|
225
|
+
collisions: set[str] = set()
|
|
226
|
+
try:
|
|
227
|
+
tracked = {
|
|
228
|
+
os.fspath(path) for name in indexed if (path := existing_index_path(name)) is not None
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
def inspect_replaced_directory(directory: Path) -> None:
|
|
232
|
+
contents = children(directory)
|
|
233
|
+
if not contents:
|
|
234
|
+
collisions.add(directory.relative_to(worktree).as_posix())
|
|
235
|
+
for child in contents:
|
|
236
|
+
if stat.S_ISDIR(child.lstat().st_mode):
|
|
237
|
+
inspect_replaced_directory(child)
|
|
238
|
+
elif os.fspath(child) not in tracked:
|
|
239
|
+
collisions.add(child.relative_to(worktree).as_posix())
|
|
240
|
+
|
|
241
|
+
for record in target:
|
|
242
|
+
header, delimiter, name = record.partition("\t")
|
|
243
|
+
mode = header.split(" ", 1)[0]
|
|
244
|
+
if not delimiter or mode not in {"100644", "100755", "120000", "160000"}:
|
|
245
|
+
raise GitError(f"Invalid reset tree inventory in {worktree}")
|
|
246
|
+
node = worktree
|
|
247
|
+
parts = name.split("/")
|
|
248
|
+
for position, part in enumerate(parts):
|
|
249
|
+
found = entry(node, part)
|
|
250
|
+
if found is None:
|
|
251
|
+
break
|
|
252
|
+
node = found
|
|
253
|
+
if not stat.S_ISDIR(node.lstat().st_mode):
|
|
254
|
+
if os.fspath(node) not in tracked:
|
|
255
|
+
collisions.add(node.relative_to(worktree).as_posix())
|
|
256
|
+
break
|
|
257
|
+
if position == len(parts) - 1 and mode != "160000":
|
|
258
|
+
# A default (non-recursive) reset leaves submodule directories
|
|
259
|
+
# and their contents in place. Gitlinks aren't file replacements.
|
|
260
|
+
inspect_replaced_directory(node)
|
|
261
|
+
except OSError as exc:
|
|
262
|
+
raise GitError(f"Cannot safely inspect reset paths in {worktree}: {exc}") from exc
|
|
263
|
+
return tuple(sorted(collisions))
|
|
264
|
+
|
|
265
|
+
|
|
266
|
+
def reset_worktree_hard(worktree_path: Path, start_point: str) -> None:
|
|
267
|
+
"""Reset a checked-out scaffold without overwriting untracked or ignored data.
|
|
268
|
+
|
|
269
|
+
Callers must first guard tracked edits. Pin the destination commit and inspect
|
|
270
|
+
the complete tree immediately before resetting. An obstruction or unknown
|
|
271
|
+
inspection result refuses without mutating the branch/index/worktree. This
|
|
272
|
+
also protects the scaffold rollback caller. Explicitly disable recursive
|
|
273
|
+
submodule resets regardless of user configuration: gitlink contents are not
|
|
274
|
+
part of this preflight. Concurrent filesystem writers after the inspection
|
|
275
|
+
are outside its guarantees.
|
|
276
|
+
"""
|
|
277
|
+
destination = _run_git(
|
|
278
|
+
"rev-parse", "--verify", "--end-of-options", f"{start_point}^{{commit}}", cwd=worktree_path
|
|
279
|
+
).stdout.strip()
|
|
280
|
+
collisions = _reset_collisions(worktree_path, destination)
|
|
281
|
+
if collisions:
|
|
282
|
+
paths = ", ".join(repr(path) for path in collisions)
|
|
283
|
+
raise GitError(
|
|
284
|
+
f"Reset in {worktree_path} would overwrite untracked or ignored paths: {paths}. "
|
|
285
|
+
"Preserve or move these paths outside the affected worktree before retrying."
|
|
286
|
+
)
|
|
287
|
+
log.info("branch.reset_worktree_hard", worktree=str(worktree_path), start_point=destination)
|
|
288
|
+
# Do not retry a destructive operation using a stale preflight. A transient
|
|
289
|
+
# lock failure is safe to retry through the guarded operation itself.
|
|
290
|
+
_run_git("reset", "--hard", "--no-recurse-submodules", destination, cwd=worktree_path)
|
|
176
291
|
|
|
177
292
|
|
|
178
293
|
def create_scaffold_commit(
|
|
@@ -355,8 +355,9 @@ def has_tracked_changes(path: Path) -> bool:
|
|
|
355
355
|
|
|
356
356
|
Ignores untracked files (``--untracked-files=no``): a freshly bootstrapped scaffold
|
|
357
357
|
worktree is full of untracked output (``.wade/``, ``PLAN.md``, installed skills) that
|
|
358
|
-
must not count as "dirty". Used to decide whether a checked-out scaffold branch can
|
|
359
|
-
|
|
358
|
+
must not count as "dirty". Used to decide whether a checked-out scaffold branch can
|
|
359
|
+
pass the tracked-edit prerequisite for a base retarget (#376 review).
|
|
360
|
+
The guarded hard reset separately checks untracked/ignored collisions.
|
|
360
361
|
|
|
361
362
|
Args:
|
|
362
363
|
path: Any directory inside the repo/worktree.
|
|
@@ -233,8 +233,8 @@ def reroot_scaffold_branch_for_retarget(
|
|
|
233
233
|
into *new_base* once the PR is retargeted (the later startup catchup merge
|
|
234
234
|
cannot remove them). When the branch is scaffold-only — only its scaffold commit
|
|
235
235
|
beyond *old_base* — rebuild it rooted on *new_base* and force-push; this is
|
|
236
|
-
|
|
237
|
-
checked-out case).
|
|
236
|
+
guarded whether or not it is checked out (an in-place hard reset refuses
|
|
237
|
+
untracked/ignored collisions in the checked-out case).
|
|
238
238
|
|
|
239
239
|
A real-work branch is left untouched (rewriting in-flight history is
|
|
240
240
|
destructive); the caller confirms/aborts that retarget separately (the plan flow
|
|
@@ -245,8 +245,8 @@ def reroot_scaffold_branch_for_retarget(
|
|
|
245
245
|
It **aborts** rather than retarget onto a stale branch when the reroot cannot be done
|
|
246
246
|
loss-free: an unresolvable *old* base (cannot prove the branch is scaffold-only — a
|
|
247
247
|
reset might discard real commits), a checked-out worktree carrying uncommitted tracked
|
|
248
|
-
changes
|
|
249
|
-
unresolvable *new* base / failed git op.
|
|
248
|
+
changes, untracked/ignored paths obstructing the destination tree, or one whose
|
|
249
|
+
path can't be resolved, or an unresolvable *new* base / failed git op.
|
|
250
250
|
|
|
251
251
|
Returns:
|
|
252
252
|
``True`` — safe to proceed with the PR-base edit: the branch was recreated,
|
|
@@ -16,9 +16,11 @@ from pathlib import Path
|
|
|
16
16
|
|
|
17
17
|
import structlog
|
|
18
18
|
from pydantic import BaseModel
|
|
19
|
+
from rich.markup import escape
|
|
19
20
|
|
|
20
21
|
from wade.git import pr as git_pr
|
|
21
22
|
from wade.git import repo as git_repo
|
|
23
|
+
from wade.git import stash as git_stash
|
|
22
24
|
from wade.git import worktree as git_worktree
|
|
23
25
|
from wade.git.repo import GitError
|
|
24
26
|
from wade.models.config import ProjectConfig
|
|
@@ -226,50 +228,63 @@ def _cleanup_empty_backup_dirs(main_root: Path) -> None:
|
|
|
226
228
|
backup_root.rmdir()
|
|
227
229
|
|
|
228
230
|
|
|
229
|
-
def
|
|
230
|
-
"""
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
231
|
+
def _restore_stash_or_warn(main_root: Path, stash_sha: str, stash_message: str) -> None:
|
|
232
|
+
"""Apply exactly the owned stash once; preserve any remaining entry for cleanup."""
|
|
233
|
+
location = escape(str(main_root))
|
|
234
|
+
identity = escape(f"{stash_sha} ({stash_message})")
|
|
235
|
+
command = f"git -C {shlex.quote(str(main_root))}"
|
|
236
|
+
try:
|
|
237
|
+
result = git_stash.apply_stash_by_sha(stash_sha, main_root)
|
|
238
|
+
diagnostic = result.stderr.strip() or result.stdout.strip()
|
|
239
|
+
restored = result.returncode == 0
|
|
240
|
+
except GitError as exc:
|
|
241
|
+
diagnostic = str(exc)
|
|
242
|
+
restored = False
|
|
243
|
+
if restored:
|
|
244
|
+
# drop_stash_by_sha verifies a positional ref before a separate drop.
|
|
245
|
+
# Another worktree can push between them, so never delete here.
|
|
246
|
+
console.warn(
|
|
247
|
+
f"Restored local changes in {location}; any remaining entry for stash {identity} "
|
|
248
|
+
"is retained (automatic cleanup skipped)."
|
|
249
|
+
)
|
|
250
|
+
console.hint(
|
|
251
|
+
escape(
|
|
252
|
+
f"Inspect {command} stash list --format='%H %gd %gs'; verify the "
|
|
253
|
+
"selected entry matches this SHA before manually dropping its ref."
|
|
254
|
+
)
|
|
255
|
+
)
|
|
256
|
+
return
|
|
257
|
+
console.warn(f"Could not restore stash {identity} in {location}: {escape(diagnostic)}")
|
|
258
|
+
console.hint(
|
|
259
|
+
escape(
|
|
260
|
+
f"Inspect conflicts with {command} status and resolve them before retrying "
|
|
261
|
+
f"{command} stash apply {stash_sha}. Inspect "
|
|
262
|
+
f"{command} stash list --format='%H %gd %gs' for any retained entry; "
|
|
263
|
+
"if its object is unavailable, recover it before applying. No stash was dropped."
|
|
264
|
+
)
|
|
265
|
+
)
|
|
235
266
|
|
|
236
267
|
|
|
237
268
|
def _pull_main_after_merge(repo_root: Path) -> None:
|
|
238
|
-
"""
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
after a successful pull brings the file back *tracked*, ``git stash pop``
|
|
258
|
-
would collide ("already exists, no checkout") on the common, expected wade
|
|
259
|
-
happy path (a previously-untracked managed file becoming tracked), turning
|
|
260
|
-
today's clean success into a noisy stash-conflict on essentially every
|
|
261
|
-
merge that introduces a managed file. Move-aside keeps the happy path
|
|
262
|
-
clean; the rollback below is what makes it atomic. Do not "fix" this back.
|
|
263
|
-
- **Local changes** to tracked files (e.g. ``wade init`` touching
|
|
264
|
-
``.gitignore``) → ``git stash`` (at most once), retry the pull, pop later.
|
|
265
|
-
|
|
266
|
-
On any terminal failure (cap reached, unknown error, or no movable file left
|
|
267
|
-
to make progress), the moved files are restored to their original paths and
|
|
268
|
-
any stash is popped **before** warning, so the tree returns to entry state.
|
|
269
|
-
|
|
270
|
-
Pulling main only makes sense in the *main checkout*: a ``git pull`` run from
|
|
271
|
-
a linked worktree (on a feature branch) would target the wrong branch, so we
|
|
272
|
-
resolve the main checkout root first.
|
|
269
|
+
"""Best-effort fast-forward of the main checkout after a completed PR merge.
|
|
270
|
+
|
|
271
|
+
A bounded loop resolves untracked collisions by moving files into
|
|
272
|
+
``.wade/pull-backups`` and tracked-change obstructions by creating one named
|
|
273
|
+
stash. Untracked files are deliberately not stashed: a successful pull may
|
|
274
|
+
introduce them as tracked files, making untracked stash restoration collide.
|
|
275
|
+
|
|
276
|
+
Carry the owned stash SHA through every retry and apply that exact object
|
|
277
|
+
once, on either success or rollback. Linked worktrees share a stash stack,
|
|
278
|
+
so never pop its top entry or hold a positional ref. Successful application
|
|
279
|
+
retains the owned entry for manual cleanup because positional deletion is
|
|
280
|
+
not atomic with identity verification. Apply failures retain any available
|
|
281
|
+
entry and report recovery instead of touching another worktree's stash.
|
|
282
|
+
|
|
283
|
+
On terminal pull failure, restore moved files before applying the owned
|
|
284
|
+
stash and printing the pull warning. Rollback is best effort, not an exact
|
|
285
|
+
no-op when restoration fails, and not crash-safe. On pull success, keep the
|
|
286
|
+
untracked backups and report them. All operations route to the main
|
|
287
|
+
checkout; local recovery warnings do not undo the completed remote merge.
|
|
273
288
|
"""
|
|
274
289
|
main_root = git_repo.main_checkout_root(repo_root)
|
|
275
290
|
|
|
@@ -278,7 +293,7 @@ def _pull_main_after_merge(repo_root: Path) -> None:
|
|
|
278
293
|
return
|
|
279
294
|
|
|
280
295
|
moved: list[tuple[Path, Path]] = []
|
|
281
|
-
|
|
296
|
+
stash_identity: tuple[str, str] | None = None
|
|
282
297
|
|
|
283
298
|
for _ in range(MAX_RESOLVE_ATTEMPTS):
|
|
284
299
|
stderr = result.stderr
|
|
@@ -293,13 +308,24 @@ def _pull_main_after_merge(repo_root: Path) -> None:
|
|
|
293
308
|
break
|
|
294
309
|
moved.extend(newly_moved)
|
|
295
310
|
elif _LOCAL_CHANGES_MARKER in stderr:
|
|
296
|
-
if
|
|
311
|
+
if stash_identity is not None:
|
|
297
312
|
# Already stashed once; a second local-changes error means the
|
|
298
313
|
# stash did not clear the obstruction, so re-stashing would loop.
|
|
299
314
|
break
|
|
300
|
-
|
|
315
|
+
try:
|
|
316
|
+
main_branch = git_repo.get_current_branch(main_root)
|
|
317
|
+
stash_identity = git_stash.create_named_stash("post-merge", main_branch, main_root)
|
|
318
|
+
except GitError as exc:
|
|
319
|
+
# Creation may have succeeded before identity lookup failed.
|
|
320
|
+
# Preserve any possible entry; never guess a SHA or pop it.
|
|
321
|
+
console.warn(escape(f"Could not create post-merge stash in {main_root}: {exc}"))
|
|
322
|
+
console.hint(
|
|
323
|
+
escape(
|
|
324
|
+
f"Inspect git -C {shlex.quote(str(main_root))} stash list "
|
|
325
|
+
"--format='%H %gs' before recovering any possible stash by SHA."
|
|
326
|
+
)
|
|
327
|
+
)
|
|
301
328
|
break
|
|
302
|
-
stashed = True
|
|
303
329
|
else:
|
|
304
330
|
# Unknown error class — nothing actionable to resolve.
|
|
305
331
|
break
|
|
@@ -307,21 +333,21 @@ def _pull_main_after_merge(repo_root: Path) -> None:
|
|
|
307
333
|
result = git_repo.pull_ff_only(main_root)
|
|
308
334
|
if result.returncode == 0:
|
|
309
335
|
# Success → finalize: keep moved files in the backup dir (with the
|
|
310
|
-
# existing notice) and
|
|
336
|
+
# existing notice) and apply only the stash identity we captured.
|
|
311
337
|
if moved:
|
|
312
338
|
console.warn("Backed up untracked files that collided with the merge:")
|
|
313
339
|
for _original, backup in moved:
|
|
314
340
|
console.detail(str(backup))
|
|
315
|
-
if
|
|
316
|
-
|
|
341
|
+
if stash_identity is not None:
|
|
342
|
+
_restore_stash_or_warn(main_root, *stash_identity)
|
|
317
343
|
return
|
|
318
344
|
|
|
319
|
-
# Terminal failure →
|
|
320
|
-
#
|
|
345
|
+
# Terminal failure → best-effort rollback before warning. Restore moved
|
|
346
|
+
# files first, apply the owned stash, and best-effort clear
|
|
321
347
|
# the now-empty backup dirs so nothing is stranded in .wade/pull-backups.
|
|
322
348
|
_restore_backed_up(moved)
|
|
323
|
-
if
|
|
324
|
-
|
|
349
|
+
if stash_identity is not None:
|
|
350
|
+
_restore_stash_or_warn(main_root, *stash_identity)
|
|
325
351
|
if moved:
|
|
326
352
|
_cleanup_empty_backup_dirs(main_root)
|
|
327
353
|
_warn_pull_sync_failed()
|