wendkeep 0.75.1 → 0.75.3

package/CHANGELOG.md

@@ -4,6 +4,29 @@ All notable changes to **wendkeep** are documented here. Format based on
 [Keep a Changelog](https://keepachangelog.com/en/1.1.0/); this project follows
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.75.3] — 2026-08-20
+
+### Fixed
+
+- **Sync seguro no self-checkout.** O instalador agora reconhece o repositório do próprio
+  WendKeep e migra hooks Claude/Codex para `node ./bin/wendkeep.mjs` sem duplicá-los. Projetos
+  consumidores continuam usando `npx --no-install`, e executar `sync` no checkout de
+  desenvolvimento não reintroduz a autodependência publicada.
+
+## [0.75.2] — 2026-08-20
+
+### Fixed
+
+- **Handoffs legados reescopáveis.** `memory rescope` agora separa individualmente eventos
+  `handoff.latest` ambíguos quando a sessão de origem é comprovável. A migração permanece
+  append-only, não escolhe vencedor e conserva ambiguidades reais dentro da mesma work session.
+- **Curadoria proporcional.** `memory curate` mostra conflitos acionáveis por padrão; `--all`
+  inclui handoffs de sessões encerradas com status/change sanitizados e permite `H` para encerrar
+  em lote somente recomendações seguras, sempre com confirmação e releitura entre decisões.
+- **Diagnóstico sem falso bloqueio.** O doctor separa conflitos acionáveis de handoffs históricos
+  reparáveis no mesmo snapshot. Dívida histórica isolada gera atenção e orienta `memory rescope`,
+  sem degradar a memória nem ocultar a contagem restante.
+
 ## [0.75.1] — 2026-08-20
 
 ### Fixed

package/README.en.md

@@ -180,6 +180,10 @@ later stages. An invalid `.wendkeep.json` stops at `init` without falling back t
 The install stays outside `sync` on purpose: a running process cannot replace itself and
 keep going — the code in memory would still be the old one.
 
+In WendKeep's own development checkout, do not install `wendkeep` in `devDependencies`. Use
+`node ./bin/wendkeep.mjs sync --project . --yes`: the installer recognizes the self-checkout and
+keeps hooks on the working tree without duplicating consumer `npx` commands.
+
 In a **pnpm** monorepo the install command differs (`npm` in a pnpm repo fails with
 `Cannot read properties of null (reading 'matches')`). Resolve the published version first and
 reuse exactly the value returned:
@@ -413,10 +417,13 @@ CAS-migrated on both the attempt and `memory_checkpoint` to the correct physical
 backup/audit; divergent mirrors fail closed. A demonstrably superseded
 ambiguity uses `memory reconcile <session> --by-session <successor>
 --reason <reason>` as a dry run and requires `--apply`; the decision is backed up and audited
-without rewriting ledger, CORE, or notes. Run `status --gate` again afterwards. Conflicts require
-explicit, durable curation. Start with `memory curate --vault <vault>`: the menu groups conflicts
-under friendly names, shows sanitized previews, and confirms every write with default `no`. Skip
-or quit and run it again to resume. In a non-TTY environment, use
+without rewriting ledger, CORE, or notes. Run `status --gate` again afterwards. `memory rescope`
+append-only separates legacy handoffs with proven identity even when they already participate in
+candidates; it never selects a winner. Actionable conflicts require explicit, durable curation.
+Start with `memory curate --vault <vault>`: the menu shows actionable conflicts only, groups them
+under friendly names, shows sanitized previews, and confirms every write with default `no`.
+`memory curate --all` includes proven historical handoffs and lets `H` batch-close them after
+confirmation. In a non-TTY environment, use
 `memory candidates --active --vault <vault>` to list only safe IDs and metadata in read-only mode —
 it does not expose memory values or content. After human review,
 `memory promote <id> --event <event-id>` selects one event from the candidate, while

package/README.md

@@ -180,6 +180,10 @@ later stages. An invalid `.wendkeep.json` stops at `init` without falling back t
 The install stays outside `sync` on purpose: a running process cannot replace itself and
 keep going — the code in memory would still be the old one.
 
+In WendKeep's own development checkout, do not install `wendkeep` in `devDependencies`. Use
+`node ./bin/wendkeep.mjs sync --project . --yes`: the installer recognizes the self-checkout and
+keeps hooks on the working tree without duplicating consumer `npx` commands.
+
 In a **pnpm** monorepo the install command differs (`npm` in a pnpm repo fails with
 `Cannot read properties of null (reading 'matches')`). Resolve the published version first and
 reuse exactly the value returned:
@@ -413,10 +417,13 @@ CAS-migrated on both the attempt and `memory_checkpoint` to the correct physical
 backup/audit; divergent mirrors fail closed. A demonstrably superseded
 ambiguity uses `memory reconcile <session> --by-session <successor>
 --reason <reason>` as a dry run and requires `--apply`; the decision is backed up and audited
-without rewriting ledger, CORE, or notes. Run `status --gate` again afterwards. Conflicts require
-explicit, durable curation. Start with `memory curate --vault <vault>`: the menu groups conflicts
-under friendly names, shows sanitized previews, and confirms every write with default `no`. Skip
-or quit and run it again to resume. In a non-TTY environment, use
+without rewriting ledger, CORE, or notes. Run `status --gate` again afterwards. `memory rescope`
+append-only separates legacy handoffs with proven identity even when they already participate in
+candidates; it never selects a winner. Actionable conflicts require explicit, durable curation.
+Start with `memory curate --vault <vault>`: the menu shows actionable conflicts only, groups them
+under friendly names, shows sanitized previews, and confirms every write with default `no`.
+`memory curate --all` includes proven historical handoffs and lets `H` batch-close them after
+confirmation. In a non-TTY environment, use
 `memory candidates --active --vault <vault>` to list only safe IDs and metadata in read-only mode —
 it does not expose memory values or content. After human review,
 `memory promote <id> --event <event-id>` selects one event from the candidate, while

package/docs/en/commands/maintenance-and-diagnostics.md

@@ -104,6 +104,10 @@ dry-run path before any write.
   the evidence, and then use
   `memory promote <candidate-id> --event <event-id> --vault <vault>` to select an event or
   `memory reject <candidate-id> --vault <vault>` to keep the current operational value.
+- Historical handoffs from closed sessions are repairable debt, not actionable conflicts. Run
+  `memory rescope --vault <vault>` first and review the dry run, then apply with `--apply`. If debt
+  remains, `memory curate --all --vault <vault>` shows context and offers `H` to batch-close safe
+  recommendations only, always after confirmation.
 - `legacy`/`degraded`/`stale`/`manifest-unproven` observability: run
   `npx --no-install wendkeep cost rebuild --session <id> --json --vault <vault>`, review diagnostics,
   and only then authorize the second variant with `--apply`.

package/docs/en/commands/memory.md

@@ -28,7 +28,7 @@ Pass the vault explicitly in automation. Preserve backups and evidence before re
 
 ```bash
 npx wendkeep memory status [--gate] --vault <vault>
-npx wendkeep memory curate --vault <vault>
+npx wendkeep memory curate [--all] --vault <vault>
 npx wendkeep memory candidates [--active] --vault <vault>
 npx wendkeep memory rescope [--apply] --vault <vault>
 npx wendkeep memory repair --vault <vault>
@@ -43,12 +43,14 @@ npx wendkeep validate-memory --vault <v2-vault>
 ## Options and exit codes
 
 - `memory status` is read-only; `--gate` exits `1` only for blocking state.
-- `memory curate` is the recommended human path: in an interactive terminal it groups each
-  conflict under a friendly name, shows sanitized previews only, and offers numbered choices,
-  `P` to skip, `R` to reject, `D` for technical details, and `Q` to quit. Every promotion or
-  rejection asks for confirmation with default `no`: Enter or `N` does not write. Skip or quit
-  leaves the remaining work pending; running the command again resumes the active conflicts.
-- The assistant accepts only `--vault`: there is no `--yes`, `--apply`, or batch mode. In a
+- `memory curate` is the recommended human path and shows actionable conflicts only by default.
+  In an interactive terminal it groups conflicts under friendly names, shows sanitized previews
+  and context, and offers numbered choices, `P` to skip, `R` to reject, `D` for technical details,
+  and `Q` to quit. `--all` includes handoffs from proven closed sessions; for those, `H` batch-closes
+  only safe recommendations while reloading authority between decisions. Every write asks for
+  confirmation with default `no`: Enter or `N` does not write. Skip or quit preserves the
+  remaining conflicts so a later run can resume them.
+- The assistant accepts `--vault` and `--all`: there is no `--yes` or `--apply`. In a
   non-TTY environment it exits `2` without changing bytes and recommends the advanced fallback
   `memory candidates --active`.
 - `memory candidates` is read-only and prints deterministic JSON containing only `candidate_id`,
@@ -98,8 +100,10 @@ npx wendkeep validate-memory --vault <v2-vault>
   decision is idempotent.
 - `memory rescope` is a dry run by default and lists only planned IDs, keys, and scopes. With
   `--apply`, it appends explicit project, work-session, change, branch, or worktree events while
-  preserving historic bytes as the ledger prefix. Ambiguous candidates are neither migrated nor
-  assigned a winner; retry returns `unchanged`.
+  preserving historic bytes as the ledger prefix. Legacy `handoff.latest` events inside candidates
+  are also rescoped individually when they carry proven session identity, separating independent
+  workflows without selecting a winner. Ambiguities that remain inside one scope stay under human
+  curation; retry returns `unchanged`.
 - Registers such as `git.local-head`, `handoff.latest`, `quality.latest-*`, and
   `change.<slug>.status` compete only inside the same scope. Automatic resolution still requires
   the same project and causal lineage; incompatible decisions, constraints, and blockers remain

package/docs/pt-BR/commands/maintenance-and-diagnostics.md

@@ -102,6 +102,10 @@ ou sem manifest comprovado e oferece um caminho dry-run antes de qualquer escrit
   liste os IDs seguros com `memory candidates --active --vault <cofre>`, revise a evidência e use
   `memory promote <candidate-id> --event <event-id> --vault <cofre>` para selecionar um evento ou
   `memory reject <candidate-id> --vault <cofre>` para manter o valor operacional atual.
+- Handoffs históricos de sessões encerradas são dívida reparável, não conflito acionável. Rode
+  primeiro `memory rescope --vault <cofre>` e revise o dry-run; aplique com `--apply`. Se restar
+  dívida, `memory curate --all --vault <cofre>` mostra o contexto e oferece `H` para encerrar em
+  lote somente as recomendações seguras, sempre com confirmação.
 - Observabilidade `legacy`/`degraded`/`stale`/`manifest-unproven`: rode
   `npx --no-install wendkeep cost rebuild --session <id> --json --vault <cofre>`, revise diagnostics
   e só então autorize a segunda variante com `--apply`.

package/docs/pt-BR/commands/memory.md

@@ -28,7 +28,7 @@ Informe o vault explicitamente em automações. Preserve backups e evidências a
 
 ```bash
 npx wendkeep memory status [--gate] --vault <cofre>
-npx wendkeep memory curate --vault <cofre>
+npx wendkeep memory curate [--all] --vault <cofre>
 npx wendkeep memory candidates [--active] --vault <cofre>
 npx wendkeep memory rescope [--apply] --vault <cofre>
 npx wendkeep memory repair --vault <cofre>
@@ -43,12 +43,14 @@ npx wendkeep validate-memory --vault <cofre-v2>
 ## Opções e códigos de saída
 
 - `memory status` é read-only; `--gate` retorna exit `1` apenas para estado bloqueante.
-- `memory curate` é o caminho recomendado para pessoas: em um terminal interativo, agrupa cada
-  conflito por nome amigável, mostra somente previews sanitizados e oferece escolhas numeradas,
-  `P` para pular, `R` para rejeitar, `D` para detalhes técnicos e `Q` para sair. Cada promoção ou
-  rejeição pede confirmação com padrão negativo: Enter ou `N` não grava. Pular ou sair deixa o
-  restante pendente; uma nova execução retoma os conflitos ainda ativos.
-- O assistente aceita somente `--vault`: não há `--yes`, `--apply` ou modo em lote. Em ambiente
+- `memory curate` é o caminho recomendado para pessoas: por padrão mostra somente conflitos
+  acionáveis. Em um terminal interativo, agrupa por nome amigável, mostra previews e contexto
+  sanitizados e oferece escolhas numeradas, `P` para pular, `R` para rejeitar, `D` para detalhes
+  técnicos e `Q` para sair. `--all` inclui handoffs de sessões comprovadamente encerradas; nesses
+  casos, `H` encerra em lote somente as recomendações seguras, relendo a autoridade entre cada
+  decisão. Toda escrita pede confirmação com padrão negativo: Enter ou `N` não grava. Pular ou
+  sair preserva o restante para retomar em outra execução.
+- O assistente aceita `--vault` e `--all`: não há `--yes` nem `--apply`. Em ambiente
   não-TTY/terminal não interativo, ele retorna exit `2` sem alterar bytes e orienta usar o fallback
   avançado `memory candidates --active`.
 - `memory candidates` é read-only e imprime JSON determinístico com somente `candidate_id`,
@@ -98,8 +100,10 @@ npx wendkeep validate-memory --vault <cofre-v2>
   notas, nem consome a outbox. Repetir a mesma decisão aplicada é idempotente.
 - `memory rescope` é dry-run por padrão e lista somente IDs, chaves e escopos planejados. Com
   `--apply`, anexa eventos explícitos de projeto, work session, change, branch ou worktree e mantém
-  os bytes históricos como prefixo do ledger. Candidates ambíguos não são migrados nem recebem
-  vencedor; uma repetição retorna `unchanged`.
+  os bytes históricos como prefixo do ledger. Eventos legados de `handoff.latest` que participam
+  de candidates também são reescopados individualmente quando possuem identidade de sessão
+  comprovável: isso separa workflows independentes sem selecionar vencedor. Ambiguidades que
+  permanecem no mesmo escopo continuam sob curadoria; uma repetição retorna `unchanged`.
 - Registradores como `git.local-head`, `handoff.latest`, `quality.latest-*` e
   `change.<slug>.status` só competem dentro do mesmo escopo. Resolução automática ainda exige o
   mesmo projeto e linhagem causal; decisões, constraints e blockers incompatíveis permanecem sob

package/hooks/vault-health.mjs

@@ -18,6 +18,7 @@ import { detectMemoryMode, LEGACY_MEMORY_WARNING } from './memory-mode.mjs';
 import { deriveMemoryProjection } from './memory-store.mjs';
 import { assertVaultPathSafe, assertVaultPathsSafe } from './vault-path-safety.mjs';
 import { validateMemoryBundle } from '../src/validate-memory.mjs';
+import { isHistoricalHandoffCandidate } from '../packages/vault/src/memory-candidate-policy.mjs';
 
 const DEFAULT_PENDING_PATTERNS = [
   /^- \[ \] Revisar resumo da sessão$/i,
@@ -115,6 +116,12 @@ const memoryCandidatesCommand = (vaultBase) => (
 const memoryCurateCommand = (vaultBase) => (
   `${WENDKEEP_COMMAND} memory curate --vault ${quoteCommandArgument(vaultBase)}`
 );
+const memoryCurateAllCommand = (vaultBase) => (
+  `${WENDKEEP_COMMAND} memory curate --all --vault ${quoteCommandArgument(vaultBase)}`
+);
+const memoryRescopeCommand = (vaultBase, { apply = false } = {}) => (
+  `${WENDKEEP_COMMAND} memory rescope${apply ? ' --apply' : ''} --vault ${quoteCommandArgument(vaultBase)}`
+);
 
 const MEMORY_KEY_PURPOSES = new Map([
   ['handoff.latest', 'próximo handoff'],
@@ -231,6 +238,7 @@ function memoryMetrics() {
     pendingOutbox: 0,
     candidates: 0,
     activeConflicts: 0,
+    repairableHandoffs: 0,
     semanticStatus: null,
     semanticCode: null,
     semanticActiveKeys: [],
@@ -497,7 +505,12 @@ export function checkMemoryBundle(vaultBase, { registry } = {}) {
   warnings.push(...lifecycle.warnings);
 
   const unresolved = candidates.items.filter((item) => !['resolved', 'rejected', 'superseded'].includes(item?.status));
-  const activeConflicts = unresolved.filter((item) => item?.reason === 'conflict');
+  const allConflicts = unresolved.filter((item) => item?.reason === 'conflict');
+  const historicalHandoffs = allConflicts.filter(
+    (item) => isHistoricalHandoffCandidate(item, effectiveRegistry),
+  );
+  const historicalIds = new Set(historicalHandoffs.map((item) => item.candidate_id));
+  const activeConflicts = allConflicts.filter((item) => !historicalIds.has(item.candidate_id));
   const ordinaryCandidates = unresolved.filter((item) => item?.reason !== 'conflict');
   if (activeConflicts.length) {
     const label = activeConflicts.length === 1
@@ -506,6 +519,17 @@ export function checkMemoryBundle(vaultBase, { registry } = {}) {
     const purposes = groupConflictPurposes(activeConflicts).join('; ');
     warnings.push(`${label} (${purposes}). Existem versões concorrentes e nenhum dado foi escolhido automaticamente. Conflito semântico degrada somente as chaves afetadas e exige curadoria humana; memory repair não escolhe vencedor. Próximo passo: ${memoryCurateCommand(vaultBase)}. Inventário avançado: ${memoryCandidatesCommand(vaultBase)}.`);
   }
+  if (historicalHandoffs.length) {
+    const label = historicalHandoffs.length === 1
+      ? '1 handoff histórico reparável'
+      : `${historicalHandoffs.length} handoffs históricos reparáveis`;
+    warnings.push(
+      `${label}; sessões de origem estão encerradas e nenhuma versão precisa virar estado atual. `
+      + `Execute primeiro o dry-run: ${memoryRescopeCommand(vaultBase)}. `
+      + `Se a prévia estiver correta: ${memoryRescopeCommand(vaultBase, { apply: true })}. `
+      + `Dívida restante: ${memoryCurateAllCommand(vaultBase)}.`,
+    );
+  }
   if (outbox.count) warnings.push(`${outbox.count} evento(s) pendente(s) na outbox; execute o projector quando seguro.`);
   if (ordinaryCandidates.length) warnings.push(`${ordinaryCandidates.length} candidate(s) aguardando curadoria humana.`);
   for (const warning of bundle.warnings || []) warnings.push(warning);
@@ -526,6 +550,7 @@ export function checkMemoryBundle(vaultBase, { registry } = {}) {
       pendingOutbox: outbox.count,
       candidates: candidates.items.length,
       activeConflicts: activeConflicts.length,
+      repairableHandoffs: historicalHandoffs.length,
       semanticStatus: semantic.status ?? null,
       semanticCode: semantic.code ?? null,
       semanticActiveKeys: semantic.activeKeys || [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wendkeep",
-  "version": "0.75.1",
+  "version": "0.75.3",
   "description": "Vault-first persistent memory for AI coding agents, with an optional profile-aware governance runtime: OFF, FLOW, GUIDE, GOVERN, or ASSURE. Local-first and agent-agnostic (Claude Code, Codex, Cursor…).",
   "type": "module",
   "workspaces": [
@@ -41,7 +41,7 @@
     "node": ">=18"
   },
   "scripts": {
-    "check": "node --check scripts/release.mjs && node --check scripts/release-plan.mjs && node --check scripts/release-provenance.mjs && node --check scripts/run-scope.mjs && node --check src/release-provenance.mjs && node --check bin/wendkeep.mjs && node --check packages/cli/src/index.mjs && node --check src/init.mjs && node --check src/doctor.mjs && node --check src/project-vault.mjs && node --check src/observer-auth.mjs && node --check src/observer-privacy.mjs && node --check src/observer-snapshot.mjs && node --check src/observer-store.mjs && node --check src/observer-memory.mjs && node --check src/observer-memory-publish.mjs && node --check src/observer-sql-store.mjs && node --check src/observer-sql-migrate.mjs && node --check src/observer-sql-publish.mjs && node --check src/observer-transcript-store.mjs && node --check src/observer-server.mjs && node --check src/observer.mjs && node --check src/observer-publish.mjs && node --check src/operating-profile.mjs && node --check src/profile.mjs && node --check src/flow.mjs && node --check src/work-kind.mjs && node --check src/delivery.mjs && node --check web/observer/app.mjs && node --check hooks/observer-publish.mjs && node --check hooks/evidence-context.mjs && node --check hooks/evidence-recall.mjs && node --check hooks/memory-scope.mjs && node --check hooks/operating-profile-runtime.mjs && node --check hooks/operating-profile-task-store.mjs && node --check hooks/flow-core.mjs && node --check hooks/flow-protected-policy.mjs && node --check hooks/git-snapshot.mjs && node --check hooks/vault-path-safety.mjs && node --check hooks/vault-runtime-store.mjs && node --check packages/harness/src/index.mjs && node --check packages/harness/src/flow-store.mjs && node --check packages/harness/src/operating-profile.mjs && node --check packages/harness/src/sensors-core.mjs && node --check packages/integrations/src/host-hooks.mjs && node --check packages/integrations/src/hook-envelope.mjs && node --check packages/integrations/src/prompt-content.mjs && node --check packages/integrations/src/transcript-usage.mjs && node --check packages/integrations/src/transcripts.mjs && node --check packages/integrations/src/session-identity.mjs && node --check packages/integrations/src/index.mjs && node --check packages/mcp/src/config.mjs && node --check packages/mcp/src/index.mjs && node --check packages/vault/src/index.mjs && node --check packages/vault/src/project-vault.mjs && node --check packages/vault/src/vault-path-safety.mjs && node --check packages/vault/src/locale.mjs && node --check packages/vault/src/memory-schema.mjs && node --check packages/vault/src/memory-mode.mjs && node --check packages/vault/src/memory-scope.mjs && node --check packages/vault/src/evidence-recall.mjs && node --check packages/vault/src/memory-handoff.mjs && node --check packages/vault/src/memory-store.mjs && node --check packages/vault/src/validate-core.mjs && node --check packages/vault/src/validate-memory.mjs",
+    "check": "node --check scripts/release.mjs && node --check scripts/release-plan.mjs && node --check scripts/release-provenance.mjs && node --check scripts/run-scope.mjs && node --check src/release-provenance.mjs && node --check bin/wendkeep.mjs && node --check packages/cli/src/index.mjs && node --check src/init.mjs && node --check src/doctor.mjs && node --check src/project-vault.mjs && node --check src/observer-auth.mjs && node --check src/observer-privacy.mjs && node --check src/observer-snapshot.mjs && node --check src/observer-store.mjs && node --check src/observer-memory.mjs && node --check src/observer-memory-publish.mjs && node --check src/observer-sql-store.mjs && node --check src/observer-sql-migrate.mjs && node --check src/observer-sql-publish.mjs && node --check src/observer-transcript-store.mjs && node --check src/observer-server.mjs && node --check src/observer.mjs && node --check src/observer-publish.mjs && node --check src/operating-profile.mjs && node --check src/profile.mjs && node --check src/flow.mjs && node --check src/work-kind.mjs && node --check src/delivery.mjs && node --check web/observer/app.mjs && node --check hooks/observer-publish.mjs && node --check hooks/evidence-context.mjs && node --check hooks/evidence-recall.mjs && node --check hooks/memory-scope.mjs && node --check hooks/operating-profile-runtime.mjs && node --check hooks/operating-profile-task-store.mjs && node --check hooks/flow-core.mjs && node --check hooks/flow-protected-policy.mjs && node --check hooks/git-snapshot.mjs && node --check hooks/vault-path-safety.mjs && node --check hooks/vault-runtime-store.mjs && node --check packages/harness/src/index.mjs && node --check packages/harness/src/flow-store.mjs && node --check packages/harness/src/operating-profile.mjs && node --check packages/harness/src/sensors-core.mjs && node --check packages/integrations/src/host-hooks.mjs && node --check packages/integrations/src/hook-envelope.mjs && node --check packages/integrations/src/prompt-content.mjs && node --check packages/integrations/src/transcript-usage.mjs && node --check packages/integrations/src/transcripts.mjs && node --check packages/integrations/src/session-identity.mjs && node --check packages/integrations/src/index.mjs && node --check packages/mcp/src/config.mjs && node --check packages/mcp/src/index.mjs && node --check packages/vault/src/index.mjs && node --check packages/vault/src/project-vault.mjs && node --check packages/vault/src/vault-path-safety.mjs && node --check packages/vault/src/locale.mjs && node --check packages/vault/src/memory-schema.mjs && node --check packages/vault/src/memory-mode.mjs && node --check packages/vault/src/memory-scope.mjs && node --check packages/vault/src/memory-candidate-policy.mjs && node --check packages/vault/src/evidence-recall.mjs && node --check packages/vault/src/memory-handoff.mjs && node --check packages/vault/src/memory-store.mjs && node --check packages/vault/src/validate-core.mjs && node --check packages/vault/src/validate-memory.mjs",
     "test": "node --test --test-concurrency=2",
     "test:core": "node scripts/run-scope.mjs core",
     "release": "node scripts/release.mjs",

package/packages/cli/src/index.mjs

@@ -102,8 +102,9 @@ Usage:
                            in session notes from the linked derived notes — the body used to lag
                            behind the closing block. Dry-run by default · --apply · --json.
   wendkeep lesson add "t" "l"   Record a project-local lesson (injected at SessionStart).
-  wendkeep memory curate         Guide one semantic conflict at a time in an interactive terminal.
-                           Every promote/reject requires confirmation; --vault P.
+  wendkeep memory curate         Guide actionable semantic conflicts in an interactive terminal.
+                           --all includes historical handoffs and enables confirmed safe batch close;
+                           every promote/reject requires confirmation. --vault P.
   wendkeep memory <sub>          Shared memory v2: status | candidates [--active] | curate | migrate [--apply] | rescope [--apply] | repair |
                            recover-attempt <session> [--apply] |
                            reconcile <session> --by-session <session> --reason <text> [--apply] |

package/packages/integrations/src/host-hooks.mjs

@@ -36,6 +36,12 @@ export function hookCommand(name) {
   return `npx --no-install wendkeep hook ${name}`;
 }
 
+// O checkout do próprio WendKeep não depende do pacote publicado. Seus hooks versionados
+// executam o binário do working tree para que sync/dogfood não recrie a autodependência.
+export function hookCommandWorkingTree(name) {
+  return `node ./bin/wendkeep.mjs hook ${name}`;
+}
+
 // Forma node-direta do comando de hook: 1 processo (~100-250ms) em vez dos 3 do npx (cold-start
 // de segundos no Windows). Usada pelos hooks de ALTA FREQUÊNCIA (por prompt / por tool-call)
 // quando o projeto tem wendkeep instalado localmente; o init decide (hookCommandFor).

package/packages/vault/src/memory-candidate-policy.mjs

@@ -0,0 +1,47 @@
+const TERMINAL_SESSION_STATUSES = new Set([
+  'done',
+  'superseded',
+  'completed',
+  'closed',
+  'inactive',
+  'abandoned',
+]);
+
+function sessionEntry(registry, event) {
+  const sessionId = String(event?.canonical_session_id || '').trim();
+  return sessionId ? registry?.sessions?.[sessionId] || null : null;
+}
+
+/** Pure, fail-closed policy shared by doctor and interactive curation. */
+export function classifyMemoryCandidate(candidate, registry = { sessions: {} }) {
+  if (candidate?.reason !== 'conflict' || candidate?.memory_key !== 'handoff.latest') {
+    return { classification: 'actionable' };
+  }
+
+  const events = Array.isArray(candidate.events) ? candidate.events : [];
+  if (!events.length) return { classification: 'unknown' };
+  const entries = events.map((event) => sessionEntry(registry, event));
+  if (entries.some((entry) => !entry)) return { classification: 'unknown' };
+  if (entries.some((entry) => String(entry.status || '').trim() === 'active')) {
+    return { classification: 'actionable' };
+  }
+  if (entries.every((entry) => TERMINAL_SESSION_STATUSES.has(String(entry.status || '').trim()))) {
+    return { classification: 'historical', recommended_action: 'reject' };
+  }
+  return { classification: 'unknown' };
+}
+
+export function candidateSessionContext(event, registry = { sessions: {} }) {
+  const entry = sessionEntry(registry, event);
+  if (!entry) return {};
+  const status = String(entry.status || '').trim();
+  const changeSlug = String(entry.change_slug || entry.changeSlug || '').trim();
+  return {
+    ...(status ? { session_status: status } : {}),
+    ...(changeSlug ? { change_slug: changeSlug } : {}),
+  };
+}
+
+export function isHistoricalHandoffCandidate(candidate, registry) {
+  return classifyMemoryCandidate(candidate, registry).classification === 'historical';
+}

package/src/doctor.mjs

@@ -39,7 +39,8 @@ export function renderVaultHealthLines(result) {
   lines.push(
     `[memória] ${healthStatusLabel(result.memoryStatus)} — schema: ${metricValue(memory.schemaVersion)} · revisão: ${metricValue(memory.revision)} · cursor: ${metricValue(memory.eventCursor)} · hash: ${metricValue(memory.stateHash)}`,
   );
-  lines.push(`  ledger: ${metricValue(memory.ledgerEvents)} evento(s) · outbox: ${metricValue(memory.pendingOutbox)} · candidates: ${metricValue(memory.candidates)} · conflitos: ${metricValue(memory.activeConflicts)}`);
+  const repairableHandoffs = Number(memory.repairableHandoffs || 0);
+  lines.push(`  ledger: ${metricValue(memory.ledgerEvents)} evento(s) · outbox: ${metricValue(memory.pendingOutbox)} · candidates: ${metricValue(memory.candidates)} · conflitos: ${metricValue(memory.activeConflicts)}${repairableHandoffs ? ` · handoffs reparáveis: ${repairableHandoffs}` : ''}`);
   const semanticKeys = memory.semanticActiveKeys || [];
   const semanticProjected = memory.semanticProjectedKeys || [];
   const semanticMissing = memory.semanticMissingKeys || [];

package/src/init.mjs

@@ -13,6 +13,7 @@ import {
   CHANGE_NUDGE_HOOKS,
   CHANGE_GATE_HOOKS,
   hookCommand,
+  hookCommandWorkingTree,
   hookCommandLocal,
   hookCommandLocalLegacy,
   codexHookSpecs,
@@ -109,7 +110,19 @@ function backup(path) {
 
 // Comando preferido para um hook: node-direto quando o projeto tem o pacote local (alta
 // frequência sem cold-start de npx — ver R3 do design 0.31.0); senão o npx portátil.
+export function isWendkeepSelfCheckout(projectPath) {
+  try {
+    if (!projectPath || !existsSync(join(projectPath, 'bin', 'wendkeep.mjs'))) return false;
+    const pkg = JSON.parse(readFileSync(join(projectPath, 'package.json'), 'utf8'));
+    const bin = typeof pkg.bin === 'string' ? pkg.bin : pkg.bin?.wendkeep;
+    return pkg.name === 'wendkeep' && String(bin || '').replace(/\\/g, '/') === 'bin/wendkeep.mjs';
+  } catch {
+    return false;
+  }
+}
+
 export function hookCommandFor(name, projectPath) {
+  if (isWendkeepSelfCheckout(projectPath)) return hookCommandWorkingTree(name);
   try {
     if (projectPath && existsSync(join(projectPath, 'node_modules', 'wendkeep', 'hooks', `${name}.mjs`))) {
       return hookCommandLocal(name);
@@ -142,13 +155,22 @@ export function mergeSettings(existing, { vaultPath, withMcp, force, companions
     ...CHANGE_GATE_HOOKS,
     ...companionHookSpecs(companions, { dotcontextHookLevel }),
   ].sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
+  const selfCheckout = isWendkeepSelfCheckout(projectPath);
   for (const h of allSpecs) {
+    const useWorkingTree = !h.command && selfCheckout;
     const useLocal = !h.command && h.preferLocal && localHookAvailable(h.name, projectPath);
-    const command = h.command ?? (useLocal ? 'node' : hookCommand(h.name));
-    const args = useLocal ? [localHookArg(h.name)] : undefined;
+    const command = h.command ?? (useWorkingTree
+      ? hookCommandWorkingTree(h.name)
+      : (useLocal ? 'node' : hookCommand(h.name)));
+    const args = !useWorkingTree && useLocal ? [localHookArg(h.name)] : undefined;
     // Dual-recognition: um hook nomeado é reconhecido tanto na forma npx quanto na node-direta,
     // para que trocar a forma preferida (ou re-initar noutra máquina) nunca duplique o grupo.
-    const candidates = h.command ? [h.command] : [hookCommand(h.name), hookCommandLocal(h.name), hookCommandLocalLegacy(h.name)];
+    const candidates = h.command ? [h.command] : [
+      hookCommand(h.name),
+      hookCommandWorkingTree(h.name),
+      hookCommandLocal(h.name),
+      hookCommandLocalLegacy(h.name),
+    ];
     const ownsHook = (x) => candidates.includes(x.command)
       || (x.command === 'node' && Array.isArray(x.args) && x.args[0] === localHookArg(h.name));
     const groups = Array.isArray(s.hooks[h.event]) ? [...s.hooks[h.event]] : [];
@@ -159,7 +181,8 @@ export function mergeSettings(existing, { vaultPath, withMcp, force, companions
       // entry's fields in place — without disturbing any sibling hooks the user grouped with it.
       const hk = owning.hooks.find(ownsHook);
       const brokenRelative = hk?.command === hookCommandLocalLegacy(h.name);
-      if (force || brokenRelative) {
+      const wrongRuntime = !h.command && hk?.command !== command;
+      if (force || brokenRelative || wrongRuntime) {
         hk.command = command;
         if (args) hk.args = args;
         else delete hk.args;
@@ -208,14 +231,19 @@ export function mergeSettings(existing, { vaultPath, withMcp, force, companions
 // it does handle is the legacy `timeout` key, which Codex silently ignores in favour of a
 // 600s default; rewriting it to `timeoutSec` invalidates the stored trusted_hash and costs
 // the user one "Hooks need review" prompt. That is the point.
-export function mergeCodexHooks(existing, { force = false } = {}) {
+export function mergeCodexHooks(existing, { force = false, projectPath = '' } = {}) {
   const file = existing && typeof existing === 'object' ? { ...existing } : {};
   file.hooks = { ...(file.hooks || {}) };
   const specs = codexHookSpecs([...SESSION_HOOKS, ...CHANGE_NUDGE_HOOKS, ...CHANGE_GATE_HOOKS])
     .sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
+  const selfCheckout = isWendkeepSelfCheckout(projectPath);
   for (const h of specs) {
-    const entry = codexHookEntry(h);
-    const owns = (x) => x.command === entry.command;
+    const entry = {
+      ...codexHookEntry(h),
+      ...(selfCheckout ? { command: hookCommandWorkingTree(h.name) } : {}),
+    };
+    const candidates = new Set([hookCommand(h.name), hookCommandWorkingTree(h.name)]);
+    const owns = (x) => candidates.has(x.command);
     const groups = Array.isArray(file.hooks[h.event]) ? [...file.hooks[h.event]] : [];
     const owning = groups.find((g) => (g.hooks || []).some(owns));
     if (owning) {
@@ -224,7 +252,8 @@ export function mergeCodexHooks(existing, { force = false } = {}) {
       // `timeout` is the pre-0.46 key: Codex never read it. Migrate it even without --force,
       // otherwise the hook keeps running at the 600s default forever.
       const legacyTimeout = 'timeout' in hk;
-      if (force || legacyTimeout) {
+      const wrongRuntime = hk.command !== entry.command;
+      if (force || legacyTimeout || wrongRuntime) {
         if (legacyTimeout) {
           if (hk.timeoutSec === undefined) hk.timeoutSec = hk.timeout;
           delete hk.timeout;
@@ -233,6 +262,7 @@ export function mergeCodexHooks(existing, { force = false } = {}) {
           hk.timeoutSec = entry.timeoutSec;
           if (entry.statusMessage) hk.statusMessage = entry.statusMessage;
         }
+        if (wrongRuntime) hk.command = entry.command;
       }
       if (force && matcher) owning.matcher = matcher;
       if (force && !matcher) delete owning.matcher;
@@ -593,12 +623,12 @@ export async function runInit(argv) {
   const codexPath = join(projectPath, '.codex', 'hooks.json');
   const codexRead = readJsonSafe(codexPath);
   if (!codexRead.ok) {
-    writeJson(`${codexPath}.new`, mergeCodexHooks(null, { force: true }));
+    writeJson(`${codexPath}.new`, mergeCodexHooks(null, { force: true, projectPath }));
     log(M.codexBadJson(codexPath));
   } else {
     const hadFile = codexRead.data !== null;
     if (hadFile) backup(codexPath);
-    writeJson(codexPath, mergeCodexHooks(codexRead.data, { force: args.force }));
+    writeJson(codexPath, mergeCodexHooks(codexRead.data, { force: args.force, projectPath }));
     log(M.codexHooks(hadFile ? M.merged : M.created, hadFile ? M.bakSaved : ''));
   }
   log(M.codexTrust);

package/src/memory-curate.mjs

@@ -21,10 +21,18 @@ const TEXT = {
     observed: 'registrado em',
     newer: 'mais recente',
     actions: '[1-N] Manter uma versão · [P] Pular · [R] Encerrar sem vencedor · [D] Detalhes · [Q] Sair',
+    historicalAction: '[H] Encerrar todos os handoffs históricos recomendados',
+    terminalContext: 'sessão encerrada',
+    activeContext: 'sessão ativa',
+    changeContext: (slug) => `change: ${slug}`,
+    safeRecommendation: 'Recomendação segura: encerrar sem vencedor; as evidências permanecem no ledger.',
+    historicalOmitted: (count) => `${count} handoff(s) histórico(s) reparável(is) foram omitidos. Use --all para revisar ou encerrar em lote.`,
+    confirmHistorical: (count) => `Encerrar ${count} handoff(s) histórico(s) sem vencedor? Cada decisão será auditada. [s/N] `,
+    historicalClosed: (count) => `${count} handoff(s) histórico(s) encerrado(s) com decisão auditada.`,
     choose: '> ',
     confirmPromote: (number) => `Manter a versão ${number}? Essa decisão será gravada agora. [s/N] `,
     confirmReject: 'Encerrar este conflito sem escolher uma versão? Essa decisão será gravada agora. [s/N] ',
-    invalid: 'Opção inválida. Escolha um número exibido, P, R, D ou Q.',
+    invalid: 'Opção inválida. Escolha um número exibido, P, R, D, H ou Q.',
     declined: 'Decisão não confirmada; nenhum byte foi alterado.',
     promoted: 'Versão promovida e decisão auditada.',
     rejected: 'Conflito encerrado sem promover uma versão.',
@@ -47,10 +55,18 @@ const TEXT = {
     observed: 'recorded at',
     newer: 'newest timestamp',
     actions: '[1-N] Keep one version · [P] Skip · [R] Close without a winner · [D] Details · [Q] Quit',
+    historicalAction: '[H] Close every safely recommended historical handoff',
+    terminalContext: 'closed session',
+    activeContext: 'active session',
+    changeContext: (slug) => `change: ${slug}`,
+    safeRecommendation: 'Safe recommendation: close without a winner; evidence remains in the ledger.',
+    historicalOmitted: (count) => `${count} repairable historical handoff(s) were omitted. Use --all to review or close them in a batch.`,
+    confirmHistorical: (count) => `Close ${count} historical handoff(s) without a winner? Every decision will be audited. [y/N] `,
+    historicalClosed: (count) => `${count} historical handoff(s) closed with audited decisions.`,
     choose: '> ',
     confirmPromote: (number) => `Keep version ${number}? This decision will be written now. [y/N] `,
     confirmReject: 'Close this conflict without choosing a version? This decision will be written now. [y/N] ',
-    invalid: 'Invalid option. Choose a displayed number, P, R, D, or Q.',
+    invalid: 'Invalid option. Choose a displayed number, P, R, D, H, or Q.',
     declined: 'Decision not confirmed; no bytes were changed.',
     promoted: 'Version promoted and decision audited.',
     rejected: 'Conflict closed without promoting a version.',
@@ -125,13 +141,24 @@ export function renderMemoryConflict(candidate, {
     const source = text.sourceKinds[event.source] || text.sourceKinds.unknown;
     lines.push(`[${eventIndex + 1}] ${text.source}: ${source}${recent}`);
     if (event.observed_at) lines.push(`    ${text.observed}: ${event.observed_at}`);
+    const context = [
+      event.session_status === 'active' ? text.activeContext
+        : event.session_status ? text.terminalContext : '',
+      event.change_slug ? text.changeContext(event.change_slug) : '',
+    ].filter(Boolean);
+    if (context.length) lines.push(`    ${context.join(' · ')}`);
     lines.push(`    ${event.preview}`);
   });
+  if (candidate.classification === 'historical'
+      && candidate.recommended_action === 'reject') {
+    lines.push('', text.safeRecommendation);
+  }
   if (details) {
     lines.push('', `${text.details}:`, `  candidate: ${candidate.candidate_id}`);
     candidate.events.forEach((event) => lines.push(`  event: ${event.event_id}`));
   }
   lines.push('', text.actions);
+  if (candidate.classification === 'historical') lines.push(text.historicalAction);
   return `${lines.join('\n')}\n`;
 }
 
@@ -141,6 +168,7 @@ export async function runGuidedMemoryCuration(vault, {
   loadCandidates = listMemoryCandidatesForCuration,
   decide = decideMemoryCandidate,
   locale = 'pt-BR',
+  omittedHistorical = 0,
 } = {}) {
   if (typeof ask !== 'function' || typeof write !== 'function') {
     throw new TypeError('runGuidedMemoryCuration requer ask e write.');
@@ -167,6 +195,7 @@ export async function runGuidedMemoryCuration(vault, {
     if (first) {
       sessionTotal = loaded.length;
       write(`${text.title}\n${text.intro(loaded.length)}\n`);
+      if (omittedHistorical) write(`${text.historicalOmitted(omittedHistorical)}\n`);
       if (loaded.length) write(`${text.categories}\n${groupLines(loaded, id).join('\n')}\n`);
       first = false;
     }
@@ -207,6 +236,56 @@ export async function runGuidedMemoryCuration(vault, {
       }));
       continue;
     }
+    if (answer === 'h') {
+      const historicalCount = loaded.filter((item) => (
+        item.classification === 'historical' && item.recommended_action === 'reject'
+      )).length;
+      if (!historicalCount) {
+        write(`${text.invalid}\n`);
+        continue;
+      }
+      const confirmation = await ask(text.confirmHistorical(historicalCount));
+      if (!isAffirmative(confirmation)) {
+        write(`${text.declined}\n`);
+        continue;
+      }
+      let closed = 0;
+      const batchIds = new Set();
+      while (true) {
+        let refreshed;
+        try {
+          refreshed = loadCandidates(vault);
+        } catch {
+          write(`${text.blocked}\n`);
+          return { status: 'blocked', decisions, skipped };
+        }
+        const next = refreshed.find((item) => (
+          item.classification === 'historical' && item.recommended_action === 'reject'
+        ));
+        if (!next) break;
+        if (batchIds.has(next.candidate_id)) {
+          write(`${text.blocked}\n`);
+          return { status: 'blocked', decisions, skipped };
+        }
+        batchIds.add(next.candidate_id);
+        let batchResult;
+        try {
+          batchResult = decide(vault, { action: 'reject', candidateId: next.candidate_id });
+        } catch {
+          write(`${text.blocked}\n`);
+          return { status: 'blocked', decisions, skipped };
+        }
+        if (batchResult?.status !== 'rejected') {
+          write(`${text.blocked}\n`);
+          return { status: 'blocked', decisions, skipped };
+        }
+        decisions += 1;
+        closed += 1;
+        decidedIds.add(next.candidate_id);
+      }
+      write(`${text.historicalClosed(closed)}\n`);
+      continue;
+    }
 
     let decision;
     let confirmation;
@@ -260,11 +339,18 @@ function usageError(message) {
 export function parseMemoryCurateArgs(argv) {
   let vault = '';
   let seenVault = false;
+  let includeHistorical = false;
   for (let index = 0; index < argv.length; index += 1) {
     const token = argv[index];
     if (!token.startsWith('--')) throw usageError(`argumento posicional inesperado: ${token}.`);
     const equalAt = token.indexOf('=');
     const name = equalAt >= 0 ? token.slice(0, equalAt) : token;
+    if (name === '--all') {
+      if (equalAt >= 0) throw usageError('--all não aceita valor.');
+      if (includeHistorical) throw usageError('--all duplicado.');
+      includeHistorical = true;
+      continue;
+    }
     if (name !== '--vault') throw usageError(`opção desconhecida: ${name}.`);
     if (seenVault) throw usageError('--vault duplicado.');
     const value = equalAt >= 0 ? token.slice(equalAt + 1) : argv[index + 1];
@@ -275,7 +361,7 @@ export function parseMemoryCurateArgs(argv) {
     seenVault = true;
     if (equalAt < 0) index += 1;
   }
-  return { vault };
+  return { vault, ...(includeHistorical ? { includeHistorical: true } : {}) };
 }
 
 export async function runMemoryCurateCli(argv, {
@@ -313,8 +399,16 @@ export async function runMemoryCurateCli(argv, {
 
   const rl = createInterface({ input, output });
   try {
+    const allCandidates = listMemoryCandidatesForCuration(vault, { includeHistorical: true });
+    const omittedHistorical = args.includeHistorical
+      ? 0
+      : allCandidates.filter((item) => item.classification === 'historical').length;
     const result = await runGuidedMemoryCuration(vault, {
       locale: getLocale(vault).id,
+      omittedHistorical,
+      loadCandidates: (base) => listMemoryCandidatesForCuration(base, {
+        includeHistorical: Boolean(args.includeHistorical),
+      }),
       ask: (question) => rl.question(question),
       write: (value) => output.write(String(value)),
     });

package/src/memory.mjs

@@ -21,6 +21,10 @@ import {
 import { validateCore } from './validate-core.mjs';
 import { checkMemoryBundle } from '../hooks/vault-health.mjs';
 import { scopeForMemoryKey } from '../hooks/memory-scope.mjs';
+import {
+  candidateSessionContext,
+  classifyMemoryCandidate,
+} from '../packages/vault/src/memory-candidate-policy.mjs';
 
 const BRAIN = '.brain';
 const LEDGER = 'MEMORY_EVENTS.jsonl';
@@ -241,24 +245,17 @@ export function planScopedMemoryMigration(vault) {
   const projection = deriveMemoryProjection(vault, ledger.events);
   const ambiguous = new Set(projection.candidates.map((candidate) => candidate.record_key || candidate.memory_key));
   const existingIds = new Set(ledger.events.map((event) => event.event_id));
+  const alreadyRescopedSourceIds = new Set(ledger.events.flatMap((event) => [
+    event.rescopes_event_id,
+    ...(Array.isArray(event.rescopes_event_ids) ? event.rescopes_event_ids : []),
+  ]).filter(Boolean));
   const planned = [];
+  const plannedSourceIds = new Set();
 
-  for (const [recordKey, record] of Object.entries(projection.records)) {
-    if (ambiguous.has(recordKey) || record.source?.scope) continue;
-    const source = record.source;
-    const sameLegacyKey = ledger.events.filter((event) => (
-      !event.scope && event.memory_key === source.memory_key && !event.rescopes_event_id
-    ));
-    const scope = scopeForMemoryKey(source.memory_key, {
-      ...source,
-      projectId: source.project_id,
-      workSessionId: source.work_session_id,
-      branch: source.value?.branch || source.value?.branch_name,
-      worktreeId: source.value?.worktree_id,
-      repositoryId: source.value?.repository_id,
-    });
+  const appendRescope = (source, scope, rescopesEventIds = [source.event_id]) => {
     const eventId = rescopeEventId(source.event_id, scope);
-    if (existingIds.has(eventId)) continue;
+    if (existingIds.has(eventId) || alreadyRescopedSourceIds.has(source.event_id)
+        || plannedSourceIds.has(source.event_id)) return false;
     planned.push({
       v: 1,
       event_id: eventId,
@@ -266,7 +263,7 @@ export function planScopedMemoryMigration(vault) {
       memory_key: source.memory_key,
       scope,
       operation: 'assert',
-      value: record.value,
+      value: source.value,
       authority: source.authority,
       canonical_session_id: source.canonical_session_id || 'memory-rescope',
       activation_id: source.activation_id || 'memory-rescope',
@@ -275,9 +272,58 @@ export function planScopedMemoryMigration(vault) {
       source_turn_id: source.source_turn_id || 'memory-rescope',
       observed_at: source.observed_at || new Date(0).toISOString(),
       evidence: [...new Set([...(source.evidence || []), `memory-rescope:${source.event_id}`])],
+      ...(source.work_session_id ? { work_session_id: source.work_session_id } : {}),
       rescopes_event_id: source.event_id,
-      rescopes_event_ids: sameLegacyKey.map((event) => event.event_id).sort(),
+      rescopes_event_ids: [...new Set(rescopesEventIds)].sort(),
     });
+    plannedSourceIds.add(source.event_id);
+    return true;
+  };
+
+  for (const [recordKey, record] of Object.entries(projection.records)) {
+    if (ambiguous.has(recordKey) || record.source?.scope) continue;
+    const source = record.source;
+    const sameLegacyKey = ledger.events.filter((event) => (
+      !event.scope && event.memory_key === source.memory_key && !event.rescopes_event_id
+    ));
+    const scope = scopeForMemoryKey(source.memory_key, {
+      ...source,
+      projectId: source.project_id,
+      workSessionId: source.work_session_id,
+      branch: source.value?.branch || source.value?.branch_name,
+      worktreeId: source.value?.worktree_id,
+      repositoryId: source.value?.repository_id,
+    });
+    const eventId = rescopeEventId(source.event_id, scope);
+    if (existingIds.has(eventId)) continue;
+    appendRescope(
+      { ...source, value: record.value },
+      scope,
+      sameLegacyKey.map((event) => event.event_id),
+    );
+  }
+
+  let rescopableConflicts = 0;
+  for (const candidate of projection.candidates) {
+    if (candidate.reason !== 'conflict' || candidate.memory_key !== 'handoff.latest') continue;
+    const sources = Array.isArray(candidate.events) ? candidate.events : [];
+    if (!sources.length || sources.some((source) => (
+      source.scope || (!source.work_session_id && !source.canonical_session_id)
+    ))) continue;
+
+    const scopedSources = sources.map((source) => ({
+      source,
+      scope: scopeForMemoryKey(source.memory_key, {
+        ...source,
+        projectId: source.project_id,
+        workSessionId: source.work_session_id,
+      }),
+    }));
+    if (scopedSources.some(({ scope }) => scope.type !== 'work_session'
+        || scope.id.startsWith('legacy:'))) continue;
+
+    rescopableConflicts += 1;
+    for (const { source, scope } of scopedSources) appendRescope(source, scope);
   }
 
   return {
@@ -285,6 +331,7 @@ export function planScopedMemoryMigration(vault) {
     ledger_events: ledger.events.length,
     planned: planned.length,
     ambiguous: projection.candidates.length,
+    rescopable_conflicts: rescopableConflicts,
     events: planned,
   };
 }
@@ -298,13 +345,18 @@ export function rescopeMemoryEvents(vault, { apply = false } = {}) {
       ledger_events: plan.ledger_events,
       planned: plan.planned,
       ambiguous: plan.ambiguous,
+      rescopable_conflicts: plan.rescopable_conflicts,
       scopes: plan.events.map((event) => ({
         event_id: event.event_id, memory_key: event.memory_key, scope: event.scope,
       })),
     };
   }
   if (!plan.events.length) {
-    return { status: 'unchanged', migrated: 0, ambiguous: plan.ambiguous };
+    return {
+      status: 'unchanged', migrated: 0, ambiguous: plan.ambiguous,
+      rescopable_conflicts: plan.rescopable_conflicts,
+      remaining_ambiguous: plan.ambiguous,
+    };
   }
   for (const event of plan.events) enqueueMemoryEvent(vault, event);
   const projection = projectMemoryOutbox(vault);
@@ -312,6 +364,10 @@ export function rescopeMemoryEvents(vault, { apply = false } = {}) {
     status: projection.status === 'projected' ? 'migrated' : projection.status,
     migrated: plan.events.length,
     ambiguous: plan.ambiguous,
+    rescopable_conflicts: plan.rescopable_conflicts,
+    remaining_ambiguous: Number.isInteger(projection.candidates)
+      ? projection.candidates
+      : plan.ambiguous,
     checkpoint: projection.checkpoint || null,
   };
 }
@@ -377,7 +433,7 @@ function curationPreview(value) {
     : `${visible.slice(0, CURATION_PREVIEW_CHARS - 1).trimEnd()}…`;
 }
 
-function sanitizedCurationEvent(candidate, eventId, candidateIndex) {
+function sanitizedCurationEvent(candidate, eventId, candidateIndex, registry) {
   const events = Array.isArray(candidate.events) ? candidate.events : [];
   const event = events.find((item) => item?.event_id === eventId);
   if (!event || typeof event !== 'object' || Array.isArray(event)) {
@@ -397,15 +453,24 @@ function sanitizedCurationEvent(candidate, eventId, candidateIndex) {
     observed_at: sanitizeMemoryText(event.observed_at || event.effective_at || ''),
     source: sanitizeMemoryText(source),
     preview: curationPreview(event.value),
+    ...Object.fromEntries(Object.entries(candidateSessionContext(event, registry))
+      .map(([key, value]) => [key, sanitizeMemoryText(value)])),
   };
 }
 
-export function listMemoryCandidatesForCuration(vault) {
+export function listMemoryCandidatesForCuration(vault, { includeHistorical = false } = {}) {
+  const registry = readSessionRegistry(vault);
   return readCandidates(vault)
-    .map((candidate, index) => ({ candidate, index, safe: sanitizedCandidate(candidate, index) }))
+    .map((candidate, index) => ({
+      candidate,
+      index,
+      safe: sanitizedCandidate(candidate, index),
+      policy: classifyMemoryCandidate(candidate, registry),
+    }))
     .filter(({ safe }) => safe.reason === 'conflict'
       && !TERMINAL_CANDIDATE_STATUSES.has(safe.status))
-    .map(({ candidate, index, safe }) => {
+    .filter(({ policy }) => includeHistorical || policy.classification !== 'historical')
+    .map(({ candidate, index, safe, policy }) => {
       if (!safe.event_ids.length) {
         throw new Error(
           `MEMORY_CANDIDATES.jsonl: candidate ${index + 1} sem eventos elegíveis.`,
@@ -416,8 +481,12 @@ export function listMemoryCandidatesForCuration(vault) {
         reason: safe.reason,
         status: safe.status,
         memory_key: safe.memory_key,
+        classification: policy.classification,
+        ...(policy.recommended_action ? { recommended_action: policy.recommended_action } : {}),
         ...(safe.scope ? { scope: safe.scope } : {}),
-        events: safe.event_ids.map((eventId) => sanitizedCurationEvent(candidate, eventId, index)),
+        events: safe.event_ids.map(
+          (eventId) => sanitizedCurationEvent(candidate, eventId, index, registry),
+        ),
       };
     })
     .sort((left, right) => lexicalCompare(left.memory_key, right.memory_key)

package/src/taxonomy.mjs

@@ -11,6 +11,7 @@ import {
   codexHookEntry,
   codexHookSpecs,
   hookCommand,
+  hookCommandWorkingTree,
   hookCommandLocal,
   hookCommandLocalLegacy,
 } from '../packages/integrations/src/host-hooks.mjs';
@@ -24,6 +25,7 @@ export {
   codexHookEntry,
   codexHookSpecs,
   hookCommand,
+  hookCommandWorkingTree,
   hookCommandLocal,
   hookCommandLocalLegacy,
   mcpServerEntry,