Audit recent session logs for notes workflow friction incidents

[c0da-ricon]

Problem

Notes-managed repos are still creating recurring live-session friction around updating, merging, staging, committing, and pushing notes. The individual failures are familiar, but we do not have a single incident ledger that shows frequency, root causes, and which tool fixes would remove the most pain.

Or explicitly asked whether one of us could go through recent session logs and pin all instances where agents ran into difficulties trying to update or commit notes.

Seed search

Initial rough search command used by c0da on 2026-06-09:

sessions search \
  'Cannot merge binary files|CONFLICT \\(content\\): Merge conflict in notes|Unmerged note content conflicts|ignored by one of your .gitignore files|tracked deleted obfuscated|deleted obfuscated|stale-readable|notes/.manifest.*CONFLICT|ERROR: Staged files should be encrypted|readable note.*ignored' \
  --after 2026-06-01 \
  --context 3 \
  --limit 200 \
  --tools \
  --json

That first pass found 200 matches across 8 sessions before deduping/classifying. Raw local scratch artifact from c0da's run: /tmp/c0da-notes-friction-difficulty.json.

Seed incidents / patterns to classify

These are not exhaustive; they are examples from the first search plus live friction from the current c0da session.

1. Encrypted note content conflicts during upstream integration.

   • Session 019e7a7e-82b5-7230-bfa4-2386fb075365, 2026-06-01 13:40: rebase hit Cannot merge binary files: notes/1474d5a8, CONFLICT (content): Merge conflict in notes/1474d5a8.
   • Session 019e7a9d-a3f8-72c2-a51e-67a7ac2c1050, 2026-06-01 13:48: merge hit Cannot merge binary files: notes/11444553.
   • Current c0da session, 2026-06-09: home status merge hit notes/1474d5a8; fold merge hit conflicts in agent-patterns.md and BULLETIN.md (notes/380af7f5, notes/ff7fe32a). Resolved with notes conflicts, manual plaintext merge, copy into obfuscated paths, git add.
   • Related: Shape a helper for applying resolved encrypted-note conflicts #120 (helper for applying resolved encrypted-note conflicts).

2. Readable note path staging confusion.

   • Session 019e7a9d-a3f8-72c2-a51e-67a7ac2c1050, 2026-06-01 13:40: git add notes/brownie.md failed because readable notes are ignored; correct workflow is notes stage.
   • This is mostly documented now via notes-managed-repo-workflow, but the frequency is worth measuring.

3. Stale readable-note orphans after upstream note deletion/rename.

   • Session 019e7a83-92cb-77d9-a05e-878b87ca4854, 2026-06-01: Rho/fold case where a removed/renamed upstream note remained as ignored readable notes/session-cleanup-card.md, making notes changes --summary report a misleading new: note.
   • Captured as Prevent stale readable-note orphans after upstream note deletion #107, now closed, but should appear in the friction ledger as one resolved category.

4. Obfuscation hook side effects / surprising dirty state.

   • Current c0da session, 2026-06-09: after committing a fold note inventory, git pre-push caught a tracked deleted obfuscated note (notes/8f899524, agent-wake-chains.md) even though notes changes --summary was clean. Restoring the obfuscated path fixed the push.
   • Needs classification: was this stale local state, hook behavior, or an agent workflow mistake?

5. Manifest / obfuscated-file conflicts make normal git tools misleading.

   • Several June 1 sessions include manual docs/explanations of why standard git mergetool does not apply to encrypted binary note blobs. These are good evidence for prioritizing helper UX rather than more prose docs.

Desired output

Create a compact incident ledger from recent session logs, with one row per real friction event:

Date	Agent/session	Repo	Symptom	Root cause	Workaround used	Existing issue	Proposed fix

Then use the ledger to decide which fixes matter most. Candidate fixes may include:

• notes resolve / notes merge --apply for applying resolved plaintext conflicts (Shape a helper for applying resolved encrypted-note conflicts #120);
• better pre-push/pre-commit diagnostics when obfuscated tracked files are deleted but readable surface is clean;
• stronger stale-readable cleanup/quarantine guarantees (verify Prevent stale readable-note orphans after upstream note deletion #107 fully closed the class);
• friendlier guidance when users try git add notes/<readable>.md;
• a session-log search command or canned query for notes maintainers.

Boundaries

• Do not dump private transcript chunks into the issue. Use session ids, dates, symptoms, and sanitized snippets.
• Cross-home agent logs can contain private memory. Keep the ledger at symptom/root-cause level unless the involved agent/Or explicitly wants details published.
• Avoid turning normal successful notes stage / Auto-obfuscating output into incidents; count only friction, failures, surprising dirty state, or confusion.

Related

• Shape a helper for applying resolved encrypted-note conflicts #120 — Shape a helper for applying resolved encrypted-note conflicts.
• Prevent stale readable-note orphans after upstream note deletion #107 — Prevent stale readable-note orphans after upstream note deletion (closed; include as resolved category).
• pull can fail on hidden assume-unchanged manifest while status is clean #90 — pull can fail on hidden assume-unchanged manifest while status is clean.
• fold notes/resolving-encrypted-notes-merge-conflicts.md.
• fold notes/notes-managed-repo-workflow.md.