84 lines
6.4 KiB
Markdown
84 lines
6.4 KiB
Markdown
---
|
|
name: handover-2026-04-23
|
|
type: reference
|
|
tags: [handover, session, kon, consolidation]
|
|
description: Session handover — 2026/04/23 branch consolidation + main-in-its-best-state pass
|
|
---
|
|
|
|
# Kon Handover — 2026/04/23
|
|
|
|
Consolidation session. Jake asked for "all branches to main and the repo in its best state" ahead of Corbie rebrand. This session brought outstanding Dependabot PRs into `main`, cleaned workspace lints, recovered an orphan stash onto a dedicated branch, and established a clean baseline for the post-rebrand push.
|
|
|
|
## Rebrand note
|
|
|
|
The product is in the process of being renamed **Kon → Corbie**. As of 2026/04/23 the canonical product name in any new copy (grant applications, landing pages) is **Corbie** (sentence case). The GitHub repo `jakejars/kon` and the Gitea repo `jake/kon` both still carry the `kon` name, intentionally — repo rename is pending Jake's own hand and is not blocking the rebrand copy-wise. Code paths (`crates/`, `src-tauri/`, package name `kon@0.1.0`) remain as-is until the repo rename lands; renaming the codebase identifiers is a separate coordinated sweep. See `memory/project_corbie_rebrand.md` in CORBEL-Main for the full rebrand state.
|
|
|
|
## What shipped this session
|
|
|
|
### Baseline validation
|
|
- Fresh `cargo build`, `cargo test --workspace`, `cargo fmt --check`, `npm run check`, `npm run build` run against the pre-consolidation tip (`9b0067b`, tagged as `pre-consolidation-2026-04-23` for recovery).
|
|
- `npm run build` initially failed with a missing-dependency error for `@chenglou/pretext`. Root cause: stale partial `node_modules` install dated 2026-04-21 07:45 — the directory for the package existed but was empty. `npm install` recovered it; package is present in lockfile and needed by `src/lib/utils/textMeasure.ts`.
|
|
- `cargo clippy -- -D warnings` initially failed with 3 errors in `crates/storage/src/file_storage.rs` (two doc-list overindentations, one needless return). These were trivial style issues that clippy had never enforced at CI strictness.
|
|
|
|
### Workspace clippy cleanup (commit `fe61661`)
|
|
- Applied `cargo clippy --fix` across 11 files: `crates/audio`, `crates/hotkey`, `crates/storage`, `crates/transcription`, `src-tauri`.
|
|
- Net -2 lines. No behavioural changes — pure lint cleanup (needless returns, unnecessary casts, `iter().any()` → `contains()`, `repeat().take()` → `repeat_n`, lifetime elision, `map_or` simplification, reference-immediately-dereferenced).
|
|
- One remaining warning left untouched: `needless_range_loop` at `src-tauri/src/commands/live.rs:1089` — clippy's suggested iterator rewrite would make it less readable. Earmarked for a focused refactor session.
|
|
- Build + 245 workspace tests remain green post-fix.
|
|
|
|
### Dependabot merges (commits `6579c5f`, `0b1c492`, `509b983`)
|
|
Three dev-dep bumps landed as `--no-ff` merge commits:
|
|
|
|
| # | Package | File changes |
|
|
|---|---|---|
|
|
| 1 | `picomatch` | `package-lock.json` only |
|
|
| 2 | `@sveltejs/kit` | `package.json` + `package-lock.json` |
|
|
| 3 | `vite` (npm_and_yarn group) | `package.json` + `package-lock.json` |
|
|
|
|
After the three merges: `npm install` clean, `npm run build` green, `npm run check` 0 errors / 0 warnings. Vulnerability count went from 6 (1 low / 2 moderate / 3 high) to 5 (3 low / 2 moderate) — the three highs cleared.
|
|
|
|
### Orphan-stash recovery (branch `feat/design-system-recover`, commit `8855db8`)
|
|
- A WIP stash sat on `stash@{0}`, pinned to parent commit `1296173` — the tip of the deleted `feat/design-system` branch. ~1000 LOC across 24 files: `ai-formatting/rule_based.rs` rewrite, `transcription/local_engine.rs`, core `hardware.rs` + `recommendation.rs`, `audio/resample.rs`, and a sweep across Svelte UI (`TaskSidebar`, `FilesPage`, `TasksPage`, `WipTaskList`, `ModelDownloader`, `Titlebar`, `viewer`, `float`).
|
|
- Recovered using `git stash branch`, which creates a branch from the stash's parent commit and applies the stash content. Parent commit still existed in the reflog even though no branch referenced it.
|
|
- Committed the full recovery as `wip(design-system): recover orphan stash` on the new branch. **Not merged to main.** Needs a focused rebase session: heavy conflicts expected in `TasksPage`, `FilesPage`, `ai-formatting/rule_based.rs`, and `transcription/local_engine.rs` against current main since those all saw release-blocker fixes after the stash was taken. Also missing the 2026-04-23 clippy cleanup.
|
|
- Branch pushed to `github` for remote preservation.
|
|
|
|
## Release-blocker state (unchanged this session)
|
|
|
|
From `docs/issues/README.md`:
|
|
|
|
- **0 open CRITICAL**
|
|
- **1 open MAJOR** — RB-08 `power-assertion-macos-objc2` (awaits manual runtime verification on a real macOS machine: `pmset -g assertions` during a background live-session)
|
|
- **11 RBs resolved**
|
|
- **11 CR items resolved** from the 2026-04-22 code review
|
|
|
|
RB-08 continues to gate v0.1 tagging.
|
|
|
|
## Deferred (unchanged from 2026/04/19 handover unless noted)
|
|
|
|
- **RB-08 verification** — needs macOS hardware access
|
|
- **Design-system work** — parked on `feat/design-system-recover`; revisit in a dedicated session
|
|
- **`live.rs:1089` needless_range_loop refactor** — clippy suggestion is ugly, deserves a real rewrite
|
|
- **Kon → Corbie codebase rename** — package name, crate prefixes, repo name on Gitea + GitHub. Coordinated sweep, not yet scheduled
|
|
- **Transparent windows**, **file-system export**, **bulk select/export**, **LLM content tags**, **Settings UX overhaul**, **Task 7 walk-through** — all carried over from 2026-04-19 handover
|
|
- **CI clippy enforcement** — 1 warning remains on main; turning on `-D warnings` in CI means either fixing it or explicit `#[allow]`
|
|
|
|
## Repo state at session end
|
|
|
|
- `main` at `509b983` — 7 commits ahead of origin at session start (1 clippy + 3 dependabot original commits + 3 merge commits)
|
|
- `feat/design-system-recover` at `8855db8` — WIP recovery, pushed to `github` only
|
|
- Tags: `pre-consolidation-2026-04-23` points at `9b0067b` (restore anchor)
|
|
- Stashes: none
|
|
- Dependabot branches: still present locally; can be pruned now that merges landed
|
|
|
|
## Full pre-push verification (Phase 5)
|
|
|
|
Run at end of session — see commit log after `509b983` for the verification commit, and `outputs/` for the full log.
|
|
|
|
## Anchors
|
|
|
|
- Previous handover: [HANDOVER-2026-04-19.md](HANDOVER-2026-04-19.md)
|
|
- Release-blocker index: [docs/issues/README.md](docs/issues/README.md)
|
|
- Rebrand memory: `~/.claude/projects/-home-jake-Documents-CORBEL-Main/memory/project_corbie_rebrand.md`
|
|
- Active-focus upstream: `context/active-focus.md` in CORBEL-Main
|