chore: bump version to 9.0.13
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Alex Newman
@@ -0,0 +1,52 @@
|
||||
# Phase 02: Resolve Conflicts and Merge PR #722 - In-Process Worker Architecture
|
||||
|
||||
PR #722 replaces spawn-based worker startup with in-process architecture. Hook processes become the worker when port 37777 is free, eliminating Windows spawn issues. This PR has merge conflicts that must be resolved before merging.
|
||||
|
||||
## Tasks
|
||||
|
||||
- [ ] Checkout PR #722 and assess conflict scope:
|
||||
- `git fetch origin bugfix/claude-md-index`
|
||||
- `git checkout bugfix/claude-md-index`
|
||||
- `git merge main` to see conflicts
|
||||
- List all conflicting files
|
||||
|
||||
- [ ] Resolve merge conflicts in each affected file:
|
||||
- For each conflict, understand both sides:
|
||||
- Main branch changes (likely from PR #856 merge)
|
||||
- PR #722 changes (in-process worker architecture)
|
||||
- Preserve both sets of functionality where possible
|
||||
- Key files likely affected:
|
||||
- `src/services/worker-service.ts`
|
||||
- `src/services/queue/SessionQueueProcessor.ts`
|
||||
- `plugin/hooks/hooks.json`
|
||||
|
||||
- [ ] Run tests after conflict resolution:
|
||||
- `npm test`
|
||||
- All tests must pass (761+ expected)
|
||||
- Report any failures with details
|
||||
|
||||
- [ ] Run build after conflict resolution:
|
||||
- `npm run build`
|
||||
- Verify no TypeScript errors
|
||||
- Verify all artifacts are generated
|
||||
|
||||
- [ ] Code review the in-process worker changes:
|
||||
- Verify `worker-service.ts` hook case starts WorkerService in-process when port free
|
||||
- Verify `hook-command.ts` has `skipExit` option
|
||||
- Verify `hooks.json` uses single chained command
|
||||
- Verify `worker-utils.ts` `ensureWorkerRunning()` returns boolean
|
||||
|
||||
- [ ] Commit conflict resolution and push:
|
||||
- `git add .`
|
||||
- `git commit -m "chore: resolve merge conflicts with main"`
|
||||
- `git push origin bugfix/claude-md-index`
|
||||
|
||||
- [ ] Merge PR #722 to main:
|
||||
- Wait for CI to pass after push
|
||||
- `gh pr merge 722 --squash --delete-branch`
|
||||
- Verify merge succeeded
|
||||
|
||||
- [ ] Run post-merge verification:
|
||||
- `git checkout main && git pull origin main`
|
||||
- `npm test` to confirm tests pass on main
|
||||
- `npm run build` to confirm build works
|
||||
@@ -0,0 +1,54 @@
|
||||
# Phase 03: Resolve Conflicts and Merge PR #700 - Windows Terminal Popup Fix
|
||||
|
||||
PR #700 eliminates Windows Terminal popups by removing spawn-based daemon startup. The worker `start` command now becomes daemon directly instead of spawning a child process. This PR has merge conflicts and may have significant overlap with PR #722 (in-process worker).
|
||||
|
||||
## Tasks
|
||||
|
||||
- [ ] Checkout PR #700 and assess conflict scope:
|
||||
- `git fetch origin bugfix/spawners`
|
||||
- `git checkout bugfix/spawners`
|
||||
- `git merge main` to see conflicts
|
||||
- List all conflicting files
|
||||
- Assess if changes overlap significantly with already-merged PR #722
|
||||
|
||||
- [ ] Evaluate if PR #700 is still needed:
|
||||
- PR #722 (in-process worker) may have already addressed the same Windows spawn issues
|
||||
- Compare the changes in both PRs
|
||||
- If #722 fully supersedes #700, close #700 with explanation
|
||||
- Otherwise proceed with conflict resolution
|
||||
|
||||
- [ ] If proceeding, resolve merge conflicts:
|
||||
- Key files likely affected:
|
||||
- `src/services/worker-service.ts` (daemon startup changes)
|
||||
- `src/services/sync/ChromaSync.ts` (windowsHide removal)
|
||||
- `plugin/hooks/hooks.json` (command changes)
|
||||
- Preserve functionality from main while adding non-spawn daemon behavior
|
||||
|
||||
- [ ] Run tests after conflict resolution:
|
||||
- `npm test`
|
||||
- All tests must pass
|
||||
- Report any failures with details
|
||||
|
||||
- [ ] Run build after conflict resolution:
|
||||
- `npm run build`
|
||||
- Verify no TypeScript errors
|
||||
|
||||
- [ ] Code review the Windows-specific changes:
|
||||
- Verify worker `start` command becomes daemon directly (no child spawn)
|
||||
- Verify `restart` command removal (users do stop then start)
|
||||
- Verify windowsHide removal from ChromaSync
|
||||
|
||||
- [ ] Commit conflict resolution and push:
|
||||
- `git add .`
|
||||
- `git commit -m "chore: resolve merge conflicts with main"`
|
||||
- `git push origin bugfix/spawners`
|
||||
|
||||
- [ ] Merge PR #700 to main:
|
||||
- Wait for CI to pass after push
|
||||
- `gh pr merge 700 --squash --delete-branch`
|
||||
- Verify merge succeeded
|
||||
|
||||
- [ ] Run post-merge verification:
|
||||
- `git checkout main && git pull origin main`
|
||||
- `npm test` to confirm tests pass
|
||||
- `npm run build` to confirm build works
|
||||
@@ -0,0 +1,54 @@
|
||||
# Phase 04: Resolve Conflicts and Merge PR #657 - CLI Generate/Clean Commands
|
||||
|
||||
PR #657 adds `claude-mem generate` and `claude-mem clean` CLI commands with cross-platform support. It also fixes validation gaps that caused deleted folders to be recreated from stale DB records, and adds automatic shell alias installation. This PR has merge conflicts.
|
||||
|
||||
## Tasks
|
||||
|
||||
- [ ] Checkout PR #657 and assess conflict scope:
|
||||
- `git fetch origin bugfix/jan10-bug-2`
|
||||
- `git checkout bugfix/jan10-bug-2`
|
||||
- `git merge main` to see conflicts
|
||||
- List all conflicting files
|
||||
|
||||
- [ ] Resolve merge conflicts:
|
||||
- Key files likely affected:
|
||||
- `src/services/worker-service.ts` (generate/clean command cases)
|
||||
- `plugin/scripts/smart-install.js` (CLI installation)
|
||||
- Preserve all existing functionality while adding CLI commands
|
||||
|
||||
- [ ] Run tests after conflict resolution:
|
||||
- `npm test`
|
||||
- All tests must pass
|
||||
- Report any failures with details
|
||||
|
||||
- [ ] Run build after conflict resolution:
|
||||
- `npm run build`
|
||||
- Verify no TypeScript errors
|
||||
|
||||
- [ ] Test the CLI commands manually:
|
||||
- `bun plugin/scripts/worker-service.cjs generate --dry-run`
|
||||
- `bun plugin/scripts/worker-service.cjs clean --dry-run`
|
||||
- Both should exit with code 0
|
||||
- Review output for sensible behavior
|
||||
|
||||
- [ ] Code review the CLI implementation:
|
||||
- Verify `src/cli/claude-md-commands.ts` exports generate/clean functions
|
||||
- Verify validation fixes in `regenerateFolder()` (folder existence check)
|
||||
- Verify path traversal prevention
|
||||
- Verify cross-platform path handling (`toDbPath()`, `toFsPath()`)
|
||||
|
||||
- [ ] Commit conflict resolution and push:
|
||||
- `git add .`
|
||||
- `git commit -m "chore: resolve merge conflicts with main"`
|
||||
- `git push origin bugfix/jan10-bug-2`
|
||||
|
||||
- [ ] Merge PR #657 to main:
|
||||
- Wait for CI to pass after push
|
||||
- `gh pr merge 657 --squash --delete-branch`
|
||||
- Verify merge succeeded
|
||||
|
||||
- [ ] Run post-merge verification:
|
||||
- `git checkout main && git pull origin main`
|
||||
- `npm test` to confirm tests pass
|
||||
- `npm run build` to confirm build works
|
||||
- Verify CLI commands still work: `bun plugin/scripts/worker-service.cjs generate --dry-run`
|
||||
@@ -0,0 +1,46 @@
|
||||
# Phase 05: Test and Merge PR #863 - Ragtime Email Investigation
|
||||
|
||||
PR #863 adds email investigation mode via `CLAUDE_MEM_MODE` environment variable. Each file is processed in a new session with context managed by Claude-mem hooks. It includes configurable transcript cleanup to prevent buildup. This PR has no merge conflicts and CI is passing.
|
||||
|
||||
## Tasks
|
||||
|
||||
- [ ] Checkout and verify PR #863:
|
||||
- `git fetch origin claude/setup-ragtime-epstein-analysis-JApkL`
|
||||
- `git checkout claude/setup-ragtime-epstein-analysis-JApkL`
|
||||
- Verify the branch is up to date with origin
|
||||
|
||||
- [ ] Rebase onto main to incorporate previous PR merges:
|
||||
- `git rebase main`
|
||||
- If conflicts arise, resolve them
|
||||
- Push with `git push --force-with-lease origin claude/setup-ragtime-epstein-analysis-JApkL`
|
||||
|
||||
- [ ] Run the full test suite:
|
||||
- `npm test`
|
||||
- All tests must pass
|
||||
- Report any failures
|
||||
|
||||
- [ ] Run the build:
|
||||
- `npm run build`
|
||||
- Verify no TypeScript errors
|
||||
|
||||
- [ ] Code review the ragtime implementation:
|
||||
- Understand the `CLAUDE_MEM_MODE` environment variable usage
|
||||
- Review session-per-file processing approach
|
||||
- Review transcript cleanup configuration (default 24h)
|
||||
- Verify environment variable configuration for paths and settings
|
||||
|
||||
- [ ] Evaluate if this feature belongs in main:
|
||||
- This appears to be an experimental/specialized feature
|
||||
- Consider if it should be merged or kept as experimental branch
|
||||
- If appropriate for main, proceed with merge
|
||||
- If experimental, document status and skip merge
|
||||
|
||||
- [ ] If proceeding, merge PR #863 to main:
|
||||
- `gh pr merge 863 --squash --delete-branch`
|
||||
- Verify merge succeeded
|
||||
|
||||
- [ ] Run final verification:
|
||||
- `git checkout main && git pull origin main`
|
||||
- `npm test` to confirm all tests pass
|
||||
- `npm run build` to confirm build works
|
||||
- Verify all 5 PRs are now merged
|
||||
Reference in New Issue
Block a user