akm-opencode 0.8.2 → 0.9.0

package/index.ts

@@ -1,31 +1,22 @@
 import { type Plugin, tool } from "@opencode-ai/plugin"
-import { execFileSync, execSync, spawn } from "node:child_process"
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs"
+// @ts-expect-error akm-cli does not publish declarations for this in-process entrypoint.
+import { akmCurate } from "akm-cli/dist/commands/read/curate.js"
+// @ts-expect-error akm-cli does not publish declarations for this in-process entrypoint.
+import { akmSearch } from "akm-cli/dist/commands/read/search.js"
+// @ts-expect-error akm-cli does not publish declarations for this in-process entrypoint.
+import { akmShowUnified } from "akm-cli/dist/commands/read/show.js"
+import { execFileSync, spawn } from "node:child_process"
+import { existsSync, mkdirSync, readdirSync, readFileSync, rmSync, statSync, writeFileSync } from "node:fs"
 import os from "node:os"
 import path from "node:path"
 import { fileURLToPath } from "node:url"
 import { classifyFeedbackSignal, shouldSubmitAutomaticFeedback } from "./shared/feedback-signals"
-import { appendCandidates, extractCandidatesFromText, getCandidateLogPath, readCandidates, updateCandidateStatus } from "./shared/memory-candidates"
-import { appendMemoryEvent, getEventLogPath, readJsonl, type AkmMemoryEvent } from "./shared/memory-events"
+import { appendCandidates, extractCandidatesFromText, getCandidateLogPath } from "./shared/memory-candidates"
+import { appendMemoryEvent, getEventLogPath, type AkmMemoryEvent } from "./shared/memory-events"
+import { AKM_VERSION_RANGE, satisfiesAkmVersionRange } from "./shared/akm-version"
 import { shouldRecall } from "./shared/recall-policy"
-import { redactObject, redactSecrets } from "./shared/redaction"
-import { extractAkmRefsFromString } from "./shared/ref-extraction"
-
-// Quote-aware shell tokenizer. Splits on whitespace but respects single,
-// double, and backtick quotes. Used by renderCommandTemplate() to fill
-// `$1`/`$2` positional placeholders from raw `$ARGUMENTS` strings. Was
-// previously co-located with the risky-command assessor in
-// shared/risky-command.ts; inlined here when that gate was removed.
-function splitArguments(raw: string): string[] {
-  if (!raw.trim()) return []
-  const args: string[] = []
-  const re = /"([^"]*)"|'([^']*)'|`([^`]*)`|(\S+)/g
-  let match: RegExpExecArray | null
-  while ((match = re.exec(raw)) !== null) {
-    args.push(match[1] ?? match[2] ?? match[3] ?? match[4] ?? "")
-  }
-  return args
-}
+import { redactObject } from "./shared/redaction"
+import { extractAkmRefsFromString, validateRefCandidates } from "./shared/ref-extraction"
 
 let resolvedAkmCommand = "akm"
 
@@ -40,11 +31,16 @@ export function __resetResolvedAkmForTests(): void {
 
 const moduleDir = path.dirname(fileURLToPath(import.meta.url))
 const SEMVER_PATTERN = /\b\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?\b/
-// Note: satisfiesAkmVersionRange() implements a custom matcher that accepts
-// any 0.8.x release including prereleases (0.8.0-rc.5, 0.8.0-beta.2, etc.).
-// Strict semver `^0.8.0` would NOT match prereleases, so the constant string
-// is widened to honestly reflect what the matcher accepts.
-const AKM_REQUIRED_VERSION_RANGE = "^0.8.0 || ^0.8.0-rc0"
+// The version contract lives in the shared module (also used by the Claude
+// hook). satisfiesAkmVersionRange() routes through the same vendored semver
+// matcher; AKM_REQUIRED_VERSION_RANGE is just the display alias used in the
+// diagnostics below.
+const AKM_REQUIRED_VERSION_RANGE = AKM_VERSION_RANGE
+// The consent banner's "install this" recommendation is deliberately a single
+// version floor rather than the full AKM_VERSION_RANGE (which is an
+// OR-list of accepted ranges, not a valid single npm install specifier).
+// Keep it in sync with the lowest currently-recommended stable 0.9.x release.
+const AKM_RECOMMENDED_INSTALL_REF = "akm-cli@^0.9.0"
 
 const AKM_AUTO_FEEDBACK = (process.env.AKM_AUTO_FEEDBACK ?? "1") !== "0"
 const AKM_AUTO_MEMORY = (process.env.AKM_AUTO_MEMORY ?? "1") !== "0"
@@ -54,15 +50,19 @@ const AKM_PENDING_PROPOSAL_TIMEOUT_MS = Math.max(500, (Number(process.env.AKM_PE
 const AKM_CURATE_LIMIT = Math.max(1, Number(process.env.AKM_CURATE_LIMIT ?? "5") || 5)
 const AKM_CURATE_MIN_CHARS = Math.max(1, Number(process.env.AKM_CURATE_MIN_CHARS ?? "16") || 16)
 const AKM_CURATE_TIMEOUT_MS = Math.max(1_000, (Number(process.env.AKM_CURATE_TIMEOUT ?? "8") || 8) * 1_000)
-const AKM_MEMORY_CHECKPOINT_EVERY = Math.max(1, Number(process.env.AKM_MEMORY_CHECKPOINT_EVERY ?? "8") || 8)
-const AKM_CURATOR_CONTEXT_MAX_CHARS = Math.max(500, Number(process.env.AKM_CURATOR_CONTEXT_MAX_CHARS ?? "4000") || 4000)
-const SESSION_DATE_TAG_LENGTH = 8
-const CHECKPOINT_DATE_TAG_LENGTH = 15
+// 13: "Memory leaks" — sessionBuffer previously grew without bound for the
+// life of a session (a long-running session accumulates one entry per
+// observed tool ref / memory intent). Cap it drop-oldest, matching the
+// `.slice(-8)` cap style already used by retrospectiveState.recentRefs.
+const AKM_SESSION_BUFFER_MAX_ENTRIES = Math.max(1, Number(process.env.AKM_SESSION_BUFFER_MAX_ENTRIES ?? "200") || 200)
+// Best-effort sweep age for orphaned curated tmp files (os.tmpdir()/akm-opencode/curated).
+// A session that ends without ever firing session.deleted (host crash, forced
+// kill) would otherwise leak its curated file on disk forever.
+const CURATED_FILE_MAX_AGE_MS = 7 * 24 * 60 * 60 * 1000
 const AKM_RETROSPECTIVE_FEEDBACK_RE = createRetrospectiveFeedbackRegex()
 const AKM_RETROSPECTIVE_NEGATIVE_RE = createRetrospectiveNegativeRegex()
 const AKM_EXPLICIT_CORRECTION_RE = createExplicitCorrectionRegex()
 const PLUGIN_VERSION = readPackageVersion()
-const PLUGIN_INSTALL_LOCATION = moduleDir
 const OPENCODE_EVENT_LOG = getEventLogPath("opencode")
 const OPENCODE_CANDIDATE_LOG = getCandidateLogPath("opencode")
 
@@ -88,20 +88,32 @@ type SessionBufferEntry = {
   checkpointed?: boolean
 }
 const sessionBuffer = new Map<string, SessionBufferEntry[]>()
-const sessionFinalMemoryCaptured = new Set<string>()
-const sessionSuccessfulAssetTouchCount = new Map<string, number>()
+// Event-driven extraction (opencode): opencode has no true "session end" event
+// and `session.idle` fires after EVERY turn. To avoid flooding extract while a
+// session is actively worked, we min-interval-gate per session — at most one
+// extract per AKM_EXTRACT_MIN_INTERVAL_MS. The akm content-hash ledger
+// (akm-cli #602 / ≥0.9.0-beta.33) further no-ops unchanged content for free.
+// The hourly `akm improve` extract pass (the periodic backstop) catches the
+// final delta after the last turn.
+const sessionLastExtractAt = new Map<string, number>()
+const AKM_EXTRACT_MIN_INTERVAL_MS = (() => {
+  const raw = Number(process.env.AKM_EXTRACT_MIN_INTERVAL_MS)
+  return Number.isFinite(raw) && raw >= 0 ? raw : 10 * 60 * 1000 // default 10 min
+})()
 const pendingProposalSummaryCache = new Map<string, { count: number; expiresAt: number; unsupported?: boolean }>()
 const retrospectiveState = new Map<string, { recentRefs: string[]; lastNegativeSignalAt?: number }>()
-let cachedAkmStashDir: string | undefined
-let agentSetupPromise: Promise<boolean> | null = null
-
-// Asset-ref grammar matching the stash skill: [origin//]type:name.
-// We validate normalized tokens individually instead of running a global regex
-// over arbitrary tool output to keep extraction predictable and ReDoS-safe.
-const AKM_REF_PATTERN = /^(?:[A-Za-z0-9@._+/-]+\/\/)?(?:skill|command|agent|knowledge|memory|script|workflow|task|env|secret|wiki|lesson):[A-Za-z0-9._/\-]+$/
+let cachedAkmBundleDir: string | undefined
+
+// Passive ref observation (narrower than explicit show/search input, so
+// ordinary repository paths cannot become automatic feedback targets) lives in
+// claude/shared/ref-extraction.ts. This module deliberately keeps no local copy
+// of the concept-root regex: a second copy silently drifted from the canonical
+// AKM 0.9 root list (it still matched `wikis/` and never matched `facts/`,
+// `instructions/`, or `sessions/`). extractAkmRefsFromString() is the shared
+// whitespace-token extractor and is the single source of truth here.
 const PROPOSED_QUALITY_WARNING = "Do not treat proposed assets as curated until accepted."
 const AKM_WORKFLOW_INSTRUCTION = [
-  "# AKM workflow (v0.8.0)",
+  "# AKM workflow (v0.9)",
   "",
   "Use AKM as a reusable knowledge and workflow stash.",
   "",
@@ -109,11 +121,8 @@ const AKM_WORKFLOW_INSTRUCTION = [
   "1. Use `akm_curate` with a query that includes the current project name/domain (primary discovery). Fall back to `akm_search` only when you already know an asset exists and need its exact ref.",
   "2. Use `akm_show <ref>` before relying on an asset.",
   "3. Record `akm_feedback` after the result is known.",
-  "4. Use the dedicated v0.8.0 tools for the proposal flow: `akm_proposal` (list/show/diff/accept/reject/drain), `akm_improve`, and `akm_propose`. Fall back to `akm_help` for any verb without a dedicated tool.",
-  "5. Treat `lesson:*` as first-class durable learning assets — they are produced through `akm_improve` and accepted via `akm_proposal action=accept`.",
-  "6. Use `akm_init` when you need to create the working stash or persist `stashDir`. Do not use `akm setup` from an agent; it is interactive and human-facing.",
-  `7. ${PROPOSED_QUALITY_WARNING}`,
-  "8. Never accept or reject proposals, push saves, remove sources, or access env values / secret material without explicit user approval.",
+  "4. Use `akm_remember` to preserve durable project knowledge.",
+  `5. ${PROPOSED_QUALITY_WARNING}`,
 ].join("\n")
 
 function readPackageVersion(): string {
@@ -148,80 +157,6 @@ function createExplicitCorrectionRegex(): RegExp {
   return /\b(this was wrong|that was wrong|you were wrong|incorrect|not correct)\b/i
 }
 
-const CURATOR_AGENT_PROMPT_FALLBACK = `You are the AKM curator — a compound-engineering agent that keeps the user's AKM stash improving every time the main agent finishes a task.
-
-Inputs you should inspect:
-1. OpenCode app logs that include the "akm-opencode" service (feedback, memory, tool invocations).
-2. Session-summary memories named memory:opencode-session-*.
-3. The live stash: call akm_search "" --limit 50 (and akm_show <ref>) to enumerate assets; reach for akm_help topic="list sources" if you need the configured-sources view.
-4. Parent-session context via akm_parent_messages when this session was dispatched as a child.
-
-Signals to act on:
-- Hot refs: assets repeatedly appearing in positive tool outcomes. Call akm_feedback <ref> positive --note "curator: consistently useful" to reinforce.
-- Cold refs: assets tied to failures or user complaints. Record akm_feedback <ref> negative --note "<excerpt>" and open the asset for review.
-- Lesson candidates: repeated memories or failures that should become a proposed lesson. Use akm_improve or akm_help topic="improve" before raw CLI improvement commands.
-- Missing coverage: recurring user prompts with no matching asset. Draft a new skill, command, knowledge doc, wiki page, or workflow in the working stash and reindex via the akm CLI (see akm_help topic="reindex").
-- Pending proposals: list or diff them via akm_help topic="proposal" and recommend accept, reject, or revise. Never accept or reject without explicit user approval.
-- Duplicates / drift: near-identical descriptions or overlapping responsibilities. Propose a consolidation.
-- Stale memories: session summaries that never get recalled. Propose removal (see akm_help topic="remove") once distilled into a durable knowledge doc or wiki page.
-- Wiki hygiene: for each wiki returned by akm_wiki list, run akm_wiki lint <name> and report orphans, broken xrefs, uncited raws, and stale indexes as fix candidates.
-- Stuck workflows: run akm_workflow list --active and surface any runs in blocked or failed state with their step ids. Propose whether to resume or escalate.
-- Never touch env or secret values: do not call akm_env run or akm_secret path unless the user explicitly asks. Env values and secret material must never appear in reports.
-
-Rules of engagement:
-- Never apply destructive changes without explicit user approval.
-- Report findings as a prioritized action list of concrete akm_* tool calls the user can run.
-- Prefer small, reversible edits: promote via positive feedback, draft a candidate skill, or clone and tweak.
-- When drafting new assets, write them into the working stash directory under skills/, commands/, agents/, knowledge/, or scripts/. Use akm_help (topic="config" / topic="reindex") to look up the right CLI invocation when you need the stash path or want to force a reindex.
-- When finished, persist your own summary with akm_remember (name: curator-run-<timestamp>) so the next curator run can build on yours.
-
-Output shape: end every run with a markdown report that has these sections:
-
-## Hot assets (promote)
-- <ref> — why it helped — command to run
-
-## Cold assets (investigate)
-- <ref> — failure signal — proposed fix
-
-## Lesson candidates
-- <theme> — evidence refs — improve or propose command to run
-
-## Coverage gaps
-- <theme> — proposed asset (type, name, one-line description)
-
-## Pending proposals
-- <proposal id> — summary — accept/reject/revise recommendation
-
-## Duplicates / drift
-- <ref a> vs <ref b> — consolidation proposal
-
-## Wiki health
-- <wiki> — lint findings (orphan, broken-xref, uncited-raw, stale-index) with suggested fix
-
-## Workflow health
-- <workflow|runId> — blocked/failed state — resume or escalate
-
-## Housekeeping
-- stale memories, reindex needs, config tweaks
-`
-
-function loadCuratorAgentPrompt(): string {
-  try {
-    const raw = readFileSync(path.join(moduleDir, "agent", "akm-curator.md"), "utf8").trim()
-    let body = raw
-    const lines = raw.split(/\r?\n/)
-    if (lines[0] === "---") {
-      const closingIndex = lines.indexOf("---", 1)
-      if (closingIndex > 0) body = lines.slice(closingIndex + 1).join("\n").trim()
-    }
-    return body || CURATOR_AGENT_PROMPT_FALLBACK
-  } catch {
-    return CURATOR_AGENT_PROMPT_FALLBACK
-  }
-}
-
-const CURATOR_AGENT_PROMPT = loadCuratorAgentPrompt()
-
 type LogLevel = "debug" | "info" | "warn" | "error"
 
 type LogCapableClient = {
@@ -247,20 +182,6 @@ type CliLogMeta = {
   channel?: string
 }
 
-type SessionPromptBody = {
-  agent: string
-  parts: Array<{ type: "text"; text: string }>
-  system?: string
-  model?: { providerID: string; modelID: string }
-  tools?: Record<string, boolean>
-}
-
-type DispatchTarget = {
-  agent: string
-  model?: { providerID: string; modelID: string }
-  requested: string
-}
-
 function formatCliError(error: unknown): string {
   if (error && typeof error === "object" && "code" in error && (error as { code?: unknown }).code === "ENOENT") {
     return "The 'akm' CLI was not found on PATH. Install it first from https://github.com/itlackey/akm."
@@ -274,138 +195,8 @@ function needsAgentSetup(message: string): boolean {
 
 function addAgentSetupGuidance(message: string): string {
   if (!needsAgentSetup(message)) return message
-  if (/\bakm init\b|\bakm_init\b|\bakm setup\b/i.test(message)) return message
-  return `${message}. Agents should not run akm setup because it is interactive. The plugin should set the AKM default agent to the current platform when it is missing; if interactive configuration is still needed, ask the user to run akm setup manually. Use akm_init for agent-safe stash initialization.`
-}
-
-function getAkmConfigPath(): string {
-  const configHome = process.env.XDG_CONFIG_HOME ?? path.join(process.env.HOME ?? ".", ".config")
-  return path.join(configHome, "akm", "config.json")
-}
-
-function readAkmConfig(): Record<string, unknown> {
-  try {
-    const raw = readFileSync(getAkmConfigPath(), "utf8")
-    const parsed = JSON.parse(raw)
-    return parsed && typeof parsed === "object" ? parsed as Record<string, unknown> : {}
-  } catch {
-    return {}
-  }
-}
-
-function readConfiguredAgentDefault(): string {
-  const config = readAkmConfig()
-  // 0.8.0 canonical shape: defaults.agent. Fall back to the legacy agent.default
-  // slot when running against a pre-0.8 config that has not been migrated yet.
-  const defaults = config.defaults
-  if (defaults && typeof defaults === "object") {
-    const value = (defaults as Record<string, unknown>).agent
-    if (typeof value === "string" && value.trim()) return value.trim()
-  }
-  const agent = config.agent
-  if (agent && typeof agent === "object") {
-    const value = (agent as Record<string, unknown>).default
-    if (typeof value === "string" && value.trim()) return value.trim()
-  }
-  return ""
-}
-
-function writeConfiguredAgentDefault(platform: string): boolean {
-  if (!platform.trim()) return false
-  // #463: route through `akm config set` so akm's schema-walker / validator
-  // is the single source of truth for the on-disk shape. Direct JSON writes
-  // here would bypass strict-mode validation and the 5-backup ring buffer,
-  // and historically clobbered nearby keys when the legacy `agent.default`
-  // slot triggered an auto-migration.
-  const command = resolveAkmCommand()
-  if (typeof command === "object" && "ok" in command) return false
-  try {
-    // #463: --silent --layer user (akm-cli 0.8.0+) pins writes to the user
-    // config layer regardless of merged-read scope and silences hook-driven
-    // CLI output. Without them, hook writes could race with a project-layer
-    // override or pollute the parent process stdout.
-    execFileSync(
-      command.command,
-      [
-        ...command.argsPrefix,
-        "config",
-        "set",
-        "--silent",
-        "--layer",
-        "user",
-        `profiles.agent.${platform}`,
-        JSON.stringify({ platform }),
-      ],
-      { stdio: "ignore" },
-    )
-    execFileSync(
-      command.command,
-      [...command.argsPrefix, "config", "set", "--silent", "--layer", "user", "defaults.agent", platform],
-      { stdio: "ignore" },
-    )
-    return true
-  } catch {
-    return false
-  }
-}
-
-async function ensurePlatformAgentDefault(
-  client: LogCapableClient,
-  meta: { directory?: string; sessionID?: string; trigger: string; platform: string },
-): Promise<boolean> {
-  const command = resolveAkmCommand()
-  if (typeof command === "object" && "ok" in command) {
-    await writePluginLog(client, "warn", "AKM agent default check skipped", {
-      subsystem: "akm",
-      trigger: meta.trigger,
-      sessionID: meta.sessionID,
-      directory: meta.directory,
-      error: command.error,
-    })
-    return false
-  }
-
-  try {
-    const current = readConfiguredAgentDefault()
-    if (current) return true
-
-    if (!writeConfiguredAgentDefault(meta.platform)) {
-      throw new Error(`Failed to write ${getAkmConfigPath()}`)
-    }
-    await writePluginLog(client, "info", "AKM agent default initialized", {
-      subsystem: "akm",
-      trigger: meta.trigger,
-      sessionID: meta.sessionID,
-      directory: meta.directory,
-      agentDefault: meta.platform,
-    })
-    return true
-  } catch (error: unknown) {
-    await writePluginLog(client, "warn", "AKM agent default initialization failed", {
-      subsystem: "akm",
-      trigger: meta.trigger,
-      sessionID: meta.sessionID,
-      directory: meta.directory,
-      platform: meta.platform,
-      error: addAgentSetupGuidance(formatCliError(error)),
-      stdout: toLogString((error as { stdout?: unknown }).stdout) ?? "",
-      stderr: toLogString((error as { stderr?: unknown }).stderr) ?? "",
-    })
-    return false
-  }
-}
-
-async function ensureAgentSetup(
-  client: LogCapableClient,
-  meta: { directory?: string; sessionID?: string; trigger: string; platform: string },
-): Promise<boolean> {
-  if (agentSetupPromise) return agentSetupPromise
-  const promise = ensurePlatformAgentDefault(client, meta)
-  const trackedPromise = promise.finally(() => {
-    if (agentSetupPromise === trackedPromise) agentSetupPromise = null
-  })
-  agentSetupPromise = trackedPromise
-  return trackedPromise
+  if (/\bakm setup\b/i.test(message)) return message
+  return `${message}. Ask the user to run akm setup manually when interactive configuration is needed.`
 }
 
 function isNotIndexedFeedbackError(message: string): boolean {
@@ -524,15 +315,12 @@ function shouldIndexOnSessionEnd(): boolean {
   return (process.env.AKM_INDEX_ON_SESSION_END ?? "0") === "1"
 }
 
-function buildDateTag(options?: { includeTime?: boolean }): string {
-  const compactIso = new Date().toISOString().replace(/[-:]/g, "")
-  return compactIso.slice(0, options?.includeTime ? CHECKPOINT_DATE_TAG_LENGTH : SESSION_DATE_TAG_LENGTH)
-}
-
 function addBufferEntry(sessionID: string | undefined, entry: Omit<SessionBufferEntry, "timestamp">) {
   if (!sessionID) return
   const buf = sessionBuffer.get(sessionID) ?? []
   buf.push({ timestamp: nowIso(), ...entry })
+  // Drop-oldest cap (13: "Memory leaks" — sessionBuffer was uncapped).
+  if (buf.length > AKM_SESSION_BUFFER_MAX_ENTRIES) buf.splice(0, buf.length - AKM_SESSION_BUFFER_MAX_ENTRIES)
   sessionBuffer.set(sessionID, buf)
 }
 
@@ -554,9 +342,110 @@ function writeCuratedFile(sessionID: string, content: string): string {
   return filePath
 }
 
-
-function isAkmRef(value: string): boolean {
-  return AKM_REF_PATTERN.test(value)
+// 13: "Memory leaks" — session.deleted cleanup only cleared sessionHints,
+// sessionCurated, sessionWorkflow, sessionCuratorReport, the epoch/version
+// tracking pairs, and sessionBuffer. It missed retrospectiveState,
+// sessionRecallAudit, and the per-session pendingProposalSummaryCache entry
+// (cacheKey is the sessionID — see getPendingProposalCount), and never
+// deleted the session's curated tmp file. clearSessionState() is the single
+// place every session-keyed Map/tmp-file is torn down, so a future new map
+// would only need one line added here instead of another hand-maintained list
+// at the session.deleted call site.
+function clearSessionState(sessionID: string): void {
+  sessionHints.delete(sessionID)
+  sessionCurated.delete(sessionID)
+  const curatedFile = sessionCuratedFile.get(sessionID)
+  if (curatedFile) {
+    try {
+      rmSync(curatedFile, { force: true })
+    } catch {
+      // Best-effort: a failed tmp-file cleanup must not block session teardown.
+    }
+  }
+  sessionCuratedFile.delete(sessionID)
+  sessionWorkflow.delete(sessionID)
+  sessionCuratorReport.delete(sessionID)
+  sessionContextEpoch.delete(sessionID)
+  sessionContextInjectedEpoch.delete(sessionID)
+  sessionCuratedVersion.delete(sessionID)
+  sessionCuratedInjectedVersion.delete(sessionID)
+  sessionBuffer.delete(sessionID)
+  sessionLastExtractAt.delete(sessionID)
+  sessionRecallAudit.delete(sessionID)
+  pendingProposalSummaryCache.delete(sessionID)
+  retrospectiveState.delete(sessionID)
+}
+
+// Test-only: snapshot which session-keyed Maps still hold an entry for `sid`,
+// plus the current sessionBuffer contents. Lets tests assert clearSessionState()
+// actually emptied every map (13: "Memory leaks") without exporting the maps
+// themselves. Mirrors the __resetResolvedAkmForTests test-only export above.
+export function __sessionStateSnapshotForTests(sessionID: string): {
+  sessionHints: boolean
+  sessionCurated: boolean
+  sessionCuratedFile: boolean
+  sessionWorkflow: boolean
+  sessionCuratorReport: boolean
+  sessionContextEpoch: boolean
+  sessionContextInjectedEpoch: boolean
+  sessionCuratedVersion: boolean
+  sessionCuratedInjectedVersion: boolean
+  sessionBuffer: boolean
+  sessionBufferLength: number
+  sessionBufferRefs: string[]
+  sessionLastExtractAt: boolean
+  sessionRecallAudit: boolean
+  pendingProposalSummaryCache: boolean
+  retrospectiveState: boolean
+} {
+  return {
+    sessionHints: sessionHints.has(sessionID),
+    sessionCurated: sessionCurated.has(sessionID),
+    sessionCuratedFile: sessionCuratedFile.has(sessionID),
+    sessionWorkflow: sessionWorkflow.has(sessionID),
+    sessionCuratorReport: sessionCuratorReport.has(sessionID),
+    sessionContextEpoch: sessionContextEpoch.has(sessionID),
+    sessionContextInjectedEpoch: sessionContextInjectedEpoch.has(sessionID),
+    sessionCuratedVersion: sessionCuratedVersion.has(sessionID),
+    sessionCuratedInjectedVersion: sessionCuratedInjectedVersion.has(sessionID),
+    sessionBuffer: sessionBuffer.has(sessionID),
+    sessionBufferLength: sessionBuffer.get(sessionID)?.length ?? 0,
+    sessionBufferRefs: (sessionBuffer.get(sessionID) ?? []).flatMap((entry) => (entry.ref ? [entry.ref] : [])),
+    sessionLastExtractAt: sessionLastExtractAt.has(sessionID),
+    sessionRecallAudit: sessionRecallAudit.has(sessionID),
+    pendingProposalSummaryCache: pendingProposalSummaryCache.has(sessionID),
+    retrospectiveState: retrospectiveState.has(sessionID),
+  }
+}
+
+// Test-only: expose the curated tmp-file directory so tests can assert file
+// existence/absence without hardcoding os.tmpdir() path construction twice.
+export function __curatedDirForTests(): string {
+  return CURATED_DIR
+}
+
+// Best-effort sweep of orphaned curated tmp files (13: "tmp-file cleanup").
+// clearSessionState() handles the normal session.deleted path; this covers
+// sessions that never fire it (host crash, forced kill). Async and fully
+// error-trapped internally so a failed sweep never surfaces as an unhandled
+// rejection or blocks the session.created path that triggers it.
+async function pruneStaleCuratedFiles(): Promise<void> {
+  let entries: string[]
+  try {
+    entries = readdirSync(CURATED_DIR)
+  } catch {
+    return
+  }
+  const now = Date.now()
+  for (const name of entries) {
+    try {
+      const filePath = path.join(CURATED_DIR, name)
+      const info = statSync(filePath)
+      if (now - info.mtimeMs > CURATED_FILE_MAX_AGE_MS) rmSync(filePath, { force: true })
+    } catch {
+      // Best-effort per-file: a single stat/rm failure must not abort the sweep.
+    }
+  }
 }
 
 function parseMaybeJson(value: string): unknown {
@@ -585,10 +474,6 @@ function runCliSyncRaw(args: string[], timeoutMs: number): { ok: true; stdout: s
   }
 }
 
-function appendRunScopeArgs(args: string[], sessionID: string | undefined): string[] {
-  return sessionID ? [...args, "--run", sessionID] : args
-}
-
 function getScopeFields(): Array<"user" | "agent" | "run" | "channel"> {
   const configured = process.env.AKM_SCOPE_KEYS?.split(",").map((part) => part.trim()).filter(Boolean)
   const values = configured && configured.length > 0 ? configured : ["user", "agent", "run", "channel"]
@@ -621,125 +506,10 @@ function buildScopedArgs(context: Record<string, unknown> | undefined): string[]
   return args
 }
 
-function getHarnessStatePaths(): { stateDir: string; eventLog: string; candidateLog: string; opencodeLogDir: string } {
-  const stateDir = path.dirname(OPENCODE_EVENT_LOG)
-  return {
-    stateDir,
-    eventLog: OPENCODE_EVENT_LOG,
-    candidateLog: OPENCODE_CANDIDATE_LOG,
-    opencodeLogDir: path.join(process.env.XDG_DATA_HOME ?? path.join(process.env.HOME ?? ".", ".local", "share"), "opencode", "log"),
-  }
-}
-
-function formatPathBullet(label: string, filePath: string): string {
-  return `- ${label}: ${filePath}`
-}
-
-function countByValue(values: string[]): Array<[string, number]> {
-  const counts = new Map<string, number>()
-  for (const value of values) counts.set(value, (counts.get(value) ?? 0) + 1)
-  return [...counts.entries()].sort((left, right) => right[1] - left[1] || left[0].localeCompare(right[0]))
-}
-
-function uniqueRecent<T>(values: T[], key: (value: T) => string, limit: number): T[] {
-  const selected: T[] = []
-  const seen = new Set<string>()
-  for (let index = values.length - 1; index >= 0 && selected.length < limit; index -= 1) {
-    const value = values[index]
-    const id = key(value)
-    if (!id || seen.has(id)) continue
-    seen.add(id)
-    selected.push(value)
-  }
-  return selected.reverse()
-}
-
-function sessionHasPendingCheckpointEvidence(sessionID: string | undefined): boolean {
-  if (!sessionID) return false
-  return (sessionBuffer.get(sessionID) ?? []).some((entry) => !entry.checkpointed)
-}
-
-async function ensureFreshProposalCheckpoint(
-  client: LogCapableClient,
-  context: { sessionID?: string; directory?: string; agent?: string },
-  reason: string,
-): Promise<string | null> {
-  if (!context.sessionID || !sessionHasPendingCheckpointEvidence(context.sessionID)) return null
-  const ref = captureSessionMemory(context.sessionID, reason, { checkpoint: true })
-  if (!ref) return null
-  await writePluginLog(client, "info", "AKM proposal checkpoint captured", {
-    subsystem: "memory",
-    actor: "system",
-    sessionID: context.sessionID,
-    directory: context.directory,
-    agent: context.agent,
-    reason,
-    ref,
-  })
-  const indexResult = runCliSyncRaw(["index"], AKM_CURATE_TIMEOUT_MS)
-  if (!indexResult.ok) {
-    await writePluginLog(client, "warn", "AKM proposal checkpoint indexing failed", {
-      subsystem: "memory",
-      actor: "system",
-      sessionID: context.sessionID,
-      directory: context.directory,
-      agent: context.agent,
-      reason,
-      ref,
-      error: indexResult.error,
-    })
-  }
-  return ref
-}
-
 function truncateLine(value: string, maxChars = 220): string {
   return value.length <= maxChars ? value : `${value.slice(0, maxChars - 1)}...`
 }
 
-function formatEvidenceSummary(events: AkmMemoryEvent[], candidates: ReturnType<typeof readCandidates>, entries: SessionBufferEntry[]): string[] {
-  const lines: string[] = []
-  const toolRefs = entries.filter((entry) => entry.kind === "tool-ref" && entry.ref)
-  const touchedRefs = countByValue(toolRefs.map((entry) => entry.ref!))
-  const toolNames = countByValue(toolRefs.map((entry) => entry.toolName ?? "tool"))
-  const statuses = countByValue(toolRefs.map((entry) => entry.status ?? "unknown"))
-  const eventTypes = countByValue(events.map((event) => event.event))
-  const candidateTypes = countByValue(candidates.map((candidate) => candidate.type))
-
-  lines.push("## Evidence aggregates")
-  lines.push(`- buffered observations: ${entries.length}`)
-  if (toolRefs.length > 0) lines.push(`- asset-touch observations: ${toolRefs.length}`)
-  if (touchedRefs.length > 0) lines.push(`- top refs: ${touchedRefs.slice(0, 5).map(([ref, count]) => `${ref} (${count})`).join(", ")}`)
-  if (toolNames.length > 0) lines.push(`- tools involved: ${toolNames.slice(0, 5).map(([name, count]) => `${name} (${count})`).join(", ")}`)
-  if (statuses.length > 0) lines.push(`- statuses: ${statuses.map(([status, count]) => `${status} (${count})`).join(", ")}`)
-  if (eventTypes.length > 0) lines.push(`- event types: ${eventTypes.slice(0, 6).map(([event, count]) => `${event} (${count})`).join(", ")}`)
-  if (candidateTypes.length > 0) lines.push(`- candidate types: ${candidateTypes.map(([type, count]) => `${type} (${count})`).join(", ")}`)
-  lines.push("")
-
-  const notableEvents = uniqueRecent(events, (event) => `${event.timestamp}:${event.event}:${(event.refs ?? []).join(",")}`, 5)
-  if (notableEvents.length > 0) {
-    lines.push("## Notable recent events")
-    for (const event of notableEvents) {
-      const status = event.outcome?.status ?? "unknown"
-      const refs = Array.isArray(event.refs) && event.refs.length > 0 ? ` refs=${event.refs.join(", ")}` : ""
-      const warning = event.outcome?.warnings?.[0] ? ` warning=${truncateLine(event.outcome.warnings[0], 120)}` : ""
-      lines.push(`- ${event.timestamp} ${event.event} (${status})${refs}${warning}`)
-    }
-    lines.push("")
-  }
-
-  const notableCandidates = uniqueRecent(candidates, (candidate) => candidate.id, 5)
-  if (notableCandidates.length > 0) {
-    lines.push("## Candidate highlights")
-    for (const candidate of notableCandidates) {
-      const target = candidate.targetRef ? ` target=${candidate.targetRef}` : ""
-      lines.push(`- [${candidate.status}] ${candidate.type}/${candidate.scope}${target} :: ${truncateLine(candidate.content, 180)}`)
-    }
-    lines.push("")
-  }
-
-  return lines
-}
-
 function runCurate(args: string[]): string | null {
   const result = runCliSyncRaw(args, AKM_CURATE_TIMEOUT_MS)
   if (!result.ok) return null
@@ -761,20 +531,17 @@ async function runCurateLogged(
 async function runCurateForPrompt(client: LogCapableClient, text: string, sessionID?: string): Promise<string | null> {
   if (!text || text.length < AKM_CURATE_MIN_CHARS) return null
   return runCurateLogged(client,
-    appendRunScopeArgs(
-      [
-        "--shape",
-        "agent",
-        "--format",
-        "text",
-        "-q",
-        "curate",
-        text,
-        "--limit",
-        String(AKM_CURATE_LIMIT),
-      ],
-      sessionID,
-    ),
+    [
+      "--shape",
+      "agent",
+      "--format",
+      "text",
+      "-q",
+      "curate",
+      text,
+      "--limit",
+      String(AKM_CURATE_LIMIT),
+    ],
     { toolName: "chat.message", sessionID, operation: "prompt-curate" },
   )
 }
@@ -791,7 +558,7 @@ async function runCurateForSession(client: LogCapableClient, sessionID: string,
   if (query) args.push(query)
   args.push("--limit", String(AKM_CURATE_LIMIT))
   return runCurateLogged(client,
-    appendRunScopeArgs(args, sessionID),
+    args,
     { toolName: "session.start", sessionID, operation: "session-curate" },
   )
 }
@@ -822,11 +589,15 @@ function summarizeWorkflowList(value: unknown): string | null {
             ? record.workflowRef
             : null
         const state = typeof record.state === "string" ? record.state : typeof record.status === "string" ? record.status : null
-        const step = typeof record.step === "string"
-          ? record.step
-          : typeof record.currentStep === "string"
-            ? record.currentStep
-            : null
+        // akm 0.9.0 run summaries carry `currentStepId`; `step`/`currentStep`
+        // are retained as fallbacks for older envelope shapes.
+        const step = typeof record.currentStepId === "string"
+          ? record.currentStepId
+          : typeof record.step === "string"
+            ? record.step
+            : typeof record.currentStep === "string"
+              ? record.currentStep
+              : null
         if (!id && !ref && !state && !step) return null
         return `- ${ref ?? "workflow"} (${id ?? "run"})${state ? ` — ${state}` : ""}${step ? ` — next: ${step}` : ""}`
       })
@@ -871,55 +642,59 @@ function formatPendingProposalContext(count: number): string {
     "# AKM pending proposals",
     "",
     summaryLine,
-    "Use `/akm-review-proposals` or `akm_help topic=proposal` to review them.",
+    "Use the AKM CLI to review them; mutating proposal actions require explicit user approval.",
     PROPOSED_QUALITY_WARNING,
   ].join("\n")
 }
 
-function summarizeCuratorReportForContext(report: string): string {
-  if (report.length <= AKM_CURATOR_CONTEXT_MAX_CHARS) return report
-  return `${report.slice(0, AKM_CURATOR_CONTEXT_MAX_CHARS).trimEnd()}\n\n[truncated for context]`
-}
-
-async function getAkmStashDir(client?: LogCapableClient): Promise<string | undefined> {
-  if (cachedAkmStashDir !== undefined) return cachedAkmStashDir || undefined
+async function getAkmBundleDir(client?: LogCapableClient): Promise<string | undefined> {
+  const override = process.env.AKM_BUNDLE_DIR?.trim()
+  if (override) return override
+  if (cachedAkmBundleDir !== undefined) return cachedAkmBundleDir || undefined
   const raw = client
-    ? await runCliSyncBestEffort(client, ["--format", "json", "-q", "config", "get", "stashDir"], AKM_CURATE_TIMEOUT_MS, {
+    ? await runCliSyncBestEffort(client, ["info", "--format", "json", "-q"], AKM_CURATE_TIMEOUT_MS, {
       toolName: "shell.env",
-      subsystem: "config",
-      operation: "get-stash-dir",
+      subsystem: "info",
+      operation: "get-bundle-dir",
     })
-    : runCurate(["--format", "json", "-q", "config", "get", "stashDir"])
+    : runCurate(["info", "--format", "json", "-q"])
   if (!raw) {
-    cachedAkmStashDir = ""
+    cachedAkmBundleDir = ""
     return undefined
   }
   const parsed = parseMaybeJson(raw)
-  if (typeof parsed === "string" && parsed.trim()) {
-    cachedAkmStashDir = parsed.trim()
-    return cachedAkmStashDir
-  }
   if (parsed && typeof parsed === "object") {
-    for (const key of ["value", "path", "stashDir"]) {
-      const value = (parsed as Record<string, unknown>)[key]
-      if (typeof value === "string" && value.trim()) {
-        cachedAkmStashDir = value.trim()
-        return cachedAkmStashDir
-      }
+    const value = (parsed as Record<string, unknown>).bundleDir
+    if (typeof value === "string" && value.trim()) {
+      cachedAkmBundleDir = value.trim()
+      return cachedAkmBundleDir
     }
   }
-  cachedAkmStashDir = raw || ""
-  return cachedAkmStashDir || undefined
+  cachedAkmBundleDir = ""
+  return undefined
 }
 
 function warmIndexInBackground(): void {
   const command = resolveAkmCommand()
   if (typeof command === "object" && "ok" in command) return
   try {
-    // Fire and forget — execSync with a timeout would block, so spawn via the
-    // shell and detach. Errors here are never surfaced to the session.
-    const shellArgs = [command.command, ...command.argsPrefix, "index"].map((part) => JSON.stringify(part)).join(" ")
-    execSync(`${shellArgs} >/dev/null 2>&1 &`, { timeout: 2_000 })
+    // Fire and forget, no shell: detached + stdio "ignore" + unref() gives the
+    // same "start it and walk away" semantics the old `… &` shell string had,
+    // without any quoting concerns. (The previous version quoted argv with
+    // JSON.stringify, which is not POSIX shell quoting — a resolved bunx/binary
+    // path containing a backslash, newline, or embedded quote would have been
+    // mis-parsed by the shell.) Matches maybeExtractSessionOnIdle/queueFeedback.
+    // Errors here are never surfaced to the session.
+    const child = spawn(command.command, [...command.argsPrefix, "index"], {
+      detached: true,
+      stdio: "ignore",
+    })
+    // Required: an unhandled 'error' event (e.g. ENOENT) would otherwise throw
+    // asynchronously, outside the try/catch below.
+    child.on("error", () => {
+      // Intentionally ignore — warming is best-effort.
+    })
+    child.unref()
   } catch {
     // Intentionally ignore — warming is best-effort.
   }
@@ -1031,7 +806,7 @@ async function recordRetrospectiveFeedback(client: LogCapableClient, sessionID:
   }
 
   const targetRef = recentRefs[recentRefs.length - 1]
-  const raw = await runCli(client, ["feedback", targetRef, "--negative", "--note", text.slice(0, 280), ...buildScopedArgs({ sessionID })], {
+  const raw = await runCli(client, ["feedback", targetRef, "--negative", "--reason", text.slice(0, 280)], {
     toolName: "akm_feedback",
     sessionID,
   })
@@ -1079,21 +854,14 @@ function queueFeedback(
       command.command,
       [
         ...command.argsPrefix,
-        "--format",
-        "json",
-        "-q",
         "feedback",
         ref,
         sentiment === "positive" ? "--positive" : "--negative",
-        "--note",
+        "--reason",
         note,
-        ...buildScopedArgs({
-          sessionID: meta.sessionID,
-          directory: meta.directory,
-          agent: meta.agent,
-          userID: meta.userID,
-          channel: meta.channel,
-        }),
+        "--format",
+        "json",
+        "-q",
       ],
       {
         detached: true,
@@ -1142,203 +910,6 @@ function queueFeedback(
   }
 }
 
-function rememberTextAsMemory(name: string, body: string, context?: Record<string, unknown>): string | null {
-  const command = resolveAkmCommand()
-  if (typeof command === "object" && "ok" in command) return null
-  try {
-    execResolvedAkm(command, ["--format", "json", "-q", "remember", "--name", name, "--force", ...buildScopedArgs(context)], {
-      encoding: "utf8",
-      timeout: AKM_CURATE_TIMEOUT_MS * 2,
-      input: redactSecrets(body).text,
-    })
-    return `memory:${name}`
-  } catch {
-    return null
-  }
-}
-
-function captureSessionMemory(
-  sessionID: string,
-  reason: string,
-  options?: { checkpoint?: boolean; directory?: string; agent?: string; channel?: string; userID?: string; user?: string },
-): string | null {
-  if (!AKM_AUTO_MEMORY) return null
-  if (!sessionID) return null
-  const isCheckpoint = options?.checkpoint === true
-  if (!isCheckpoint && sessionFinalMemoryCaptured.has(sessionID)) return null
-  const entries = sessionBuffer.get(sessionID) ?? []
-  const pendingEntries = isCheckpoint ? entries.filter((entry) => !entry.checkpointed) : entries
-  // Require at least two observations before persisting — single events are noise.
-  if (pendingEntries.length < 2) {
-    if (!isCheckpoint) sessionBuffer.delete(sessionID)
-    return null
-  }
-
-  const relatedEvents = readJsonl<AkmMemoryEvent>(OPENCODE_EVENT_LOG)
-    .filter((event) => event.sessionId === sessionID)
-    .slice(-12)
-  const relatedCandidates = readCandidates(OPENCODE_CANDIDATE_LOG)
-    .filter((candidate) => candidate.sessionId === sessionID)
-    .slice(-8)
-  const harnessPaths = getHarnessStatePaths()
-
-  const lines: string[] = []
-  lines.push("---")
-  lines.push("akm_memory_kind: session_checkpoint")
-  lines.push("harness: opencode")
-  lines.push(`session_id: ${sessionID}`)
-  lines.push(`reason: ${reason}`)
-  lines.push("---")
-  lines.push("")
-  lines.push(`# Session summary (${nowIso()})`)
-  lines.push(`Reason: ${reason}`)
-  lines.push(`Session: ${sessionID}`)
-  lines.push("")
-  lines.push("## Full-detail evidence files")
-  lines.push(formatPathBullet("OpenCode state dir", harnessPaths.stateDir))
-  lines.push(formatPathBullet("Structured event log", harnessPaths.eventLog))
-  lines.push(formatPathBullet("Memory candidate log", harnessPaths.candidateLog))
-  lines.push(formatPathBullet("OpenCode host log dir", harnessPaths.opencodeLogDir))
-  const harnessLog = process.env.AKM_EVAL_HARNESS_LOG?.trim()
-  if (harnessLog) lines.push(formatPathBullet("Harness log", harnessLog))
-  lines.push("")
-  lines.push(...formatEvidenceSummary(relatedEvents, relatedCandidates, pendingEntries))
-  for (const entry of pendingEntries) {
-    if (entry.kind === "memory-intent") {
-      lines.push(`## ${entry.timestamp} — user memory intent`)
-      if (entry.note) lines.push(entry.note)
-      lines.push("")
-    } else {
-      lines.push(`## ${entry.timestamp} — ${entry.toolName ?? "tool"} ${entry.status ?? "unknown"}`)
-      if (entry.ref) lines.push(`- ref: ${entry.ref}`)
-      if (entry.note) lines.push(`- note: ${entry.note}`)
-      lines.push("")
-    }
-  }
-  if (relatedEvents.length > 0) {
-    lines.push("## Plugin event summary")
-    for (const event of relatedEvents) {
-      const status = event.outcome?.status ?? "unknown"
-      const refs = Array.isArray(event.refs) && event.refs.length > 0 ? ` — refs: ${event.refs.join(", ")}` : ""
-      lines.push(`- ${event.timestamp} — ${event.event} (${status})${refs}`)
-    }
-    lines.push("")
-  }
-  if (relatedCandidates.length > 0) {
-    lines.push("## Memory candidates observed")
-    for (const candidate of relatedCandidates) {
-      lines.push(`- [${candidate.status}] ${candidate.type}/${candidate.scope}: ${candidate.content}`)
-    }
-    lines.push("")
-  }
-  const body = lines.join("\n")
-
-  const dateTag = buildDateTag({ includeTime: isCheckpoint })
-  const shortSid = sessionID.replace(/[^A-Za-z0-9._-]/g, "").slice(0, 8) || "session"
-  const name = isCheckpoint
-    ? `opencode-checkpoint-${dateTag}-${shortSid}`
-    : `opencode-session-${dateTag}-${shortSid}`
-
-  const ref = rememberTextAsMemory(name, body, {
-    sessionID,
-    run: sessionID,
-    directory: options?.directory,
-    agent: options?.agent,
-    channel: options?.channel,
-    userID: options?.userID,
-    user: options?.user,
-  })
-  if (!ref) {
-    if (!isCheckpoint) {
-      sessionFinalMemoryCaptured.add(sessionID)
-      sessionBuffer.delete(sessionID)
-    }
-    return null
-  }
-
-  if (isCheckpoint) {
-    void writeStructuredEvent({
-      event: "pre_compact_checkpoint",
-      sessionId: sessionID,
-      scope: buildEventScope(sessionID),
-      memory: { ref, reason, kind: "session_checkpoint" },
-      refs: [ref],
-      outcome: { status: "ok" },
-    })
-    const targetRefHints = pendingEntries.flatMap((entry) => entry.ref ? [entry.ref] : [])
-    const candidates = extractCandidatesFromText({
-      harness: "opencode",
-      sessionId: sessionID,
-      text: body,
-      evidence: [ref, reason, ...targetRefHints],
-      sourcePaths: [harnessPaths.eventLog, harnessPaths.candidateLog],
-      targetRefHints,
-    })
-    if (candidates.length > 0) {
-      appendCandidates(OPENCODE_CANDIDATE_LOG, candidates)
-      void writeStructuredEvent({
-        event: "candidate_extracted",
-        sessionId: sessionID,
-        scope: buildEventScope(sessionID),
-        memory: { sourceRef: ref, count: candidates.length },
-        refs: [ref],
-        outcome: { status: "ok" },
-      })
-    }
-    for (const entry of entries) {
-      if (!entry.checkpointed) entry.checkpointed = true
-    }
-    sessionSuccessfulAssetTouchCount.set(sessionID, 0)
-    sessionBuffer.set(sessionID, entries)
-    return ref
-  }
-
-  sessionFinalMemoryCaptured.add(sessionID)
-  sessionBuffer.delete(sessionID)
-  void writeStructuredEvent({
-    event: "session_ended",
-    sessionId: sessionID,
-    scope: buildEventScope(sessionID),
-    memory: { ref, reason, kind: "session_checkpoint" },
-    refs: [ref],
-    outcome: { status: "ok" },
-  })
-  const targetRefHints = entries.flatMap((entry) => entry.ref ? [entry.ref] : [])
-  const candidates = extractCandidatesFromText({
-    harness: "opencode",
-    sessionId: sessionID,
-    text: body,
-    evidence: [ref, reason, ...targetRefHints],
-    sourcePaths: [harnessPaths.eventLog, harnessPaths.candidateLog],
-    targetRefHints,
-  })
-  if (candidates.length > 0) {
-    appendCandidates(OPENCODE_CANDIDATE_LOG, candidates)
-    void writeStructuredEvent({
-      event: "candidate_extracted",
-      sessionId: sessionID,
-      scope: buildEventScope(sessionID),
-      memory: { sourceRef: ref, count: candidates.length },
-      refs: [ref],
-      outcome: { status: "ok" },
-    })
-  }
-  return ref
-}
-
-function maybeCheckpointSessionMemory(
-  sessionID: string,
-  options?: { directory?: string; agent?: string; channel?: string; userID?: string; user?: string },
-): string | null {
-  const count = sessionSuccessfulAssetTouchCount.get(sessionID) ?? 0
-  if (count < AKM_MEMORY_CHECKPOINT_EVERY) return null
-  const captured = captureSessionMemory(sessionID, "checkpoint", { checkpoint: true, ...options })
-  if (!captured) {
-    sessionSuccessfulAssetTouchCount.set(sessionID, 0)
-  }
-  return captured
-}
-
 async function maybeIndexSessionMemory(
   client: LogCapableClient,
   sessionID: string,
@@ -1358,23 +929,57 @@ async function maybeIndexSessionMemory(
   })
 }
 
-const AKM_REF_EDGE_PUNCTUATION = new Set([".", ",", ";", ":", "!", "?", "(", ")", "[", "]", "{", "}", "'", "\"", "`"])
-
-function normalizeExtractedRef(ref: string): string {
-  let start = 0
-  let end = ref.length
-  while (start < end && AKM_REF_EDGE_PUNCTUATION.has(ref[start] ?? "")) start += 1
-  while (end > start && AKM_REF_EDGE_PUNCTUATION.has(ref[end - 1] ?? "")) end -= 1
-  return ref.slice(start, end)
-}
-
-function extractRefsFromText(value: string): string[] {
-  const refs = new Set<string>()
-  for (const token of value.split(/\s+/)) {
-    const normalized = normalizeExtractedRef(token)
-    if (normalized && isAkmRef(normalized)) refs.add(normalized)
+// 03-R1/06-M1 kept half: the session_checkpoint `remember --force` write is
+// gone, but the memory-candidate pipeline still harvests explicit
+// "remember ..." intents from the session buffer at session end. There is no
+// stash write and, as of 0.9, no in-product consumer either: the
+// /akm-memory-promote slash command that used to review these was deleted in
+// this release. Candidates are appended to the harness candidate log
+// (getCandidateLogPath("opencode") -> …/akm-opencode/memory-candidates.jsonl)
+// alongside a `candidate_extracted` structured event, and are read
+// out-of-band. Whether to retire the pipeline or re-home the review step is a
+// deliberately open maintainer decision, so the harvest stays wired up.
+// Deleting the buffer after extraction is the de-dup: a re-fired lifecycle
+// event finds an empty buffer and no-ops.
+function maybeExtractSessionCandidates(sessionID: string, reason: string): void {
+  if (!AKM_AUTO_MEMORY) return
+  if (!sessionID) return
+  const entries = sessionBuffer.get(sessionID) ?? []
+  // Require at least two observations before persisting — single events are noise.
+  if (entries.length < 2) {
+    // Below the noise floor, only the terminal session.deleted event may
+    // discard the buffer (the old discard-noise-at-session-end behavior).
+    // Non-terminal events (session.idle fires at every turn's quiescence,
+    // session.compacted mid-session) must KEEP a below-floor buffer so a
+    // lone "remember ..." intent from one turn survives to pair with an
+    // observation from a later turn instead of being wiped at each idle.
+    if (reason === "session.deleted") sessionBuffer.delete(sessionID)
+    return
   }
-  return [...refs]
+  const targetRefHints = entries.flatMap((entry) => (entry.ref ? [entry.ref] : []))
+  const text = entries
+    .filter((entry) => entry.kind === "memory-intent" && entry.note)
+    .map((entry) => entry.note as string)
+    .join("\n")
+  const candidates = extractCandidatesFromText({
+    harness: "opencode",
+    sessionId: sessionID,
+    text,
+    evidence: [reason, ...targetRefHints],
+    sourcePaths: [OPENCODE_EVENT_LOG, OPENCODE_CANDIDATE_LOG],
+    targetRefHints,
+  })
+  if (candidates.length > 0) {
+    appendCandidates(OPENCODE_CANDIDATE_LOG, candidates)
+    void writeStructuredEvent({
+      event: "candidate_extracted",
+      sessionId: sessionID,
+      scope: buildEventScope(sessionID),
+      memory: { count: candidates.length },
+      outcome: { status: "ok" },
+    })
+  }
+  sessionBuffer.delete(sessionID)
 }
 
 function extractToolRefs(
@@ -1386,7 +991,7 @@ function extractToolRefs(
   const positiveOnlyRefs = new Set<string>()
   const addMatches = (value: unknown) => {
     if (typeof value !== "string") return
-    for (const ref of extractRefsFromText(value)) refs.add(ref)
+    for (const ref of extractAkmRefsFromString(value)) refs.add(ref)
   }
 
   for (const key of ["ref", "package_ref"]) {
@@ -1407,15 +1012,6 @@ function extractToolRefs(
       }
     }
     if (toolName === "akm_remember" && typeof o.ref === "string") addMatches(o.ref)
-    if (
-      (toolName === "akm_agent" || toolName === "akm_cmd" || toolName === "akm_evolve")
-      && typeof o.text === "string"
-    ) {
-      for (const ref of extractRefsFromText(o.text)) {
-        refs.add(ref)
-        positiveOnlyRefs.add(ref)
-      }
-    }
   }
 
   return { refs: [...refs], positiveOnlyRefs: [...positiveOnlyRefs] }
@@ -1442,7 +1038,7 @@ const AKM_HINTS_PREFIX = [
   "",
   "**Choosing the right lookup command:**",
   "",
-  "- **`akm_curate`** — use this when starting any new task, looking for patterns, docs, skills, or workflows. This is the PRIMARY lookup command. v0.8.0 automatically boosts assets that match the current project (cwd-anchored project-context ranking), so an explicit project name in the query is no longer required for ranking — but it still helps the reranker frame intent.",
+  "- **`akm_curate`** — use this when starting any new task, looking for patterns, docs, skills, or workflows. This is the PRIMARY lookup command. akm automatically boosts assets that match the current project (cwd-anchored project-context ranking), so an explicit project name in the query is not required for ranking — but it still helps the reranker frame intent.",
   '  - Good: `akm_curate("akm CLI improve command performance analysis")` (explicit framing, still ideal)',
   '  - Bad: `akm_curate("improve performance analysis")` (too generic — the reranker has less to work with even with auto-boost)',
   "- **`akm_search` (known name)** — use ONLY when you already know an asset exists (e.g. after `akm_show` returned \"not found\") and need to locate its exact ref. Do not use as a discovery tool.",
@@ -1491,140 +1087,6 @@ function applyContextBudget(blocks: string[]): string[] {
   return injected
 }
 
-// Curated quick-reference for the long-tail of `akm` CLI verbs that no longer
-// have a dedicated tool wrapper. Surfaced through akm_help so agents can
-// always find the right invocation without polluting default context.
-type AkmHelpEntry = {
-  task: string
-  command: string
-  notes?: string
-  keywords: string[]
-}
-
-const AKM_HELP_QUICK_REFERENCE: readonly AkmHelpEntry[] = [
-  {
-    task: "Review pending proposals and decide whether to accept, reject, or revise them",
-    command: "akm proposal list --status pending --format json; akm proposal show <id>; akm proposal diff <id>",
-    notes: "Accept/reject requires explicit user approval.",
-    keywords: ["proposal", "review proposals", "pending proposals", "accept proposal", "reject proposal"],
-  },
-  {
-    task: "Bulk-triage the standing pending proposal backlog by policy",
-    command: "akm proposal drain --policy <personal-stash|conservative|manual> --dry-run",
-    notes: "Mutating: promotes/rejects in bulk and commits to git (no batch revert). Preview with --dry-run, then --promote --yes after explicit approval. Supersedes the old manual proposal-management agent session; also runs as the processes.triage improve pre-pass.",
-    keywords: ["proposal", "drain", "triage", "backlog", "bulk accept", "bulk reject"],
-  },
-  {
-    task: "Improve existing assets or distill repeated evidence into proposals",
-    command: "akm improve [<type>|<ref>] [--task \"...\"]",
-    notes: "Improve owns the former reflect/distill flow; proposed assets are not curated until accepted. Profiles add a processes.triage pre-pass and end-of-run sync.",
-    keywords: ["improve", "lesson", "reflect", "distill", "drift", "failure"],
-  },
-  {
-    task: "Manage scheduled task assets via the OS scheduler",
-    command: "akm tasks <add|list|show|remove|enable|disable|run|history|sync|doctor> ...",
-    notes: "Tasks are first-class in v0.8.0 but remain a long-tail CLI surface in this plugin.",
-    keywords: ["tasks", "scheduled task", "cron", "launchd", "schtasks"],
-  },
-  {
-    task: "Create a proposed asset for a coverage gap",
-    command: "akm propose <type> <name> --task \"...\"",
-    notes: PROPOSED_QUALITY_WARNING,
-    keywords: ["propose", "coverage gap", "proposed asset"],
-  },
-  {
-    task: "Search including proposed-quality assets",
-    command: "akm search <query> --include-proposed",
-    notes: PROPOSED_QUALITY_WARNING,
-    keywords: ["include-proposed", "proposed quality", "lesson"],
-  },
-  {
-    task: "Install a kit or register an external source (npm, GitHub, git, URL, local dir)",
-    command: "akm add <package-ref> [--name <n>] [--type wiki] [--writable] [--provider <p>] [--max-pages N] [--max-depth N] [--allow-insecure]",
-    notes: "Confirm with the user before registering a website crawler or passing --allow-insecure.",
-    keywords: ["add", "install", "register", "kit", "source", "github", "npm"],
-  },
-  {
-    task: "Commit and push pending stash changes",
-    command: "akm sync [<source-name>] [-m <msg>] [--no-push]",
-    notes: "For writable git-backed sources, sync commits and pushes by default (pass --no-push to skip); review the diff first.",
-    keywords: ["sync", "save", "commit", "push", "publish", "git"],
-  },
-  {
-    task: "Import a file (or stdin) into the stash as a typed asset",
-    command: "akm import <path|-> [--name <name>] [--force]",
-    notes: "Use `-` and pipe content via stdin to import a string.",
-    keywords: ["import", "ingest", "upload", "stdin"],
-  },
-  {
-    task: "Clone an asset from any source for editing",
-    command: "akm clone <ref> [--name <new>] [--dest <dir>] [--force]",
-    notes: "Type subdirectory is appended automatically; ref may include origin (e.g. npm:@scope/pkg//script:foo).",
-    keywords: ["clone", "copy", "fork", "edit"],
-  },
-  {
-    task: "Update a managed source (or all of them)",
-    command: "akm update [<package_ref>|--all] [--force]",
-    keywords: ["update", "upgrade kit", "refresh", "pull"],
-  },
-  {
-    task: "Remove a configured source and reindex",
-    command: "akm remove <id|ref|path|url|name>",
-    notes: "Destructive — confirm intent before running.",
-    keywords: ["remove", "uninstall", "delete source"],
-  },
-  {
-    task: "List configured sources (local dirs, kits, remotes)",
-    command: "akm list",
-    keywords: ["list", "sources", "kits", "show sources"],
-  },
-  {
-    task: "Search the registry only (skip local stash)",
-    command: "akm registry search <query> [--limit N] [--assets]",
-    notes: "akm_search with source='registry' covers most cases; this is the explicit form.",
-    keywords: ["registry", "search registry", "installable", "discover kit"],
-  },
-  {
-    task: "Build or rebuild the stash search index",
-    command: "akm index",
-    notes: "Rarely needed — the index refreshes implicitly after writes.",
-    keywords: ["index", "reindex", "rebuild"],
-  },
-  {
-    task: "Manage whole-file secrets outside the chat-safe read surface",
-    command: "akm secret <set|run|remove> ...",
-    notes: "Use the first-class akm_secret tool for list/path. Secret values must never be pasted back into chat; `set` reads from stdin/--from-file/--from-env and `run` injects into a child process only.",
-    keywords: ["secret", "docker secret", "pem", "token", "_FILE"],
-  },
-  {
-    task: "View or update akm config (get/set/list/unset/path)",
-    command: "akm config <action> [<key>] [<value>] [--all]",
-    notes: "`akm config path --all` prints config, stash, cache, and index paths.",
-    keywords: ["config", "settings", "configure", "path"],
-  },
-  {
-    task: "Check for or install an akm CLI update",
-    command: "akm upgrade [--check] [--force]",
-    keywords: ["upgrade cli", "update cli", "self-upgrade"],
-  },
-  {
-    task: "Run a stash script end-to-end (resolve → show → run)",
-    command: "akm show <script-ref> # then exec the printed `run` command",
-    notes: "Or `akm --format json -q show <ref>` and pipe `.run` into your shell.",
-    keywords: ["run", "execute", "script", "exec"],
-  },
-]
-
-function lookupAkmHelpHint(topic: string): AkmHelpEntry[] {
-  const needle = topic.toLowerCase().trim()
-  if (!needle) return []
-  return AKM_HELP_QUICK_REFERENCE.filter((entry) =>
-    entry.keywords.some((kw) => needle.includes(kw))
-    || entry.task.toLowerCase().includes(needle)
-    || entry.command.toLowerCase().includes(needle),
-  )
-}
-
 function extractSessionIdFromEvent(payload: unknown): string | undefined {
   if (!payload || typeof payload !== "object") return undefined
   const p = payload as Record<string, unknown>
@@ -1645,6 +1107,123 @@ function extractSessionIdFromEvent(payload: unknown): string | undefined {
   return undefined
 }
 
+// Cap on how much of the extract child's stdout/stderr we retain for logging.
+// The envelope we care about is a few hundred bytes; anything past this is
+// dropped so a chatty/looping child can never grow the buffer unbounded.
+const AKM_EXTRACT_OUTPUT_MAX_CHARS = 2_000
+
+// `unref()` exists on the net.Socket that node hands back for a piped child
+// stream, but not on the `Readable` the @types/node signature advertises.
+// Unref'ing keeps the piped fds from holding the host's event loop open, which
+// is what preserves the fire-and-forget contract now that stdio is captured.
+function unrefChildStream(stream: unknown): void {
+  const handle = stream as { unref?: () => void } | null | undefined
+  if (handle && typeof handle.unref === "function") handle.unref()
+}
+
+/**
+ * Event-driven extraction trigger for opencode (Option #3: min-interval gate).
+ * Called on `session.idle` (which fires after every turn). Extracts the session
+ * into the proposal queue at most once per AKM_EXTRACT_MIN_INTERVAL_MS, so a
+ * burst of turns collapses to a single periodic checkpoint instead of flooding.
+ * `extract --session-id` respects the content-hash ledger, so an extract landing
+ * on unchanged content is a free no-op. Fire-and-forget (detached + unref'd) so
+ * it never stalls the turn; the hourly `akm improve` extract pass remains the backstop for the final delta.
+ *
+ * The outcome is reported through the normal plugin log + telemetry channels.
+ * This is the only remaining memory-harvest path in 0.9, and on a default
+ * install it does not work: `akm proposal extract` needs an LLM engine, and
+ * without one it answers `{ ok: false, code: "LLM_NOT_CONFIGURED", … }`. Real
+ * akm prints that envelope on stderr and exits non-zero, but the shape is not
+ * guaranteed across builds (the fake in evals/lib/fake-akm.ts models a build
+ * that returns the same `ok: false` body while exiting 0). Discarding the
+ * child's output — the previous `stdio: "ignore"` — therefore turned the most
+ * likely failure in the whole feature into a silent no-op with nothing to
+ * grep for. We now capture the envelope and treat `ok: false` as a failure
+ * regardless of exit status, so the actionable code/hint reaches the log.
+ */
+function maybeExtractSessionOnIdle(client: LogCapableClient, sid: string, directory: string | undefined): void {
+  const now = Date.now()
+  const last = sessionLastExtractAt.get(sid) ?? 0
+  if (now - last < AKM_EXTRACT_MIN_INTERVAL_MS) return
+  const command = resolveAkmCommand()
+  if (typeof command === "object" && "ok" in command) return // akm unavailable — cron backstop covers it
+  sessionLastExtractAt.set(sid, now)
+
+  const reportExtractFailure = (error: string, extra?: Record<string, unknown>): void => {
+    void writePluginLog(client, "warn", "AKM extract failed", {
+      subsystem: "extract",
+      sessionID: sid,
+      directory,
+      error,
+      ...extra,
+    })
+    void emitWorkflowTelemetry(client, "warn", "akm.extract.failed", {
+      sessionID: sid,
+      directory,
+      toolName: "session.idle",
+      outcome: "error",
+      reason: error,
+      ...extra,
+    })
+  }
+
+  try {
+    const child = spawn(
+      command.command,
+      [...command.argsPrefix, "proposal", "extract", "--type", "opencode", "--session-id", sid, "--format", "json", "-q"],
+      {
+        detached: true,
+        // Piped rather than ignored so the `ok:false` envelope is observable;
+        // both pipes are unref'd below so this stays fire-and-forget.
+        stdio: ["ignore", "pipe", "pipe"],
+      },
+    )
+    let output = ""
+    for (const stream of [child.stdout, child.stderr]) {
+      if (!stream) continue
+      unrefChildStream(stream)
+      stream.setEncoding("utf8")
+      stream.on("data", (chunk: string) => {
+        if (output.length < AKM_EXTRACT_OUTPUT_MAX_CHARS) output += chunk
+      })
+      // A pipe torn down with the detached child must not raise here.
+      stream.on("error", () => {})
+    }
+    // "close" rather than "exit": it fires once the piped stdio has also been
+    // drained, so `output` is complete when we inspect the envelope.
+    child.on("close", (code, signal) => {
+      const body = output.trim().slice(0, AKM_EXTRACT_OUTPUT_MAX_CHARS)
+      const envelope = safeJsonParse<{ ok?: boolean; error?: string; code?: string; hint?: string }>(body)
+      const exitFailed = (typeof code === "number" && code !== 0) || !!signal
+      if (envelope?.ok === false || exitFailed) {
+        const reason = envelope?.error
+          ?? (signal ? `akm extract exited via signal ${signal}` : `akm extract exited with code ${code}`)
+        reportExtractFailure(reason, {
+          akmCode: envelope?.code,
+          hint: envelope?.hint,
+          exitCode: code,
+          // Only fall back to the raw body when it was not parseable JSON —
+          // otherwise the structured fields above already carry everything.
+          output: envelope ? undefined : truncateLogText(body, 400) || undefined,
+        })
+        return
+      }
+      void writePluginLog(client, "info", "AKM extract completed", {
+        subsystem: "extract",
+        sessionID: sid,
+        directory,
+      })
+    })
+    child.on("error", (error) => {
+      reportExtractFailure(formatCliError(error))
+    })
+    child.unref()
+  } catch (error: unknown) {
+    reportExtractFailure(formatCliError(error))
+  }
+}
+
 function extractFirstSemverMatch(value: string): string | null {
   return value.match(SEMVER_PATTERN)?.[0] ?? null
 }
@@ -1691,8 +1270,19 @@ function getLocalBuildAkmCommand(): ResolvedAkmCommand | null {
   }
 }
 
-function execResolvedAkm(command: ResolvedAkmCommand, args: string[], options?: Parameters<typeof execFileSync>[2]) {
-  return execFileSync(command.command, [...command.argsPrefix, ...args], options)
+// Every call site passes `encoding: "utf8"`, so the real runtime return value
+// is always a string — but `execFileSync`'s overloads resolve on the exact
+// shape of the options argument, and forwarding a loosely-typed `options`
+// parameter defeats that resolution, leaving the inferred return type
+// `string | Buffer`. Pin the options type to require `encoding: "utf8"` and
+// assert the (already-guaranteed) string return so callers get real string
+// typing without changing behavior.
+type ExecResolvedAkmOptions = Omit<NonNullable<Parameters<typeof execFileSync>[2]>, "encoding"> & {
+  encoding: "utf8"
+}
+
+function execResolvedAkm(command: ResolvedAkmCommand, args: string[], options: ExecResolvedAkmOptions): string {
+  return execFileSync(command.command, [...command.argsPrefix, ...args], options) as string
 }
 
 function probeCommand(command: ResolvedAkmCommand): CommandProbe {
@@ -1707,9 +1297,19 @@ function probeCommand(command: ResolvedAkmCommand): CommandProbe {
     return { ...command, exists: false, version: null, failureReason: "command_not_on_disk" }
   }
   try {
+    // Pipe (don't inherit) the child's stderr. Some akm builds validate the
+    // user's config on EVERY invocation — including `--version` — and a version
+    // skew (e.g. a bundled akm-cli@0.8.x against a config written by 0.9.x, whose
+    // improve process keys 0.8 rejects) makes `--version` exit non-zero and print
+    // an INVALID_CONFIG_FILE blob to stderr. With the default inherited stderr
+    // that blob leaks to OpenCode's console on every plugin load, reading as a
+    // plugin failure even though resolution correctly falls through to a
+    // compatible akm. Capturing it keeps the probe silent; the structured
+    // resolution trail / consent banner still surfaces a genuine no-akm case.
     const version = execResolvedAkm(command, ["--version"], {
       encoding: "utf8",
       timeout: 10_000,
+      stdio: ["ignore", "pipe", "pipe"],
     })
     const parsed = extractFirstSemverMatch(version)
     if (!parsed) {
@@ -1725,13 +1325,6 @@ function probeCommand(command: ResolvedAkmCommand): CommandProbe {
   }
 }
 
-function satisfiesAkmVersionRange(version: string | null): boolean {
-  if (typeof version !== "string") return false
-  const match = version.match(/^(\d+)\.(\d+)\.(\d+)(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?$/)
-  if (!match) return false
-  return Number(match[1]) === 0 && Number(match[2]) === 8
-}
-
 function getBundledAkmCommand(): string | null {
   const packagePath = path.join(moduleDir, "node_modules", "akm-cli", "package.json")
   const fallback = path.join(moduleDir, "node_modules", ".bin", process.platform === "win32" ? "akm.cmd" : "akm")
@@ -1786,18 +1379,28 @@ let lastAkmResolutionTrail: AkmResolutionTrail = []
 
 function getResolvedAkmDetails(): { command: string; argsPrefix: string[]; displayCommand: string; version: string; source: "bundled" | "path" | "local_build" } | null {
   const candidates: Array<{ command: string; argsPrefix: string[]; displayCommand: string; source: "bundled" | "path" | "local_build" }> = []
-  // Opt-out (default off): force the plugin to ignore its bundled akm-cli and
-  // fall through to AKM_LOCAL_BUILD_CLI / PATH. Used by the eval harness so a
-  // deterministic fake `akm` on PATH wins over the real bundled dependency;
-  // also a useful escape hatch when a bundled dep is broken.
-  const ignoreBundled = process.env.AKM_OPENCODE_IGNORE_BUNDLED_CLI === "1"
-  const bundled = ignoreBundled ? null : getBundledAkmCommand()
-  if (bundled) candidates.push({ command: bundled, argsPrefix: [], displayCommand: bundled, source: "bundled" })
+  // Resolution precedence — first compatible candidate wins:
+  //   1. AKM_LOCAL_BUILD_CLI  — explicit dev override
+  //   2. PATH / user installs — the akm the user actually installed, which wrote
+  //      their config and has its native deps (e.g. embeddings) built
+  //   3. bundled akm-cli      — last-resort fallback for users with no akm
+  // The bundled CLI is deliberately LAST: preferring it over the user's own
+  // install would ignore a newer user akm that understands a newer config and
+  // route through a bundled copy whose native postinstalls may be unbuilt. A
+  // config-INCOMPATIBLE candidate fails its `--version` probe — older akm builds
+  // validate config on every invocation and exit non-zero — so it is skipped
+  // silently and the version probe doubles as a config-compatibility gate.
   const localBuild = getLocalBuildAkmCommand()
   if (localBuild) candidates.push({ ...localBuild, source: "local_build" })
   for (const command of getPathAkmCandidates()) {
     candidates.push({ command, argsPrefix: [], displayCommand: command, source: "path" })
   }
+  // Opt-out (default off): drop the bundled fallback entirely. Used by the eval
+  // harness so a deterministic fake `akm` on PATH is the only candidate; also a
+  // useful escape hatch when the bundled dep is broken.
+  const ignoreBundled = process.env.AKM_OPENCODE_IGNORE_BUNDLED_CLI === "1"
+  const bundled = ignoreBundled ? null : getBundledAkmCommand()
+  if (bundled) candidates.push({ command: bundled, argsPrefix: [], displayCommand: bundled, source: "bundled" })
 
   const trail: AkmResolutionTrail = []
   const seen = new Set<string>()
@@ -1829,10 +1432,11 @@ function getResolvedAkmDetails(): { command: string; argsPrefix: string[]; displ
 // The OpenCode plugin has never silently auto-installed akm-cli — it relies on
 // the bundled binary that ships with the plugin, falling back to PATH. When
 // neither path produces a compatible akm we log a warn-level event to the host
-// AND write a stderr banner so the human running OpenCode actually sees the
-// problem. The banner mirrors the Claude plugin's wording: install must be
-// user-driven, never automatic. The recommended consent point is `akm setup`
-// (or the host-specific akm setup slash command if one exists).
+// AND emit a consent banner through the host's structured logging channel so
+// the human running OpenCode actually sees the problem. The banner mirrors
+// the Claude plugin's wording: install must be user-driven, never automatic.
+// The recommended consent point is `akm setup` (or the host-specific akm
+// setup slash command if one exists).
 async function ensureSupportedAkmResolved(client: LogCapableClient): Promise<void> {
   const installedAkm = getResolvedAkmDetails()
   if (!installedAkm) {
@@ -1844,7 +1448,7 @@ async function ensureSupportedAkmResolved(client: LogCapableClient): Promise<voi
       reason: "no_supported_command",
       trail: lastAkmResolutionTrail,
     })
-    writeAkmConsentBanner({
+    await writeAkmConsentBanner(client, {
       detected: getCommandVersion("akm") ?? undefined,
       bundled: getBundledAkmCommand(),
       trail: lastAkmResolutionTrail,
@@ -1862,7 +1466,7 @@ async function ensureSupportedAkmResolved(client: LogCapableClient): Promise<voi
   })
 }
 
-function writeAkmConsentBanner(info: { detected?: string; bundled?: string | null; trail?: AkmResolutionTrail }) {
+async function writeAkmConsentBanner(client: LogCapableClient, info: { detected?: string; bundled?: string | null; trail?: AkmResolutionTrail }) {
   const detectedLabel = info.detected ?? "(not found on PATH)"
   const bundledLabel = info.bundled ?? "(none)"
   const trailLines: string[] = []
@@ -1884,16 +1488,23 @@ function writeAkmConsentBanner(info: { detected?: string; bundled?: string | nul
     "",
     "Reinstall or update the akm-opencode plugin so OpenCode/Bun",
     "installs the dependency, or install akm-cli manually:",
-    "  bun install -g akm-cli@^0.8.0",
-    "  npm install -g akm-cli@^0.8.0",
+    `  bun install -g ${AKM_RECOMMENDED_INSTALL_REF}`,
+    `  npm install -g ${AKM_RECOMMENDED_INSTALL_REF}`,
     "Then run `akm setup` interactively to configure the stash.",
     "─".repeat(60),
   ].join("\n")
-  try {
-    process.stderr.write(banner + "\n")
-  } catch {
-    // best-effort; never crash the plugin over a banner
-  }
+  // AGENTS.md forbids plugin runtime code from writing to
+  // console.*/stdout/stderr; route the banner through the host's structured
+  // logging channel (client.app.log) instead of process.stderr.write so it
+  // still reaches the user without violating that rule.
+  await writePluginLog(client, "warn", "akm CLI not installed or wrong version", {
+    subsystem: "akm",
+    detected: detectedLabel,
+    bundled: bundledLabel,
+    required: AKM_REQUIRED_VERSION_RANGE,
+    installRef: AKM_RECOMMENDED_INSTALL_REF,
+    banner,
+  })
 }
 
 function resolveAkmCommand(): ResolvedAkmCommand | CliError {
@@ -1937,9 +1548,9 @@ async function runCli(client: LogCapableClient, args: string[], meta: CliLogMeta
     return JSON.stringify(command)
   }
 
-  // `akm improve` hard-rejects --format in 0.8.0 (cli.ts:4131-4137); never auto-inject it there.
-  const skipFormatInjection = args[0] === "improve"
-  const fullArgs = skipFormatInjection || args.includes("--format") ? [...args] : [...args, "--format", "json"]
+  // --format is a global flag on every 0.9.0 verb (the 0.8.0-era `akm improve`
+  // hard-reject is gone), so it is safe to auto-inject unconditionally.
+  const fullArgs = args.includes("--format") ? [...args] : [...args, "--format", "json"]
   const proposalId = args[0] === "proposal" && typeof args[2] === "string" ? args[2] : null
 
   const recordSuccess = async (stdout: string): Promise<string> => {
@@ -1956,8 +1567,8 @@ async function runCli(client: LogCapableClient, args: string[], meta: CliLogMeta
     })
     const parsed = safeJsonParse<SearchResponse>(stdout)
     const refs = args[0] === "search" || args[0] === "curate"
-      ? [...new Set([...(parsed?.hits?.flatMap((hit) => hit.ref ? [hit.ref] : []) ?? []), ...extractRefsFromText(stdout)])]
-      : extractRefsFromText(stdout)
+      ? [...new Set([...(parsed?.hits?.flatMap((hit) => hit.ref ? [hit.ref] : []) ?? []), ...extractAkmRefsFromString(stdout)])]
+      : extractAkmRefsFromString(stdout)
     noteRecentRefs(meta.sessionID, refs)
     if (meta.toolName === "akm_search") {
       await emitWorkflowTelemetry(client, "info", "akm.search.invoked", {
@@ -2018,9 +1629,6 @@ async function runCli(client: LogCapableClient, args: string[], meta: CliLogMeta
     return recordSuccess(stdout)
   } catch (error: unknown) {
     let message = formatCliError(error)
-    if (["akm_improve", "akm_propose"].includes(meta.toolName) && needsAgentSetup(message)) {
-      message = addAgentSetupGuidance(message)
-    }
     message = addAgentSetupGuidance(message)
     await writePluginLog(client, "error", "AKM command failed", {
       subsystem: "akm",
@@ -2047,64 +1655,89 @@ async function runCli(client: LogCapableClient, args: string[], meta: CliLogMeta
   }
 }
 
+async function runInProcess(
+  client: LogCapableClient,
+  operation: "search" | "show" | "curate",
+  input: Record<string, unknown>,
+  meta: CliLogMeta,
+): Promise<string> {
+  try {
+    const result = operation === "search"
+      ? await akmSearch(input as Parameters<typeof akmSearch>[0])
+      : operation === "show"
+        ? await akmShowUnified(input as Parameters<typeof akmShowUnified>[0])
+        : await akmCurate(input as Parameters<typeof akmCurate>[0])
+    const output = JSON.stringify(result)
+    const refs = extractAkmRefsFromString(output)
+    noteRecentRefs(meta.sessionID, refs)
+    await writePluginLog(client, "info", "AKM in-process call completed", {
+      subsystem: "akm",
+      toolName: meta.toolName,
+      sessionID: meta.sessionID,
+      directory: meta.directory,
+      operation,
+      refs,
+    })
+    await emitWorkflowTelemetry(client, "info", `akm.${operation}.invoked`, {
+      sessionID: meta.sessionID,
+      toolName: meta.toolName,
+      assetRef: operation === "show" ? String(input.ref ?? refs[0] ?? "") || null : refs[0] ?? null,
+      outcome: "success",
+      directory: meta.directory,
+    })
+    return output
+  } catch (error: unknown) {
+    const message = formatCliError(error)
+    await writePluginLog(client, "error", "AKM in-process call failed", {
+      subsystem: "akm",
+      toolName: meta.toolName,
+      sessionID: meta.sessionID,
+      directory: meta.directory,
+      operation,
+      error: message,
+    })
+    await emitWorkflowTelemetry(client, "warn", `${meta.toolName}.failed`, {
+      sessionID: meta.sessionID,
+      toolName: meta.toolName,
+      outcome: "error",
+      reason: message,
+      directory: meta.directory,
+    })
+    return JSON.stringify({ ok: false, error: message })
+  }
+}
+
 type CliError = { ok: false; error: string }
-type AssetType =
-  | "agent"
-  | "command"
-  | "knowledge"
-  | "lesson"
-  | "memory"
-  | "script"
-  | "skill"
-  | "task"
-  | "workflow"
-  | "env"
-  | "secret"
-  | "wiki"
 
+// The AKM 0.9 asset-type vocabulary, in the singular form `--type` accepts.
+// This is exactly `akm info --format json` -> .assetTypes, sorted; keep the two
+// in step when akm adds a type. Note there is no `wiki` type in 0.9 — the entry
+// that used to be here made `type: "wiki"` a selectable enum value that akm
+// answers with an empty hit list rather than an error, i.e. a silent dead end,
+// while `instruction`, `session`, and `fact` could not be filtered for at all.
+// `any` is a tool-surface sentinel, not an akm type: it means "no filter" and is
+// stripped before the value reaches akm, so it sorts last.
 const ASSET_TYPES = [
   "agent",
   "command",
+  "env",
+  "fact",
+  "instruction",
   "knowledge",
   "lesson",
   "memory",
   "script",
+  "secret",
+  "session",
   "skill",
   "task",
   "workflow",
-  "env",
-  "secret",
-  "wiki",
   "any",
 ] as const
 
-type ShowAgentResponse = {
-  type: "agent"
-  name: string
-  path: string
-  description?: string
-  prompt?: string
-  toolPolicy?: unknown
-  modelHint?: unknown
-  editable?: boolean
-  origin?: string | null
-  action?: string
-  editHint?: string
-}
-
-type ShowCommandResponse = {
-  type: "command"
-  name: string
-  path: string
-  description?: string
-  template?: string
-  editable?: boolean
-  agent?: string
-  origin?: string | null
-  action?: string
-  parameters?: string[]
-  editHint?: string
-}
+// Derived from ASSET_TYPES so the enum published on the akm_search/akm_curate
+// tool surface and the type carried by search hits cannot drift apart again.
+type AssetType = Exclude<(typeof ASSET_TYPES)[number], "any">
 
 type ShowToolResponse = {
   type: "tool" | "script"
@@ -2154,46 +1787,6 @@ function isShowToolResponse(value: unknown): value is ShowToolResponse {
     && ((value as { type?: unknown }).type === "tool" || (value as { type?: unknown }).type === "script")
 }
 
-function isShowAgentResponse(value: unknown): value is ShowAgentResponse {
-  return !!value
-    && typeof value === "object"
-    && (value as { type?: unknown }).type === "agent"
-}
-
-function isShowCommandResponse(value: unknown): value is ShowCommandResponse {
-  return !!value
-    && typeof value === "object"
-    && (value as { type?: unknown }).type === "command"
-}
-
-function parseCliJson<T>(raw: string): T | CliError {
-  try {
-    return JSON.parse(raw) as T
-  } catch {
-    return {
-      ok: false,
-      error: "akm CLI returned non-JSON output",
-    }
-  }
-}
-
-function formatAkmInfoResponse(raw: string): string {
-  const parsed = parseCliJson<Record<string, unknown>>(raw)
-  if (isCliError(parsed)) return JSON.stringify(parsed)
-  return JSON.stringify({
-    ok: true,
-    pluginVersion: PLUGIN_VERSION,
-    pluginInstallLocation: PLUGIN_INSTALL_LOCATION,
-    akmInfo: parsed,
-  })
-}
-
-function blockedToolResponse(args: Record<string, unknown>): string | null {
-  return typeof args.__akmBlocked === "string"
-    ? JSON.stringify({ ok: false, error: args.__akmBlocked })
-    : null
-}
-
 function isCliError(value: unknown): value is CliError {
   return !!value
     && typeof value === "object"
@@ -2202,62 +1795,6 @@ function isCliError(value: unknown): value is CliError {
     && "error" in value
 }
 
-function parseModelHint(modelHint: unknown): { providerID: string; modelID: string } | undefined {
-  if (typeof modelHint !== "string") return undefined
-  const [providerID, ...modelParts] = modelHint.split("/")
-  const modelID = modelParts.join("/")
-  if (!providerID || !modelID) return undefined
-  return { providerID, modelID }
-}
-
-function resolveDispatchTarget(requested: string | undefined, fallbackAgent: string): DispatchTarget {
-  const trimmed = requested?.trim()
-  if (!trimmed) {
-    return { agent: fallbackAgent, requested: fallbackAgent }
-  }
-  const model = parseModelHint(trimmed)
-  if (model) {
-    return { agent: fallbackAgent, model, requested: trimmed }
-  }
-  return { agent: trimmed, requested: trimmed }
-}
-
-function parseToolPolicy(toolPolicy: unknown): Record<string, boolean> | undefined {
-  const result: Record<string, boolean> = {}
-
-  const assign = (key: string, value: unknown) => {
-    const normalizedKey = key.trim().toLowerCase()
-    if (!normalizedKey) return
-    if (typeof value === "boolean") {
-      result[normalizedKey] = value
-      return
-    }
-    if (typeof value === "string") {
-      if (value === "allow") result[normalizedKey] = true
-      if (value === "deny") result[normalizedKey] = false
-    }
-  }
-
-  if (typeof toolPolicy === "string") {
-    assign(toolPolicy, true)
-    return Object.keys(result).length > 0 ? result : undefined
-  }
-
-  if (Array.isArray(toolPolicy)) {
-    for (const item of toolPolicy) {
-      if (typeof item === "string") assign(item, true)
-    }
-    return Object.keys(result).length > 0 ? result : undefined
-  }
-
-  if (!toolPolicy || typeof toolPolicy !== "object") return undefined
-
-  for (const [key, value] of Object.entries(toolPolicy as Record<string, unknown>)) {
-    assign(key, value)
-  }
-  return Object.keys(result).length > 0 ? result : undefined
-}
-
 function extractText(parts: unknown): string {
   if (!Array.isArray(parts)) return ""
   const segments: string[] = []
@@ -2294,7 +1831,7 @@ function extractMemoryRefs(toolName: string, args: Record<string, unknown>, valu
   if (parsed?.type === "memory") {
     if (typeof parsed.ref === "string" && parsed.ref) refs.add(parsed.ref)
     if (typeof args.ref === "string" && args.ref) refs.add(args.ref)
-    if (refs.size === 0 && typeof parsed.name === "string" && parsed.name) refs.add(`memory:${parsed.name}`)
+    if (refs.size === 0 && typeof parsed.name === "string" && parsed.name) refs.add(`memories/${parsed.name}`)
   }
 
   if (Array.isArray(parsed?.hits)) {
@@ -2335,282 +1872,10 @@ function truncateLogText(value: string, limit = 1_000): string {
   return value.length > limit ? `${value.slice(0, limit)}…` : value
 }
 
-async function searchRef(
-  client: LogCapableClient,
-  query: string,
-  type: AssetType | "any",
-  meta: CliLogMeta,
-): Promise<{ ok: true; ref: string } | CliError> {
-  const raw = await runCli(
-    client,
-    ["search", query, "--type", type, "--limit", "1", "--detail", "normal", "--source", "stash"],
-    meta,
-  )
-  const parsed = parseCliJson<SearchResponse>(raw)
-  if (isCliError(parsed)) return parsed
-  const ref = parsed.hits?.[0]?.ref
-  if (!ref) {
-    return {
-      ok: false,
-      error: `No stash ref matched '${query}'. Use akm_search to disambiguate, then retry with an exact ref.`,
-    }
-  }
-  return { ok: true, ref }
-}
-
-async function resolveRefOrQueryInput(
-  client: LogCapableClient,
-  input: { ref?: string; query?: string },
-  type: AssetType | "any",
-  meta: CliLogMeta,
-): Promise<{ ok: true; ref: string } | CliError> {
-  const explicitRef = input.ref?.trim()
-  if (explicitRef) return { ok: true, ref: explicitRef }
-
-  const query = input.query?.trim()
-  if (!query) {
-    return { ok: false, error: "Provide either 'ref' or 'query'." }
-  }
-  return searchRef(client, query, type, meta)
-}
-
-async function ensureTargetSessionID(input: {
-  useSubtask: boolean
-  context: { sessionID: string; directory: string }
-  title: string
-  client: PluginClient
-  logClient: LogCapableClient
-  toolName: string
-}): Promise<{ ok: true; sessionID: string } | CliError> {
-  if (!input.useSubtask) return { ok: true, sessionID: input.context.sessionID }
-
-  try {
-    const created = await input.client.session.create({
-      body: { parentID: input.context.sessionID, title: input.title },
-    })
-    if (created.error || !created.data?.id) {
-      const reason = created.error ? JSON.stringify(created.error) : "missing child session id"
-      await writePluginLog(input.logClient, "error", "AKM dispatch child session failed", {
-        subsystem: "dispatch",
-        toolName: input.toolName,
-        sessionID: input.context.sessionID,
-        directory: input.context.directory,
-        title: input.title,
-        error: reason,
-      })
-      return { ok: false, error: `Failed to create child session: ${reason}` }
-    }
-    await writePluginLog(input.logClient, "info", "AKM dispatch child session created", {
-      subsystem: "dispatch",
-      toolName: input.toolName,
-      sessionID: input.context.sessionID,
-      directory: input.context.directory,
-      childSessionID: created.data.id,
-      title: input.title,
-    })
-    return { ok: true, sessionID: created.data.id }
-  } catch (error: unknown) {
-    const reason = error instanceof Error ? error.message : String(error)
-    await writePluginLog(input.logClient, "error", "AKM dispatch child session threw", {
-      subsystem: "dispatch",
-      toolName: input.toolName,
-      sessionID: input.context.sessionID,
-      directory: input.context.directory,
-      title: input.title,
-      error: reason,
-    })
-    return { ok: false, error: `Failed to create child session: ${reason}` }
-  }
-}
-
-async function promptTargetSession(input: {
-  client: PluginClient
-  logClient: LogCapableClient
-  toolName: string
-  context: { sessionID: string; directory: string }
-  targetSessionID: string
-  promptBody: SessionPromptBody
-  failureMessage: string
-  ref?: string
-}): Promise<{ ok: true; data: { parts?: unknown } } | CliError> {
-  try {
-    const promptResponse = await input.client.session.prompt({
-      path: { id: input.targetSessionID },
-        body: input.promptBody,
-      })
-
-    if (promptResponse.error || !promptResponse.data) {
-      const reason = promptResponse.error ? JSON.stringify(promptResponse.error) : "empty response"
-      await writePluginLog(input.logClient, "error", "AKM dispatch prompt failed", {
-        subsystem: "dispatch",
-        toolName: input.toolName,
-        sessionID: input.context.sessionID,
-        directory: input.context.directory,
-        targetSessionID: input.targetSessionID,
-        dispatchAgent: input.promptBody.agent,
-        dispatchModel: input.promptBody.model ?? null,
-        ref: input.ref,
-        error: reason,
-      })
-      return {
-        ok: false,
-        error: `${input.failureMessage}: ${reason}`,
-      }
-    }
-
-    await writePluginLog(input.logClient, "info", "AKM dispatch prompt completed", {
-      subsystem: "dispatch",
-      toolName: input.toolName,
-      sessionID: input.context.sessionID,
-      directory: input.context.directory,
-       targetSessionID: input.targetSessionID,
-       dispatchAgent: input.promptBody.agent,
-       dispatchModel: input.promptBody.model ?? null,
-       ref: input.ref,
-     })
-    return { ok: true, data: promptResponse.data }
-  } catch (error: unknown) {
-    const reason = error instanceof Error ? error.message : String(error)
-    await writePluginLog(input.logClient, "error", "AKM dispatch prompt threw", {
-      subsystem: "dispatch",
-      toolName: input.toolName,
-      sessionID: input.context.sessionID,
-      directory: input.context.directory,
-      targetSessionID: input.targetSessionID,
-      dispatchAgent: input.promptBody.agent,
-      dispatchModel: input.promptBody.model ?? null,
-      ref: input.ref,
-      error: reason,
-    })
-    return {
-      ok: false,
-      error: `${input.failureMessage}: ${reason}`,
-    }
-  }
-}
-
-async function resolveDispatchAgent(
-  client: PluginClient,
-  requestedAgent: string,
-  directory: string,
-): Promise<string> {
-  if (requestedAgent !== "akm-curator") return requestedAgent
-  try {
-    const agents = await client.app.agents({ query: { directory } })
-    if (agents.error) return "general"
-    const hasCurator = (agents.data ?? []).some((agent) => agent?.name === "akm-curator")
-    return hasCurator ? "akm-curator" : "general"
-  } catch {
-    return "general"
-  }
-}
-
-function summarizeSessionMessages(
-  sessionID: string,
-  messages: Array<{ info?: Record<string, unknown>; parts?: unknown }>,
-) {
-  return {
-    ok: true,
-    sessionID,
-    messages: messages.map((message) => {
-      const info = message.info ?? {}
-      const role = typeof info.role === "string" ? info.role : "unknown"
-      const agent = typeof info.agent === "string"
-        ? info.agent
-        : typeof info.mode === "string"
-          ? info.mode
-          : null
-      return {
-        role,
-        agent,
-        text: extractText(message.parts),
-      }
-    }),
-  }
-}
-
-async function getParentSessionID(
-  client: PluginClient,
-  sessionID: string,
-  directory: string,
-): Promise<{ ok: true; parentID: string } | CliError> {
-  try {
-    const result = await client.session.get({
-      path: { id: sessionID },
-      query: { directory },
-    })
-    if (result.error || !result.data?.parentID) {
-      return { ok: false, error: "This session does not have a parent session." }
-    }
-    return { ok: true, parentID: result.data.parentID }
-  } catch (error: unknown) {
-    return { ok: false, error: error instanceof Error ? error.message : String(error) }
-  }
-}
-
-function renderCommandTemplate(template: string, rawArguments: string): string {
-  const args = splitArguments(rawArguments)
-  return template
-    .replace(/\$ARGUMENTS/g, rawArguments)
-    .replace(/\$(\d+)/g, (_m, index: string) => args[Number(index) - 1] ?? "")
-}
-
-function normalizeSearchSource(source: "local" | "stash" | "registry" | "both"): "stash" | "registry" | "both" {
-  return source === "local" ? "stash" : source
-}
-
-function createSearchArgs(input: {
-  query: string
-  type?: AssetType | "any" | string
-  limit?: number
-  source?: "local" | "stash" | "registry" | "both"
-  defaultSource?: "local" | "stash" | "registry" | "both"
-  includeProposed?: boolean
-}): string[] {
-  const args = ["search", input.query]
-  if (input.type) args.push("--type", input.type)
-  if (input.limit) args.push("--limit", String(input.limit))
-  if (input.source) {
-    args.push("--source", normalizeSearchSource(input.source))
-  } else if (input.defaultSource) {
-    args.push("--source", normalizeSearchSource(input.defaultSource))
-  }
-  if (input.includeProposed) args.push("--include-proposed")
-  args.push("--detail", "normal")
-  return args
-}
-
-type PluginClient = {
-  session: {
-    create: (input: {
-      body: { parentID: string; title: string }
-    }) => Promise<{ data?: { id?: string }; error?: unknown }>
-    get: (input: {
-      path: { id: string }
-      query?: { directory?: string }
-    }) => Promise<{ data?: { id?: string; parentID?: string }; error?: unknown }>
-    messages: (input: {
-      path: { id: string }
-      query?: { directory?: string }
-    }) => Promise<{ data?: Array<{ info?: Record<string, unknown>; parts?: unknown }>; error?: unknown }>
-    prompt: (input: {
-      path: { id: string }
-      body: SessionPromptBody
-    }) => Promise<{ data?: { parts?: unknown }; error?: unknown }>
-  }
-  app: {
-    agents: (input?: {
-      query?: { directory?: string }
-    }) => Promise<{ data?: Array<{ name?: string }>; error?: unknown }>
-  }
-}
-
 export const AkmPlugin: Plugin = async ({ client, worktree, directory }) => {
   await ensureSupportedAkmResolved(client as unknown as LogCapableClient)
 
   const logClient = client as unknown as LogCapableClient
-  const sdkClient = client as unknown as PluginClient
-
   return {
     // Events cover the lifecycle boundaries that Claude Code exposes as
     // SessionStart / Stop / PreCompact. We use them to warm the stash, capture
@@ -2631,12 +1896,9 @@ export const AkmPlugin: Plugin = async ({ client, worktree, directory }) => {
           })
           if (!sessionContextEpoch.has(sid)) sessionContextEpoch.set(sid, 0)
           if (type === "session.created") {
-            await ensureAgentSetup(logClient, {
-              directory,
-              sessionID: sid,
-              trigger: "session.created",
-              platform: "opencode",
-            })
+            // Best-effort, fire-and-forget, fully error-trapped internally —
+            // must never block or fail session.created (13: "tmp-file cleanup").
+            void pruneStaleCuratedFiles()
             warmIndexInBackground()
             if (AKM_AUTO_CURATE && !sessionCurated.has(sid)) {
               const cwdContext = gatherCwdContext(directory)
@@ -2661,73 +1923,49 @@ export const AkmPlugin: Plugin = async ({ client, worktree, directory }) => {
           }
         } else if (type === "session.compacted" || type === "session.idle" || type === "session.deleted") {
           if (!sid) return
-          const captured = captureSessionMemory(sid, type, { directory })
-          if (captured) {
-            await writePluginLog(logClient, "info", "AKM session memory captured", {
-              subsystem: "memory",
-              actor: "system",
-              sessionID: sid,
-              reason: type,
-              ref: captured,
-            })
-            await maybeIndexSessionMemory(logClient, sid, type, captured)
-            // Auto-signal so improve picks up this session memory on the next run.
-            runCliSyncRaw(["feedback", captured, "--positive", "--note", "session checkpoint: auto-signal for improve eligibility"], AKM_CURATE_TIMEOUT_MS)
+          // 03-R1/06-M1: the session_checkpoint `remember --force` write is
+          // removed. Keep the freshness reindex on session-end events so
+          // upstream inference/graph passes still run.
+          await maybeIndexSessionMemory(logClient, sid, type, "")
+          // `stop` is not a real OpenCode hook (not in the Hooks contract), so
+          // the memory-candidate harvest has to ride real lifecycle events
+          // instead: idle (per-turn quiescence), compacted, and deleted. This
+          // is safe to fire on all three — a harvest always clears the buffer,
+          // so a later event finds it empty and no-ops rather than
+          // double-harvesting. A below-noise-floor buffer is kept across
+          // non-terminal events (so intents accumulate across turns) and only
+          // discarded on the terminal session.deleted.
+          maybeExtractSessionCandidates(sid, type)
+          // Event-driven extraction: only on session.idle (per-turn quiescence),
+          // min-interval-gated so it doesn't flood. Not on compacted/deleted.
+          if (type === "session.idle") {
+            maybeExtractSessionOnIdle(logClient, sid, directory)
           }
           if (type === "session.compacted") {
+            // 03-R1/06-M1: the session_checkpoint capture that used to feed
+            // `memory.ref` here was removed along with the `remember --force`
+            // write. Record the event as an explicit no-capture so
+            // post_compact_summary consumers see a skipped outcome instead of
+            // a dangling/undefined ref.
             writeStructuredEvent({
               event: "post_compact_summary",
               sessionId: sid,
               scope: buildEventScope(sid, directory),
-              memory: { ref: captured ?? null, reason: type },
-              outcome: { status: captured ? "ok" : "skipped" },
+              memory: { ref: null, reason: type },
+              outcome: { status: "skipped" },
             })
           }
-          // Drop per-session state so a re-created session does not inherit
-          // stale hints/curation.
+          // Drop per-session state (every session-keyed Map, plus the curated
+          // tmp file) so a re-created session does not inherit stale
+          // hints/curation and the tmp file does not leak (13: "Memory leaks").
           if (type === "session.deleted") {
-            sessionHints.delete(sid)
-            sessionCurated.delete(sid)
-            sessionCuratedFile.delete(sid)
-            sessionWorkflow.delete(sid)
-            sessionCuratorReport.delete(sid)
-            sessionContextEpoch.delete(sid)
-            sessionContextInjectedEpoch.delete(sid)
-            sessionCuratedVersion.delete(sid)
-            sessionCuratedInjectedVersion.delete(sid)
-            sessionFinalMemoryCaptured.delete(sid)
-            sessionSuccessfulAssetTouchCount.delete(sid)
-            sessionBuffer.delete(sid)
+            clearSessionState(sid)
           }
         }
       } catch (error: unknown) {
         await logHookFailure(logClient, "event", error)
       }
     },
-    // Stop is the closest analogue to Claude's Stop/SubagentStop — the user or
-    // agent halted the active run. Flush the session buffer so learnings are
-    // preserved even if the session.idle event does not fire.
-    stop: async (input: unknown) => {
-      try {
-        const sid = extractSessionIdFromEvent(input)
-        if (!sid) return
-        const captured = captureSessionMemory(sid, "stop", { directory })
-        if (captured) {
-          await writePluginLog(logClient, "info", "AKM session memory captured", {
-            subsystem: "memory",
-            actor: "system",
-            sessionID: sid,
-            reason: "stop",
-            ref: captured,
-          })
-          await maybeIndexSessionMemory(logClient, sid, "stop", captured)
-          // Auto-signal so improve picks up this session memory on the next run.
-          runCliSyncRaw(["feedback", captured, "--positive", "--note", "session checkpoint: auto-signal for improve eligibility"], AKM_CURATE_TIMEOUT_MS)
-        }
-      } catch (error: unknown) {
-        await logHookFailure(logClient, "stop", error)
-      }
-    },
     // experimental.chat.system.transform is how OpenCode exposes the
     // additionalContext channel. We append the cached hints (once per session)
     // and the curated file reference (once per turn) so the next LLM call
@@ -2772,53 +2010,12 @@ export const AkmPlugin: Plugin = async ({ client, worktree, directory }) => {
         await logHookFailure(logClient, "experimental.chat.system.transform", error)
       }
     },
-    "tool.execute.before": async (input, output) => {
-      try {
-        if (!input.tool.startsWith("akm_")) return
-        const args = output.args && typeof output.args === "object" ? output.args as Record<string, unknown> : {}
-        const confirm = args.confirm === true
-        if (input.tool === "akm_env" && (args.action === "path" || args.action === "run") && !confirm) {
-          output.args = {
-            ...args,
-            __akmBlocked: `akm_env action='${String(args.action)}' requires confirm:true because env reads are sensitive.`,
-          }
-          return
-        }
-        if (input.tool === "akm_secret" && args.action === "path" && !confirm) {
-          output.args = {
-            ...args,
-            __akmBlocked: "akm_secret action='path' requires confirm:true because secret paths are sensitive.",
-          }
-          return
-        }
-        if (input.tool === "akm_memory" && ["promote", "reject"].includes(String(args.action ?? "")) && !confirm) {
-          output.args = {
-            ...args,
-            __akmBlocked: `akm_memory action='${String(args.action)}' requires confirm:true because it mutates candidate or memory state.`,
-          }
-          return
-        }
-        if (input.tool === "akm_proposal" && ["accept", "reject", "drain"].includes(String(args.action ?? "")) && !confirm) {
-          output.args = {
-            ...args,
-            __akmBlocked: `akm_proposal action='${String(args.action)}' requires confirm:true because it mutates the proposal queue.`,
-          }
-          return
-        }
-        output.args = args
-      } catch (error: unknown) {
-        await logHookFailure(logClient, "tool.execute.before", error, {
-          toolName: input?.tool,
-          sessionID: input?.sessionID,
-        })
-      }
-    },
     "shell.env": async (_input, output) => {
       try {
         output.env.AKM_PROJECT = worktree
         output.env.AKM_PLUGIN_VERSION = PLUGIN_VERSION
-        const stashDir = await getAkmStashDir(logClient)
-        if (stashDir) output.env.AKM_STASH_DIR = stashDir
+        const bundleDir = await getAkmBundleDir(logClient)
+        if (bundleDir) output.env.AKM_BUNDLE_DIR = bundleDir
       } catch (error: unknown) {
         await logHookFailure(logClient, "shell.env", error)
       }
@@ -2850,8 +2047,7 @@ export const AkmPlugin: Plugin = async ({ client, worktree, directory }) => {
             const directorySnapshot = directory
             const agentSnapshot = input.agent
             const previewText = text
-            // Record the audit row immediately so callers (akm_memory audit)
-            // see the decision; the `injectedRefs` field is populated lazily
+            // Record the audit row immediately; the `injectedRefs` field is populated lazily
             // when the background curate resolves.
             sessionRecallAudit.set(sessionID, {
               shouldRecall: true,
@@ -2864,7 +2060,13 @@ export const AkmPlugin: Plugin = async ({ client, worktree, directory }) => {
             void (async () => {
               try {
                 const curated = await runCurateForPrompt(logClient, decision.query, sessionID)
-                const refs = [...new Set((curated ?? "").match(/(?:[A-Za-z0-9@._+/-]+\/\/)?(?:skill|command|agent|knowledge|memory|lesson|script|workflow|task|env|secret|wiki):[A-Za-z0-9._/-]+/g) ?? [])]
+                // Shared 0.9 concept-ID extractor. The inline regex this
+                // replaced still matched the pre-0.9 `type:slug` ref form
+                // (`skill:code-review`, plus a `wiki:` type that no longer
+                // exists), so against real 0.9 curate output it matched nothing
+                // and both the recall audit and the prompt_recall event
+                // recorded an empty ref list on every turn.
+                const refs = extractAkmRefsFromString(curated ?? "")
                 const prior = sessionRecallAudit.get(sessionID)
                 if (prior) {
                   sessionRecallAudit.set(sessionID, {
@@ -2951,7 +2153,7 @@ export const AkmPlugin: Plugin = async ({ client, worktree, directory }) => {
           const recentRefs = (sessionBuffer.get(input.sessionID) ?? [])
             .filter((entry) => entry.kind === "tool-ref" && !!entry.ref)
             .map((entry) => entry.ref!)
-            .filter((ref, index, refs) => !ref.startsWith("memory:") && !ref.startsWith("env:") && !ref.startsWith("secret:") && refs.indexOf(ref) === index)
+            .filter((ref, index, refs) => !/^(?:.*\/\/)?(?:memories|env|secrets)\//.test(ref) && refs.indexOf(ref) === index)
             .slice(-3)
           const dedupe = new Set<string>()
           for (const ref of recentRefs) {
@@ -2995,7 +2197,11 @@ export const AkmPlugin: Plugin = async ({ client, worktree, directory }) => {
 
         const allArgRefs = extractAkmRefsFromAllArgs(input.args as Record<string, unknown>)
         const allOutputRefs = extractAkmRefsFromString(output.output)
-        const allRefs = [...new Set([...allArgRefs, ...allOutputRefs])]
+        const candidateRefs = [...new Set([...allArgRefs, ...allOutputRefs])]
+        const parsedForRefs = isAkmTool ? parseToolOutput(output.output) : null
+        const allRefs = isAkmTool && parsedForRefs
+          ? extractToolRefs(input.tool, input.args as Record<string, unknown>, parsedForRefs).refs
+          : validateRefCandidates(candidateRefs, [await getAkmBundleDir(logClient) ?? ""])
 
         if (allRefs.length > 0) {
           writeStructuredEvent({
@@ -3065,25 +2271,6 @@ export const AkmPlugin: Plugin = async ({ client, worktree, directory }) => {
               status: feedback ?? "unknown",
             })
           }
-          if (feedback === "positive") {
-            sessionSuccessfulAssetTouchCount.set(
-              input.sessionID,
-              (sessionSuccessfulAssetTouchCount.get(input.sessionID) ?? 0) + 1,
-            )
-            const checkpointRef = maybeCheckpointSessionMemory(input.sessionID, {
-              directory,
-              agent: input.tool,
-            })
-            if (checkpointRef) {
-              await writePluginLog(logClient, "info", "AKM checkpoint memory captured", {
-                subsystem: "memory",
-                actor: "system",
-                sessionID: input.sessionID,
-                reason: "checkpoint",
-                ref: checkpointRef,
-              })
-            }
-          }
         }
 
         if (
@@ -3101,10 +2288,10 @@ export const AkmPlugin: Plugin = async ({ client, worktree, directory }) => {
             : `opencode auto: ${input.tool} failed`
           for (const ref of feedbackRefs) {
             // Skip refs that should never receive auto-feedback. Matches the
-            // claude-side hook: memory/env/secret/lesson are excluded, including
-            // origin-qualified forms like `local//lesson:foo`. Lessons take
+            // claude-side hook: memories/env/secrets/lessons are excluded, including
+            // bundle-qualified forms like `local//lessons/foo`. Lessons take
             // feedback through the proposal queue, not via direct akm feedback.
-            if (/^(?:.*\/\/)?(?:memory|env|secret|lesson):/.test(ref)) continue
+            if (/^(?:.*\/\/)?(?:memories|env|secrets|lessons)\//.test(ref)) continue
             const directInput = Object.values(input.args as Record<string, unknown>).some((value) => typeof value === "string" && value.includes(ref))
             const signal = classifyFeedbackSignal({
               ref,
@@ -3156,1094 +2343,137 @@ export const AkmPlugin: Plugin = async ({ client, worktree, directory }) => {
       }
     },
     tool: {
-    akm_info: tool({
-      description: "Show `akm info` output plus the installed akm-opencode plugin version and install location.",
-      args: {},
-      async execute() {
-        const raw = await runCli(client as unknown as LogCapableClient, ["info"], { toolName: "akm_info" })
-        return formatAkmInfoResponse(raw)
-      },
-    }),
-    akm_search: tool({
-      description: "Search your stash or the akm registry for scripts, skills, commands, agents, knowledge, memories, lessons, tasks, workflows, env configs, secrets, and wikis. Use source='registry' for installable community kits.",
-      args: {
-        query: tool.schema.string().describe("Case-insensitive substring search."),
-        type: tool.schema
-          .enum(ASSET_TYPES as unknown as [string, ...string[]])
-          .optional()
-          .describe("Optional type filter. Defaults to 'any'."),
-        limit: tool.schema.number().optional().describe("Maximum number of hits to return. Defaults to 20."),
-        source: tool.schema
-          .enum(["local", "stash", "registry", "both"])
-          .optional()
-          .describe("Search source. 'stash' searches local stash directories, 'registry' searches registries, and 'both' searches all sources. 'local' remains a backward-compatible alias for 'stash'."),
-        include_proposed: tool.schema.boolean().optional().describe("Include proposed-quality results. Proposed assets are not curated until accepted."),
-      },
-      async execute({ query, type, limit, source, include_proposed }, context) {
-        const raw = await runCli(
-          client as unknown as LogCapableClient,
-          createSearchArgs({ query, type, limit, source, includeProposed: include_proposed }),
-          { toolName: "akm_search", sessionID: context.sessionID, directory: context.directory },
-        )
-        return withProposedWarnings(raw)
-      },
-    }),
-    akm_show: tool({
-      description: "Show a stash asset by ref. For knowledge assets, use view_mode to retrieve specific content (toc, section, lines, frontmatter).",
-      args: {
-        ref: tool.schema.string().describe("Asset reference returned by akm_search."),
-        view_mode: tool.schema
-          .enum(["full", "toc", "frontmatter", "section", "lines"])
-          .optional()
-          .describe("View mode for knowledge assets. Defaults to 'full'. Ignored for other types."),
-        heading: tool.schema.string().optional()
-          .describe("Section heading to extract (required when view_mode is 'section')."),
-        start_line: tool.schema.number().optional()
-          .describe("Start line number, 1-based (for view_mode 'lines')."),
-        end_line: tool.schema.number().optional()
-          .describe("End line number, 1-based inclusive (for view_mode 'lines')."),
-      },
-      async execute({ ref, view_mode, heading, start_line, end_line }) {
-        const args = ["show", ref]
-        if (view_mode) {
-          args.push(view_mode)
-          if (view_mode === "section" && heading) args.push(heading)
-          if (view_mode === "lines") {
-            if (start_line != null) args.push(String(start_line))
-            if (end_line != null) args.push(String(end_line))
-          }
-        }
-        return runCli(client as unknown as LogCapableClient, args, { toolName: "akm_show" })
-      },
-    }),
-    akm_remember: tool({
-      description: "Record a memory in the default AKM stash so it can be searched and shown later.",
-      args: {
-        content: tool.schema.string().describe("Memory content to store."),
-        name: tool.schema.string().optional().describe("Optional memory name."),
-        force: tool.schema.boolean().optional().describe("Overwrite an existing memory with the same name."),
-      },
-      async execute({ content, name, force }, context) {
-        const args = ["remember", content]
-        if (name) args.push("--name", name)
-        if (force) args.push("--force")
-        args.push(...buildScopedArgs(context as unknown as Record<string, unknown>))
-        return runCli(client as unknown as LogCapableClient, args, { toolName: "akm_remember", sessionID: context.sessionID, directory: context.directory })
-      },
-    }),
-    akm_feedback: tool({
-      description: "Record positive or negative feedback for a stash asset so AKM can improve future ranking.",
-      args: {
-        ref: tool.schema.string().describe("Asset ref to record feedback for."),
-        sentiment: tool.schema.enum(["positive", "negative"]).describe("Whether the feedback is positive or negative."),
-        note: tool.schema.string().optional().describe("Optional note to attach to the feedback."),
-      },
-      async execute({ ref, sentiment, note }, context) {
-        const args = ["feedback", ref, sentiment === "positive" ? "--positive" : "--negative"]
-        if (note) args.push("--note", note)
-        args.push(...buildScopedArgs(context as unknown as Record<string, unknown>))
-        const raw = await runCli(client as unknown as LogCapableClient, args, { toolName: "akm_feedback", sessionID: context.sessionID, directory: context.directory })
-        const parsed = safeJsonParse<{ ok?: boolean; error?: string }>(raw)
-        if (parsed?.ok === false) {
-          const error = parsed.error ?? "Unknown akm feedback error"
-          if (isNotIndexedFeedbackError(error)) {
-            await writePluginLog(logClient, "warn", "AKM feedback skipped", {
-              subsystem: "feedback",
-              toolName: "akm_feedback",
-              sessionID: context.sessionID,
-              directory: context.directory,
-              ref,
-              sentiment,
-              reason: "ref_not_indexed",
-              error,
-            })
-            await emitWorkflowTelemetry(logClient, "warn", "akm.feedback.skipped", {
-              sessionID: context.sessionID,
-              toolName: "akm_feedback",
-              assetRef: ref,
-              outcome: "skipped",
-              reason: "ref not indexed",
-              directory: context.directory,
-            })
-            return JSON.stringify({ ok: true, skipped: true, reason: "ref_not_indexed", ref, sentiment })
-          }
-          return raw
-        }
-        await emitWorkflowTelemetry(logClient, "info", "akm.feedback.recorded", {
-          sessionID: context.sessionID,
-          toolName: "akm_feedback",
-          assetRef: ref,
-          outcome: "success",
-          reason: sentiment,
-          directory: context.directory,
-        })
-        return raw
-      },
-    }),
-    akm_memory: tool({
-      description: "Audit AKM memory behavior, inspect pending candidates, and promote or reject candidates. Mutating actions require confirm:true.",
-      args: {
-        action: tool.schema.enum(["audit", "candidates", "promote", "reject", "checkpoint", "sync"]).describe("Memory action."),
-        candidate_id: tool.schema.string().optional().describe("Candidate id for promote/reject."),
-        reason: tool.schema.string().optional().describe("Reason for rejection."),
-        scope: tool.schema.enum(["last-prompt", "session", "refs", "safety"]).optional().describe("Audit scope."),
-        status: tool.schema.enum(["pending", "promoted", "rejected"]).optional().describe("Candidate status filter."),
-        confirm: tool.schema.boolean().optional().describe("Must be true for mutate actions."),
-      },
-      async execute(input, context) {
-        const blocked = blockedToolResponse(input as Record<string, unknown>)
-        if (blocked) return blocked
-        if (input.action === "audit") {
-          const events = readJsonl<AkmMemoryEvent>(OPENCODE_EVENT_LOG)
-          const sessionEvents = context.sessionID ? events.filter((event) => event.sessionId === context.sessionID) : events
-          const recall = sessionRecallAudit.get(context.sessionID)
-          const recentWrites = sessionEvents.filter((event) => ["durable_memory_written", "pre_compact_checkpoint", "session_ended"].includes(event.event)).slice(-5)
-          const recentSafetyBlocks = sessionEvents.filter((event) => event.event === "safety_blocked").slice(-5)
-          const refs = [...new Set(sessionEvents.flatMap((event) => event.refs ?? []))]
-          const audit = input.scope === "last-prompt"
-            ? { lastRecall: recall ?? null }
-            : input.scope === "refs"
-              ? { refs }
-              : input.scope === "safety"
-                ? { recentSafetyBlocks }
-                : input.scope === "session"
-                  ? { lastRecall: recall ?? null, recentWrites, recentSafetyBlocks, refs }
-                  : { lastRecall: recall ?? null, recentWrites, recentSafetyBlocks, refs }
-          return JSON.stringify({
-            ok: true,
-            audit,
-          })
-        }
-        if (input.action === "candidates") {
-          const candidates = readCandidates(OPENCODE_CANDIDATE_LOG)
-            .filter((candidate) => !input.status || candidate.status === input.status)
-            .filter((candidate) => !context.sessionID || candidate.sessionId === context.sessionID)
-          return JSON.stringify({ ok: true, candidates })
-        }
-        if (input.action === "checkpoint") {
-          const ref = captureSessionMemory(context.sessionID, "manual-checkpoint", {
-            checkpoint: true,
-            directory: context.directory,
-            agent: context.agent,
-            channel: (context as Record<string, unknown>).channel as string | undefined,
-            userID: (context as Record<string, unknown>).userID as string | undefined,
-            user: (context as Record<string, unknown>).user as string | undefined,
-          })
-          return JSON.stringify({ ok: true, ref })
-        }
-        if (input.action === "sync") {
-          return JSON.stringify({ ok: true, synced: true, events: readJsonl<AkmMemoryEvent>(OPENCODE_EVENT_LOG).length, candidates: readCandidates(OPENCODE_CANDIDATE_LOG).length })
-        }
-        if (!input.candidate_id) return JSON.stringify({ ok: false, error: "'candidate_id' is required for promote/reject." })
-        const candidates = readCandidates(OPENCODE_CANDIDATE_LOG)
-        const candidate = candidates.find((entry) => entry.id === input.candidate_id)
-        if (!candidate) return JSON.stringify({ ok: false, error: `Unknown candidate '${input.candidate_id}'.` })
-        if (input.action === "reject") {
-          const updated = updateCandidateStatus(OPENCODE_CANDIDATE_LOG, candidate.id, "rejected", input.reason)
-          writeStructuredEvent({
-            event: "candidate_rejected",
-            sessionId: context.sessionID,
-            scope: buildEventScope(context.sessionID, context.directory, context.agent),
-            memory: { candidateId: candidate.id, reason: input.reason ?? null },
-            outcome: { status: updated ? "ok" : "failed" },
-          })
-          return JSON.stringify({ ok: !!updated, candidate: updated ?? null })
-        }
-        if (input.action === "promote") {
-          let rawResult: string | null = null
-          if (candidate.recommendedAction === "remember") {
-            rawResult = await runCli(client as unknown as LogCapableClient, ["remember", candidate.content, "--name", `candidate-${candidate.id}`, "--force", ...buildScopedArgs(context as unknown as Record<string, unknown>)], { toolName: "akm_memory", sessionID: context.sessionID, directory: context.directory })
-          } else if (candidate.recommendedAction === "feedback" && candidate.targetRef) {
-            rawResult = await runCli(client as unknown as LogCapableClient, ["feedback", candidate.targetRef, "--positive", "--note", candidate.content, ...buildScopedArgs(context as unknown as Record<string, unknown>)], { toolName: "akm_memory", sessionID: context.sessionID, directory: context.directory })
-          } else if (candidate.recommendedAction === "distill" && candidate.targetRef) {
-            rawResult = await runCli(client as unknown as LogCapableClient, ["improve", candidate.targetRef], { toolName: "akm_memory", sessionID: context.sessionID, directory: context.directory })
-          } else if (candidate.recommendedAction === "propose") {
-            rawResult = await runCli(client as unknown as LogCapableClient, ["propose", "knowledge", `candidate-${candidate.id}`, "--task", candidate.content], { toolName: "akm_memory", sessionID: context.sessionID, directory: context.directory })
-          } else {
-            return JSON.stringify({ ok: false, error: "Candidate recommendedAction is 'ignore'; reject it instead." })
-          }
-          const parsedResult = rawResult ? parseMaybeJson(rawResult) : null
-          const resultOk = typeof parsedResult === "object" && parsedResult !== null && "ok" in parsedResult
-            ? parsedResult.ok !== false
-            : !!rawResult
-          if (!resultOk) {
-            writeStructuredEvent({
-              event: "candidate_promoted",
-              sessionId: context.sessionID,
-              scope: buildEventScope(context.sessionID, context.directory, context.agent),
-              memory: { candidateId: candidate.id, recommendedAction: candidate.recommendedAction },
-              outcome: { status: "failed", warnings: ["candidate promotion command did not succeed"] },
-            })
-            return JSON.stringify({ ok: false, candidate, result: parsedResult ?? rawResult })
-          }
-          const updated = updateCandidateStatus(OPENCODE_CANDIDATE_LOG, candidate.id, "promoted")
-          writeStructuredEvent({
-            event: "candidate_promoted",
-            sessionId: context.sessionID,
-            scope: buildEventScope(context.sessionID, context.directory, context.agent),
-            memory: { candidateId: candidate.id, recommendedAction: candidate.recommendedAction },
-            outcome: { status: updated ? "ok" : "failed" },
-          })
-          return JSON.stringify({ ok: !!updated, candidate: updated ?? null, result: parsedResult ?? rawResult })
-        }
-        return JSON.stringify({ ok: false, error: `Unsupported action '${String(input.action)}'.` })
-      },
-    }),
-    akm_curate: tool({
-      description: "Curate stash assets for a task or topic. Returns the top matches as a ranked list so the agent can inspect and use them.",
-      args: {
-        query: tool.schema.string().describe("Task, topic, or natural-language description of what you want to do."),
-        limit: tool.schema.number().optional().describe("Maximum number of curated matches to return. Defaults to 6."),
-        detail: tool.schema.enum(["summary", "normal", "full"]).optional().describe("Detail level for each match. Defaults to 'summary'."),
-      },
-      async execute({ query, limit, detail }, context) {
-        const args = ["curate", query, "--limit", String(limit ?? 6)]
-        if (detail) args.push("--detail", detail)
-        args.push(...buildScopedArgs(context as unknown as Record<string, unknown>))
-        return runCli(client as unknown as LogCapableClient, args, { toolName: "akm_curate", sessionID: context.sessionID, directory: context.directory })
-      },
-    }),
-    akm_evolve: tool({
-      description: "Dispatch the AKM curator agent to review recent session activity and propose stash improvements (promote hot assets, flag cold ones, draft missing coverage). Persists the report as a memory and seeds the curator-context cache so it survives compaction.",
-      args: {
-        focus: tool.schema.string().optional().describe("Optional focus area or theme to weight the review toward."),
-        dispatch_agent: tool.schema.string().optional().describe("OpenCode agent to run the curator with. Defaults to 'akm-curator', or falls back to 'general' when that agent is unavailable."),
-        as_subtask: tool.schema.boolean().optional().describe("Run in a child session with parent context. Defaults to true."),
-      },
-      async execute({ focus, dispatch_agent, as_subtask }, context) {
-        await ensureFreshProposalCheckpoint(logClient, {
-          sessionID: context.sessionID,
-          directory: context.directory,
-          agent: context.agent,
-        }, "pre-evolve")
-        const useSubtask = as_subtask ?? true
-        const requestedAgent = dispatch_agent ?? "akm-curator"
-        const targetAgent = await resolveDispatchAgent(sdkClient, requestedAgent, context.directory)
-        const targetSession = await ensureTargetSessionID({
-          useSubtask,
-          context: { sessionID: context.sessionID, directory: context.directory },
-          title: "akm:curator",
-          client: sdkClient,
-          logClient,
-          toolName: "akm_evolve",
-        })
-        if (!targetSession.ok) return JSON.stringify(targetSession)
-
-        const task = focus && focus.trim()
-          ? `Review recent AKM activity with an emphasis on: ${focus.trim()}. Produce the prioritized action list described in the system prompt.`
-          : "Review recent AKM activity and produce the prioritized action list described in the system prompt."
-
-        const promptResponse = await promptTargetSession({
-          client: sdkClient,
-          logClient,
-          toolName: "akm_evolve",
-          context: { sessionID: context.sessionID, directory: context.directory },
-          targetSessionID: targetSession.sessionID,
-          failureMessage: "Failed to dispatch curator",
-          promptBody: {
-            agent: targetAgent,
-            system: targetAgent === "akm-curator" ? undefined : CURATOR_AGENT_PROMPT,
-            parts: [{ type: "text", text: task }],
-          },
-        })
-        if (!promptResponse.ok) return JSON.stringify(promptResponse)
-
-        const fullText = extractText(promptResponse.data.parts)
-        sessionCuratorReport.set(context.sessionID, summarizeCuratorReportForContext(fullText))
-        markContextEpochDirty(context.sessionID)
-        const dateTag = buildDateTag()
-        const shortSid = context.sessionID.replace(/[^A-Za-z0-9._-]/g, "").slice(0, 8) || "session"
-        const curatorMemoryRef = fullText
-          ? rememberTextAsMemory(`akm-curator-${dateTag}-${shortSid}`, fullText, context as unknown as Record<string, unknown>)
-          : null
-
-        return JSON.stringify({
-          ok: true,
-          dispatchAgent: targetAgent,
-          usedSubtask: useSubtask,
-          sessionID: targetSession.sessionID,
-          focus: focus ?? null,
-          curatorMemoryRef,
-          text: fullText,
-        })
-      },
-    }),
-    akm_parent_messages: tool({
-      description: "Read compact text summaries of the parent session's messages so a dispatched AKM subagent can inherit upstream context.",
-      args: {},
-      async execute(_input, context) {
-        try {
-          const parent = await getParentSessionID(sdkClient, context.sessionID, context.directory)
-          if (!parent.ok) return JSON.stringify(parent)
-          const messages = await sdkClient.session.messages({
-            path: { id: parent.parentID },
-            query: { directory: context.directory },
-          })
-          if (messages.error || !messages.data) {
-            return JSON.stringify({ ok: false, error: "Failed to read parent session messages." })
-          }
-          return JSON.stringify(summarizeSessionMessages(parent.parentID, messages.data))
-        } catch (error: unknown) {
-          await writePluginLog(logClient, "error", "AKM parent session read failed", {
-            subsystem: "session",
-            toolName: "akm_parent_messages",
-            sessionID: context.sessionID,
-            directory: context.directory,
-            error: formatCliError(error),
-          })
-          return JSON.stringify({ ok: false, error: "Failed to read parent session messages." })
-        }
-      },
-    }),
-    akm_session_messages: tool({
-      description: "Read compact text summaries for a specific OpenCode session. Arbitrary session IDs are restricted to the akm-curator agent; other agents may read only their current or parent session.",
-      args: {
-        session_id: tool.schema.string().describe("OpenCode session ID to inspect."),
-      },
-      async execute({ session_id }, context) {
-        try {
-          const parent = await getParentSessionID(sdkClient, context.sessionID, context.directory)
-          const allowedSessionIDs = new Set<string>([context.sessionID])
-          if (parent.ok) allowedSessionIDs.add(parent.parentID)
-          if (context.agent !== "akm-curator" && !allowedSessionIDs.has(session_id)) {
-            return JSON.stringify({
-              ok: false,
-              error: "akm_session_messages only allows arbitrary session IDs for the akm-curator agent. Use akm_parent_messages for parent context.",
-            })
-          }
-          const messages = await sdkClient.session.messages({
-            path: { id: session_id },
-            query: { directory: context.directory },
-          })
-          if (messages.error || !messages.data) {
-            return JSON.stringify({ ok: false, error: `Failed to read messages for session '${session_id}'.` })
-          }
-          return JSON.stringify(summarizeSessionMessages(session_id, messages.data))
-        } catch (error: unknown) {
-          await writePluginLog(logClient, "error", "AKM session messages read failed", {
-            subsystem: "session",
-            toolName: "akm_session_messages",
-            sessionID: context.sessionID,
-            directory: context.directory,
-            targetSessionID: session_id,
-            error: formatCliError(error),
-          })
-          return JSON.stringify({ ok: false, error: `Failed to read messages for session '${session_id}'.` })
-        }
-      },
-    }),
-    akm_agent: tool({
-      description: "Dispatch a stash agent by ref into a child OpenCode session, applying the agent prompt and metadata from akm_show.",
-      args: {
-        ref: tool.schema.string().optional().describe("Agent ref from akm_search (e.g. agent:my-agent.md)."),
-        query: tool.schema.string().optional().describe("If ref is omitted, resolve best matching stash agent for this query."),
-        task_prompt: tool.schema.string().describe("Task prompt sent to the dispatched OpenCode agent."),
-        dispatch_agent: tool.schema.string().optional().describe("OpenCode agent to run the task with, or a provider/model override like 'openai/gpt-5.3-codex'. Defaults to 'general'."),
-        as_subtask: tool.schema.boolean().optional().describe("Run in child session with parent context. Defaults to true."),
-      },
-      async execute({ ref, query, task_prompt, dispatch_agent, as_subtask }, context) {
-        const logMeta = {
-          toolName: "akm_agent",
-          directory: context.directory,
-          sessionID: context.sessionID,
-        }
-        const resolved = await resolveRefOrQueryInput(client as unknown as LogCapableClient, { ref, query }, "agent", logMeta)
-        if (!resolved.ok) return JSON.stringify(resolved)
-
-        const shownRaw = await runCli(client as unknown as LogCapableClient, ["show", resolved.ref], logMeta)
-        const shown = parseCliJson<ShowAgentResponse | { type: string }>(shownRaw)
-        if (isCliError(shown)) {
-          return JSON.stringify(shown)
-        }
-
-        if (!isShowAgentResponse(shown)) {
-          return JSON.stringify({
-            ok: false,
-            error: `Ref ${ref} is not an agent payload from akm_show.`,
-          })
-        }
-
-        if (!shown.prompt || !shown.prompt.trim()) {
-          return JSON.stringify({
-            ok: false,
-            error: `Agent ${shown.name} is missing prompt content.`,
-          })
-        }
-
-        const useSubtask = as_subtask ?? true
-        const dispatchTarget = resolveDispatchTarget(dispatch_agent, "general")
-        const hintedModel = parseModelHint(shown.modelHint)
-        const model = dispatchTarget.model ?? hintedModel
-        const tools = parseToolPolicy(shown.toolPolicy)
-        writeStructuredEvent({
-          event: "subagent_started",
-          sessionId: context.sessionID,
-          scope: buildEventScope(context.sessionID, context.directory, context.agent),
-          input: {
-            ref: resolved.ref,
-            stashAgent: shown.name,
-            dispatchAgent: dispatchTarget.agent,
-            requestedDispatchTarget: dispatchTarget.requested,
-            taskPrompt: task_prompt,
-            advisoryToolPolicy: shown.toolPolicy ?? null,
-            appliedToolPolicy: tools ?? null,
-            modelHint: shown.modelHint ?? null,
-            appliedModel: model ?? null,
-          },
-          refs: [resolved.ref],
-          outcome: { status: "ok" },
-        })
-
-        const targetSession = await ensureTargetSessionID({
-          useSubtask,
-          context: { sessionID: context.sessionID, directory: context.directory },
-          title: `akm:${shown.name}`,
-          client: client as unknown as PluginClient,
-          logClient,
-          toolName: "akm_agent",
-        })
-        if (!targetSession.ok) return JSON.stringify(targetSession)
-
-        const promptBody: SessionPromptBody = {
-          agent: dispatchTarget.agent,
-          system: shown.prompt,
-          parts: [{ type: "text", text: task_prompt }],
-        }
-        if (model) promptBody.model = model
-        if (tools) promptBody.tools = tools
-
-        const promptResponse = await promptTargetSession({
-          client: client as unknown as PluginClient,
-          logClient,
-          toolName: "akm_agent",
-          context: { sessionID: context.sessionID, directory: context.directory },
-          targetSessionID: targetSession.sessionID,
-          promptBody,
-          failureMessage: `Failed to dispatch prompt for ${resolved.ref}`,
-          ref: resolved.ref,
-        })
-        if (!promptResponse.ok) return JSON.stringify(promptResponse)
-
-        const childText = extractText(promptResponse.data.parts)
-        const candidates = extractCandidatesFromText({
-          harness: "opencode",
-          sessionId: targetSession.sessionID,
-          text: childText,
-          evidence: [resolved.ref, task_prompt],
-          sourcePaths: [OPENCODE_EVENT_LOG, OPENCODE_CANDIDATE_LOG],
-          targetRefHints: [resolved.ref],
-        })
-        if (candidates.length > 0) appendCandidates(OPENCODE_CANDIDATE_LOG, candidates)
-        writeStructuredEvent({
-          event: "subagent_completed",
-          sessionId: context.sessionID,
-          scope: buildEventScope(context.sessionID, context.directory, context.agent),
-          input: {
-            childSessionID: targetSession.sessionID,
-            stashAgent: shown.name,
-            dispatchAgent: dispatchTarget.agent,
-            requestedDispatchTarget: dispatchTarget.requested,
-            dispatchModel: model ?? null,
-          },
-          memory: { parentSessionID: context.sessionID, childSessionID: targetSession.sessionID, candidatesCreated: candidates.length },
-          refs: [resolved.ref],
-          outcome: { status: "ok" },
-        })
-
-        return JSON.stringify({
-          ok: true,
-          ref: resolved.ref,
-          stashAgent: shown.name,
-          dispatchAgent: dispatchTarget.agent,
-          requestedDispatchTarget: dispatchTarget.requested,
-          usedSubtask: useSubtask,
-          sessionID: targetSession.sessionID,
-          model,
-          tools,
-          text: childText,
-        })
-      },
-    }),
-    akm_cmd: tool({
-      description: "Execute a stash command template through the OpenCode SDK in the current or child session.",
-      args: {
-        ref: tool.schema.string().optional().describe("Command ref from akm_search (e.g. command:review.md)."),
-        query: tool.schema.string().optional().describe("If ref is omitted, resolve best matching stash command for this query."),
-        arguments: tool.schema.string().optional().describe("Command arguments used for $ARGUMENTS and positional placeholders ($1, $2, ...)."),
-        dispatch_agent: tool.schema.string().optional().describe("OpenCode agent to run the rendered command, or a provider/model override like 'openai/gpt-5.3-codex'. Defaults to current agent."),
-        as_subtask: tool.schema.boolean().optional().describe("Run in child session with parent context. Defaults to false."),
-      },
-      async execute({ ref, query, arguments: commandArguments, dispatch_agent, as_subtask }, context) {
-        const logMeta = {
-          toolName: "akm_cmd",
-          directory: context.directory,
-          sessionID: context.sessionID,
-        }
-        const resolved = await resolveRefOrQueryInput(client as unknown as LogCapableClient, { ref, query }, "command", logMeta)
-        if (!resolved.ok) return JSON.stringify(resolved)
-
-        const shownRaw = await runCli(client as unknown as LogCapableClient, ["show", resolved.ref], logMeta)
-        const shown = parseCliJson<ShowCommandResponse | { type: string }>(shownRaw)
-        if (isCliError(shown)) return JSON.stringify(shown)
-        if (!isShowCommandResponse(shown)) {
-          return JSON.stringify({ ok: false, error: `Ref ${resolved.ref} is not a command payload from akm_show.` })
-        }
-
-        const template = shown.template?.trim()
-        if (!template) {
-          return JSON.stringify({ ok: false, error: `Command ${shown.name} is missing template content.` })
-        }
-
-        const argsText = commandArguments ?? ""
-        const rendered = renderCommandTemplate(template, argsText)
-        const useSubtask = as_subtask ?? false
-        const fallbackAgent = typeof context.agent === "string" && context.agent.trim() ? context.agent : "general"
-        const dispatchTarget = resolveDispatchTarget(dispatch_agent, fallbackAgent)
-
-        const targetSession = await ensureTargetSessionID({
-          useSubtask,
-          context: { sessionID: context.sessionID, directory: context.directory },
-          title: `akm:cmd:${shown.name}`,
-          client: client as unknown as PluginClient,
-          logClient,
-          toolName: "akm_cmd",
-        })
-        if (!targetSession.ok) return JSON.stringify(targetSession)
-
-        const promptResponse = await promptTargetSession({
-          client: client as unknown as PluginClient,
-          logClient,
-          toolName: "akm_cmd",
-          context: { sessionID: context.sessionID, directory: context.directory },
-          targetSessionID: targetSession.sessionID,
-          failureMessage: `Failed to execute command ${resolved.ref}`,
-          ref: resolved.ref,
-          promptBody: {
-            agent: dispatchTarget.agent,
-            model: dispatchTarget.model,
-            parts: [{ type: "text", text: rendered }],
-          },
-        })
-        if (!promptResponse.ok) return JSON.stringify(promptResponse)
-
-        return JSON.stringify({
-          ok: true,
-          ref: resolved.ref,
-          stashCommand: shown.name,
-          dispatchAgent: dispatchTarget.agent,
-          requestedDispatchTarget: dispatchTarget.requested,
-          usedSubtask: useSubtask,
-          sessionID: targetSession.sessionID,
-          model: dispatchTarget.model,
-          arguments: argsText,
-          renderedTemplate: rendered,
-          text: extractText(promptResponse.data.parts),
-        })
-      },
-    }),
-    akm_env: tool({
-      description: "Access AKM env assets (.env files) without surfacing values. 'list' returns env refs. 'path' returns the on-disk file path. 'run' injects the env into a child command without values reaching stdout — the preferred agent-safe path. action='path' and action='run' require confirm:true.",
-      args: {
-        action: tool.schema.enum(["list", "path", "run"]).describe("Env subcommand. 'list' returns refs; 'path' returns the file path; 'run' injects env into a child command."),
-        ref: tool.schema.string().optional().describe("Env ref such as env:prod or env:myapp. Required for path/run."),
-        cmd: tool.schema.string().optional().describe("Command to run with env injected. Required for action='run'. Example: 'npm start'."),
-        confirm: tool.schema.boolean().optional().describe("Must be true for path and run actions."),
-      },
-      async execute(input) {
-        const blocked = blockedToolResponse(input as Record<string, unknown>)
-        if (blocked) return blocked
-        const { action, ref, cmd, confirm } = input
-        const logMeta = { toolName: "akm_env" }
-        switch (action) {
-          case "list": {
-            return runCli(client as unknown as LogCapableClient, ["env", "list"], logMeta)
-          }
-          case "path": {
-            if (confirm !== true) return JSON.stringify({ ok: false, error: "akm_env action='path' requires confirm:true." })
-            if (!ref) return JSON.stringify({ ok: false, error: "'ref' is required for action='path'." })
-            return runCli(client as unknown as LogCapableClient, ["env", "path", ref], logMeta)
-          }
-          case "run": {
-            if (confirm !== true) return JSON.stringify({ ok: false, error: "akm_env action='run' requires confirm:true." })
-            if (!ref) return JSON.stringify({ ok: false, error: "'ref' is required for action='run'." })
-            if (!cmd) return JSON.stringify({ ok: false, error: "'cmd' is required for action='run'." })
-            return runCli(client as unknown as LogCapableClient, ["env", "run", ref, "--", ...cmd.split(/\s+/)], logMeta)
-          }
-        }
-      },
-    }),
-    akm_secret: tool({
-      description: "Inspect whole-file AKM secrets without surfacing contents. 'list' returns secret refs only. 'path' returns the on-disk file path for `_FILE`-style consumers. action='path' requires confirm:true.",
-      args: {
-        action: tool.schema.enum(["list", "path"]).describe("Secret subcommand. 'path' returns the absolute file path without reading or echoing the secret bytes."),
-        ref: tool.schema.string().optional().describe("Secret ref such as secret:deploy-key. Required for action='path'."),
-        confirm: tool.schema.boolean().optional().describe("Must be true for sensitive actions like path."),
-      },
-      async execute(input) {
-        const blocked = blockedToolResponse(input as Record<string, unknown>)
-        if (blocked) return blocked
-        const { action, ref, confirm } = input
-        const logMeta = { toolName: "akm_secret" }
-        switch (action) {
-          case "list":
-            return runCli(client as unknown as LogCapableClient, ["secret", "list"], logMeta)
-          case "path": {
-            if (confirm !== true) return JSON.stringify({ ok: false, error: "akm_secret action='path' requires confirm:true because secret paths are sensitive." })
-            if (!ref) return JSON.stringify({ ok: false, error: "'ref' is required for action='path'." })
-            const command = resolveAkmCommand()
-            if (typeof command === "object" && "ok" in command) return JSON.stringify(command)
-            try {
-              const filePath = execResolvedAkm(command, ["secret", "path", ref], {
-                encoding: "utf8",
-                timeout: 30_000,
-              }).toString().trim()
-              return JSON.stringify({
-                ok: true,
+      akm_search: tool({
+        description: "Search configured AKM bundles or registries in process. Use source='registry' for installable community assets.",
+        args: {
+          query: tool.schema.string().optional().describe("Search query. Omit to browse all assets."),
+          type: tool.schema
+            .enum(ASSET_TYPES as unknown as [string, ...string[]])
+            .optional()
+            .describe("Optional type filter. Defaults to 'any'."),
+          limit: tool.schema.number().optional().describe("Maximum number of hits to return. Defaults to 20."),
+          source: tool.schema.string().optional().describe("Search source: 'local', 'registry', 'all', or a configured bundle name."),
+          include_proposed: tool.schema.boolean().optional().describe("Include proposed-quality results. Proposed assets are not curated until accepted."),
+        },
+        async execute({ query, type, limit, source, include_proposed }, context) {
+          const raw = await runInProcess(
+            client as unknown as LogCapableClient,
+            "search",
+            {
+              query: query ?? "",
+              type: type === "any" ? undefined : type,
+              limit,
+              source,
+              includeProposed: include_proposed,
+            },
+            { toolName: "akm_search", sessionID: context.sessionID, directory: context.directory },
+          )
+          return withProposedWarnings(raw)
+        },
+      }),
+      akm_show: tool({
+        description: "Show an AKM asset by [bundle//]conceptId[#fragment]. Markdown heading fragments select a section.",
+        args: {
+          ref: tool.schema.string().describe("Asset reference returned by akm_search, optionally with a #fragment."),
+          detail: tool.schema.enum(["brief", "summary", "normal", "full"]).optional().describe("Response detail level. Defaults to 'normal'."),
+        },
+        async execute({ ref, detail }, context) {
+          return runInProcess(
+            client as unknown as LogCapableClient,
+            "show",
+            { ref, detail },
+            { toolName: "akm_show", sessionID: context.sessionID, directory: context.directory },
+          )
+        },
+      }),
+      akm_remember: tool({
+        description: "Record a memory in the default AKM stash so it can be searched and shown later.",
+        args: {
+          content: tool.schema.string().describe("Memory content to store."),
+          name: tool.schema.string().optional().describe("Optional memory name."),
+          force: tool.schema.boolean().optional().describe("Overwrite an existing memory with the same name."),
+        },
+        async execute({ content, name, force }, context) {
+          const args = ["remember", content]
+          if (name) args.push("--name", name)
+          if (force) args.push("--force")
+          args.push(...buildScopedArgs(context as unknown as Record<string, unknown>))
+          return runCli(client as unknown as LogCapableClient, args, { toolName: "akm_remember", sessionID: context.sessionID, directory: context.directory })
+        },
+      }),
+      akm_feedback: tool({
+        description: "Record positive or negative feedback for a stash asset so AKM can improve future ranking.",
+        args: {
+          ref: tool.schema.string().describe("Asset ref to record feedback for."),
+          sentiment: tool.schema.enum(["positive", "negative"]).describe("Whether the feedback is positive or negative."),
+          note: tool.schema.string().optional().describe("Optional note to attach to the feedback."),
+        },
+        async execute({ ref, sentiment, note }, context) {
+          const args = ["feedback", ref, sentiment === "positive" ? "--positive" : "--negative"]
+          if (note) args.push("--reason", note)
+          const raw = await runCli(client as unknown as LogCapableClient, args, { toolName: "akm_feedback", sessionID: context.sessionID, directory: context.directory })
+          const parsed = safeJsonParse<{ ok?: boolean; error?: string }>(raw)
+          if (parsed?.ok === false) {
+            const error = parsed.error ?? "Unknown akm feedback error"
+            if (isNotIndexedFeedbackError(error)) {
+              await writePluginLog(logClient, "warn", "AKM feedback skipped", {
+                subsystem: "feedback",
+                toolName: "akm_feedback",
+                sessionID: context.sessionID,
+                directory: context.directory,
                 ref,
-                filePath,
-                usage: "Pass this file path to trusted `_FILE`-style consumers or shells. The plugin did not read or surface the secret contents.",
+                sentiment,
+                reason: "ref_not_indexed",
+                error,
               })
-            } catch (error: unknown) {
-              await writePluginLog(logClient, "error", "AKM secret path failed", {
-                subsystem: "secret",
-                toolName: "akm_secret",
-                action: "path",
-                ref,
-                error: formatCliError(error),
+              await emitWorkflowTelemetry(logClient, "warn", "akm.feedback.skipped", {
+                sessionID: context.sessionID,
+                toolName: "akm_feedback",
+                assetRef: ref,
+                outcome: "skipped",
+                reason: "ref not indexed",
+                directory: context.directory,
               })
-              return JSON.stringify({ ok: false, error: formatCliError(error) })
+              return JSON.stringify({ ok: true, skipped: true, reason: "ref_not_indexed", ref, sentiment })
             }
-          }
-        }
-      },
-    }),
-    akm_wiki: tool({
-      description: "Manage AKM wikis — multi-wiki knowledge bases under <stashDir>/wikis/<name>/. Supports scaffolding, registering external sources, listing pages, scoped search, stashing raw sources, lint, and ingest workflow.",
-      args: {
-        action: tool.schema.enum([
-          "create",
-          "register",
-          "list",
-          "show",
-          "remove",
-          "pages",
-          "search",
-          "stash",
-          "lint",
-          "ingest",
-        ]).describe("Wiki subcommand."),
-        name: tool.schema.string().optional().describe("Wiki name (required for every action except 'list')."),
-        source_ref: tool.schema.string().optional().describe("Source ref to register (required for action='register'). Accepts directory paths, git URLs, github owner/repo, or https:// website roots."),
-        writable: tool.schema.boolean().optional().describe("When registering a git-backed source, mark it as push-writable (used by `akm sync`; see akm_help topic='sync')."),
-        max_pages: tool.schema.number().optional().describe("Crawler page cap when registering a website (default 50)."),
-        max_depth: tool.schema.number().optional().describe("Crawler depth cap when registering a website (default 3)."),
-        query: tool.schema.string().optional().describe("Query string for action='search'."),
-        limit: tool.schema.number().optional().describe("Result cap for action='search'."),
-        source: tool.schema.string().optional().describe("Source path (or '-' for stdin) for action='stash'."),
-        as_slug: tool.schema.string().optional().describe("Explicit slug for action='stash' (defaults to derived from source)."),
-        content: tool.schema.string().optional().describe("Raw content to feed stdin when stashing with source='-'."),
-        force: tool.schema.boolean().optional().describe("Required for action='remove'."),
-        with_sources: tool.schema.boolean().optional().describe("When removing, also delete the raw/ sources (default false)."),
-      },
-      async execute({ action, name, source_ref, writable, max_pages, max_depth, query, limit, source, as_slug, content, force, with_sources }) {
-        const logMeta = { toolName: "akm_wiki" }
-        const requireName = () => {
-          if (!name) return JSON.stringify({ ok: false, error: `'name' is required for action='${action}'.` })
-          return null
-        }
-        switch (action) {
-          case "list":
-            return runCli(client as unknown as LogCapableClient, ["wiki", "list"], logMeta)
-          case "create": {
-            const err = requireName(); if (err) return err
-            return runCli(client as unknown as LogCapableClient, ["wiki", "create", name!], logMeta)
-          }
-          case "show": {
-            const err = requireName(); if (err) return err
-            return runCli(client as unknown as LogCapableClient, ["wiki", "show", name!], logMeta)
-          }
-          case "pages": {
-            const err = requireName(); if (err) return err
-            return runCli(client as unknown as LogCapableClient, ["wiki", "pages", name!], logMeta)
-          }
-          case "ingest": {
-            const err = requireName(); if (err) return err
-            return runCli(client as unknown as LogCapableClient, ["wiki", "ingest", name!], logMeta)
-          }
-          case "lint": {
-            const err = requireName(); if (err) return err
-            // `wiki lint` exits 1 when findings exist, which runCli surfaces as
-            // an error envelope. That is still useful output — the JSON body is
-            // the lint report. Pass through either way.
-            return runCli(client as unknown as LogCapableClient, ["wiki", "lint", name!], logMeta)
-          }
-          case "register": {
-            const err = requireName(); if (err) return err
-            if (!source_ref) return JSON.stringify({ ok: false, error: "'source_ref' is required for action='register'." })
-            const args = ["wiki", "register", name!, source_ref]
-            if (writable) args.push("--writable")
-            if (max_pages != null) args.push("--max-pages", String(max_pages))
-            if (max_depth != null) args.push("--max-depth", String(max_depth))
-            return runCli(client as unknown as LogCapableClient, args, logMeta)
-          }
-          case "remove": {
-            const err = requireName(); if (err) return err
-            if (!force) return JSON.stringify({ ok: false, error: "'force' must be true to remove a wiki." })
-            const args = ["wiki", "remove", name!, "--force"]
-            if (with_sources) args.push("--with-sources")
-            return runCli(client as unknown as LogCapableClient, args, logMeta)
-          }
-          case "search": {
-            const err = requireName(); if (err) return err
-            if (!query) return JSON.stringify({ ok: false, error: "'query' is required for action='search'." })
-            const args = ["wiki", "search", name!, query]
-            if (limit != null) args.push("--limit", String(limit))
-            return runCli(client as unknown as LogCapableClient, args, logMeta)
-          }
-          case "stash": {
-            const err = requireName(); if (err) return err
-            if (!source) return JSON.stringify({ ok: false, error: "'source' is required for action='stash'." })
-            const args = ["wiki", "stash", name!, source]
-            if (as_slug) args.push("--as", as_slug)
-            if (source === "-" && content) {
-              const command = resolveAkmCommand()
-              if (typeof command === "object" && "ok" in command) return JSON.stringify(command)
-              try {
-                const stdout = execResolvedAkm(command, [...args, "--format", "json"], {
-                  encoding: "utf8",
-                  timeout: 60_000,
-                  input: content,
-                })
-                return stdout
-              } catch (error: unknown) {
-                await writePluginLog(logClient, "error", "AKM wiki stash failed", {
-                  subsystem: "wiki",
-                  toolName: "akm_wiki",
-                  action: "stash",
-                  name,
-                  source,
-                  as_slug,
-                  error: formatCliError(error),
-                })
-                return JSON.stringify({ ok: false, error: formatCliError(error) })
-              }
-            }
-            return runCli(client as unknown as LogCapableClient, args, logMeta)
-          }
-        }
-      },
-    }),
-    akm_workflow: tool({
-      description: "Manage AKM workflow runs — stateful multi-step procedures defined as workflow:<name> assets. Use start/next/complete/resume to drive a run, status/list to inspect, create/template to author.",
-      args: {
-        action: tool.schema.enum([
-          "start",
-          "next",
-          "complete",
-          "status",
-          "list",
-          "create",
-          "template",
-          "resume",
-        ]).describe("Workflow subcommand."),
-        ref: tool.schema.string().optional().describe("Workflow ref (e.g. workflow:release). Required for start; accepted by next/status as a target."),
-        target: tool.schema.string().optional().describe("Run id or workflow ref for next/status. When a workflow ref is passed to 'next', a new run is auto-started."),
-        run_id: tool.schema.string().optional().describe("Workflow run id. Required for complete and resume."),
-        params: tool.schema.string().optional().describe("JSON object string of parameters for start/next."),
-        step: tool.schema.string().optional().describe("Step id to transition (required for action='complete')."),
-        state: tool.schema.enum(["completed", "blocked", "failed", "skipped"]).optional().describe("Step state for 'complete'. Defaults to 'completed'."),
-        notes: tool.schema.string().optional().describe("Freeform notes attached to the step transition."),
-        evidence: tool.schema.string().optional().describe("JSON object string of evidence attached to the step transition."),
-        name: tool.schema.string().optional().describe("Workflow name for action='create'."),
-        from: tool.schema.string().optional().describe("Path to a markdown template for action='create'."),
-        force: tool.schema.boolean().optional().describe("Overwrite an existing workflow on create (requires --from or --reset)."),
-        reset: tool.schema.boolean().optional().describe("Reset to the built-in template for action='create'."),
-        filter_ref: tool.schema.string().optional().describe("Restrict action='list' to runs of this workflow ref."),
-        active_only: tool.schema.boolean().optional().describe("Restrict action='list' to active (non-terminal) runs."),
-      },
-      async execute({
-        action,
-        ref,
-        target,
-        run_id,
-        params,
-        step,
-        state,
-        notes,
-        evidence,
-        name,
-        from,
-        force,
-        reset,
-        filter_ref,
-        active_only,
-      }) {
-        const logMeta = { toolName: "akm_workflow" }
-        switch (action) {
-          case "start": {
-            if (!ref) return JSON.stringify({ ok: false, error: "'ref' is required for action='start'." })
-            const args = ["workflow", "start", ref]
-            if (params) args.push("--params", params)
-            const raw = await runCli(client as unknown as LogCapableClient, args, logMeta)
-            void emitWorkflowTelemetry(logClient, "info", "workflow_started", { toolName: "akm_workflow", ref, params: params ?? null })
-            return raw
-          }
-          case "next": {
-            const picked = target ?? run_id ?? ref
-            if (!picked) return JSON.stringify({ ok: false, error: "'target', 'run_id', or 'ref' is required for action='next'." })
-            const args = ["workflow", "next", picked]
-            if (params) args.push("--params", params)
-            const raw = await runCli(client as unknown as LogCapableClient, args, logMeta)
-            void emitWorkflowTelemetry(logClient, "info", "workflow_next_loaded", { toolName: "akm_workflow", target: picked, params: params ?? null })
-            return raw
-          }
-          case "complete": {
-            if (!run_id) return JSON.stringify({ ok: false, error: "'run_id' is required for action='complete'." })
-            if (!step) return JSON.stringify({ ok: false, error: "'step' is required for action='complete'." })
-            const args = ["workflow", "complete", run_id, "--step", step]
-            if (state) args.push("--state", state)
-            if (notes) args.push("--notes", notes)
-            if (evidence) args.push("--evidence", evidence)
-            const raw = await runCli(client as unknown as LogCapableClient, args, logMeta)
-            const eventType = state === "blocked"
-              ? "workflow_step_blocked"
-              : state === "failed"
-                ? "workflow_step_failed"
-                : state === "skipped"
-                  ? "workflow_step_skipped"
-                  : "workflow_step_completed"
-            void emitWorkflowTelemetry(logClient, "info", eventType, { toolName: "akm_workflow", runId: run_id, step, notes: notes ?? null, evidence: evidence ?? null })
-            return raw
-          }
-          case "status": {
-            const picked = target ?? run_id ?? ref
-            if (!picked) return JSON.stringify({ ok: false, error: "'target', 'run_id', or 'ref' is required for action='status'." })
-            return runCli(client as unknown as LogCapableClient, ["workflow", "status", picked], logMeta)
-          }
-          case "list": {
-            const args = ["workflow", "list"]
-            if (filter_ref) args.push("--ref", filter_ref)
-            if (active_only) args.push("--active")
-            return runCli(client as unknown as LogCapableClient, args, logMeta)
-          }
-          case "create": {
-            if (!name) return JSON.stringify({ ok: false, error: "'name' is required for action='create'." })
-            const args = ["workflow", "create", name]
-            if (from) args.push("--from", from)
-            if (force) args.push("--force")
-            if (reset) args.push("--reset")
-            return runCli(client as unknown as LogCapableClient, args, logMeta)
-          }
-          case "template": {
-            // The workflow template is emitted as raw markdown, not JSON.
-            const command = resolveAkmCommand()
-            if (typeof command === "object" && "ok" in command) return JSON.stringify(command)
-            try {
-              const stdout = execResolvedAkm(command, ["workflow", "template"], {
-                encoding: "utf8",
-                timeout: 30_000,
-              })
-              return JSON.stringify({ ok: true, template: stdout })
-            } catch (error: unknown) {
-              await writePluginLog(logClient, "error", "AKM workflow template failed", {
-                subsystem: "workflow",
-                toolName: "akm_workflow",
-                action: "template",
-                error: formatCliError(error),
-              })
-              return JSON.stringify({ ok: false, error: formatCliError(error) })
-            }
-          }
-          case "resume": {
-            if (!run_id) return JSON.stringify({ ok: false, error: "'run_id' is required for action='resume'." })
-            const raw = await runCli(client as unknown as LogCapableClient, ["workflow", "resume", run_id], logMeta)
-            void emitWorkflowTelemetry(logClient, "info", "workflow_resumed", { toolName: "akm_workflow", runId: run_id })
             return raw
           }
-        }
-      },
-    }),
-    akm_proposal: tool({
-      description: "Operate the AKM v0.8.0 proposal queue — list/show/diff/accept/reject pending drafts, or action='drain' for deterministic BULK triage of the whole backlog. All proposal-producing commands (improve, propose, plus plugin-emitted proposals) write through this queue. Acceptance runs full validation before promoting; rejection archives the draft. Always confirm with the user before action='accept', 'reject', or 'drain'. action='drain' clears the standing pending backlog by a deterministic policy (default queue/stage mode; pass promote:true to actually accept) — mutating, commits to git, no batch revert; always preview with dry_run:true first. This and the automatic improve `processes.triage` pre-pass supersede manual one-by-one queue management.",
-      args: {
-        action: tool.schema.enum(["list", "show", "diff", "accept", "reject", "drain"]).describe("Proposal subcommand."),
-        id: tool.schema.string().optional().describe("Proposal id. Required for show/diff/accept/reject."),
-        status: tool.schema.enum(["pending", "accepted", "rejected"]).optional().describe("Filter for action='list'."),
-        reason: tool.schema.string().optional().describe("Required for action='reject'. Recorded with the archived proposal."),
-        confirm: tool.schema.boolean().optional().describe("Must be true for action='accept', 'reject', and 'drain'."),
-        policy: tool.schema.string().optional().describe("action='drain' only: built-in preset (personal-stash|conservative|manual) or path to a policy file."),
-        promote: tool.schema.boolean().optional().describe("action='drain' only: promote (accept) matching proposals. Default is queue/stage mode (no writes to assets)."),
-        dry_run: tool.schema.boolean().optional().describe("action='drain' only: list the planned accept/reject/defer set without writing. Always preview first."),
-        max_accepts: tool.schema.number().optional().describe("action='drain' only: hard per-run accept ceiling."),
-        max_diff_lines: tool.schema.number().optional().describe("action='drain' only: defer accepts whose proposed content exceeds this many lines."),
-        older_than: tool.schema.number().optional().describe("action='drain' only: only consider proposals created more than this many days ago."),
-        judgment: tool.schema.boolean().optional().describe("action='drain' only: opt into the judgment tier for deferred items."),
-        profile: tool.schema.string().optional().describe("action='drain' only: read the triage block (policy, applyMode, ceilings, judgment) from this improve profile."),
-      },
-      async execute(input) {
-        const blocked = blockedToolResponse(input as Record<string, unknown>)
-        if (blocked) return blocked
-        const { action, id, status, reason, confirm, policy, promote, dry_run, max_accepts, max_diff_lines, older_than, judgment, profile } = input
-        const logMeta = { toolName: "akm_proposal" }
-        switch (action) {
-          case "list": {
-            const args = ["proposal", "list"]
-            if (status) args.push("--status", status)
-            return runCli(client as unknown as LogCapableClient, args, logMeta)
-          }
-          case "show": {
-            if (!id) return JSON.stringify({ ok: false, error: "'id' is required for action='show'." })
-            return runCli(client as unknown as LogCapableClient, ["proposal", "show", id], logMeta)
-          }
-          case "diff": {
-            if (!id) return JSON.stringify({ ok: false, error: "'id' is required for action='diff'." })
-            return runCli(client as unknown as LogCapableClient, ["proposal", "diff", id], logMeta)
-          }
-          case "accept": {
-            if (confirm !== true) return JSON.stringify({ ok: false, error: "akm_proposal action='accept' requires confirm:true because it mutates the proposal queue." })
-            if (!id) return JSON.stringify({ ok: false, error: "'id' is required for action='accept'. Confirm with the user before accepting." })
-            const acceptResult = await runCli(client as unknown as LogCapableClient, ["proposal", "accept", id, "--yes"], logMeta)
-            // Invalidate the proposal-count cache so the next getPendingProposalCount() call
-            // reflects the updated queue immediately (WS-7a: no stale 60s TTL after mutations).
-            pendingProposalSummaryCache.clear()
-            return acceptResult
-          }
-          case "reject": {
-            if (confirm !== true) return JSON.stringify({ ok: false, error: "akm_proposal action='reject' requires confirm:true because it mutates the proposal queue." })
-            if (!id) return JSON.stringify({ ok: false, error: "'id' is required for action='reject'. Confirm with the user before rejecting." })
-            if (!reason || !reason.trim()) return JSON.stringify({ ok: false, error: "'reason' is required for action='reject'. Ask the user why the proposal is being rejected." })
-            const rejectResult = await runCli(client as unknown as LogCapableClient, ["proposal", "reject", id, "--reason", reason, "--yes"], logMeta)
-            // Invalidate the proposal-count cache (WS-7a).
-            pendingProposalSummaryCache.clear()
-            return rejectResult
-          }
-          case "drain": {
-            if (confirm !== true) return JSON.stringify({ ok: false, error: "akm_proposal action='drain' requires confirm:true because it bulk-mutates the proposal queue and commits to git." })
-            const args = ["proposal", "drain"]
-            if (policy) args.push("--policy", policy)
-            if (promote) args.push("--promote")
-            if (dry_run) args.push("--dry-run")
-            else args.push("--yes")
-            if (typeof max_accepts === "number") args.push("--max-accepts", String(max_accepts))
-            if (typeof max_diff_lines === "number") args.push("--max-diff-lines", String(max_diff_lines))
-            if (typeof older_than === "number") args.push("--older-than", String(older_than))
-            if (judgment) args.push("--judgment")
-            if (profile) args.push("--profile", profile)
-            const drainResult = await runCli(client as unknown as LogCapableClient, args, logMeta)
-            // A real drain (not a dry run) mutates the queue; invalidate the count cache (WS-7a).
-            if (!dry_run) pendingProposalSummaryCache.clear()
-            return drainResult
-          }
-        }
-      },
-    }),
-    akm_improve: tool({
-      description: "Generate AKM improvement proposals for an existing ref, an asset type, or the broader stash. This is the v0.8.0 replacement for the old reflect/distill flow. Output lands in the proposal queue only — never mutates live stash content. Requires `defaults.agent` (with a matching `profiles.agent.<name>` entry) to be set for agent-backed proposal generation; the legacy `agent.default` shape is auto-migrated on load.",
-      args: {
-        scope: tool.schema.string().optional().describe("Optional asset type or [origin//]type:name ref to improve. When omitted, improves the current stash scope."),
-        task: tool.schema.string().optional().describe("Optional extra guidance for this improvement pass."),
-        dry_run: tool.schema.boolean().optional().describe("Show planned actions without generating proposals."),
-      },
-      async execute({ scope, task, dry_run }, context) {
-        if (!dry_run) {
-          await ensureFreshProposalCheckpoint(logClient, {
+          await emitWorkflowTelemetry(logClient, "info", "akm.feedback.recorded", {
             sessionID: context.sessionID,
+            toolName: "akm_feedback",
+            assetRef: ref,
+            outcome: "success",
+            reason: sentiment,
             directory: context.directory,
-            agent: context.agent,
-          }, "pre-improve")
-        }
-        const args = ["improve"]
-        if (scope) args.push(scope)
-        if (task) args.push("--task", task)
-        if (dry_run) args.push("--dry-run")
-        const improveResult = await runCli(client as unknown as LogCapableClient, args, { toolName: "akm_improve", sessionID: context.sessionID, directory: context.directory, agent: context.agent })
-        // Invalidate the proposal-count cache after improve (may have added proposals) (WS-7a).
-        if (!dry_run) pendingProposalSummaryCache.clear()
-        return improveResult
-      },
-    }),
-    akm_propose: tool({
-      description: "Generate a new-asset proposal via the configured agent CLI. The asset is drafted as `quality:\"proposed\"` and lands in the proposal queue — never directly into curated content. Requires `defaults.agent` (with a matching `profiles.agent.<name>` entry; run akm_setup first if missing). The legacy `agent.default` shape is auto-migrated on load.",
-      args: {
-        type: tool.schema.enum(["skill", "command", "agent", "knowledge", "lesson", "script", "workflow", "wiki"]).describe("Asset type for the new proposal."),
-        name: tool.schema.string().describe("Slug for the new asset (matches the standard ref grammar)."),
-        task: tool.schema.string().optional().describe("Optional inline task text describing what the asset should do."),
-        file: tool.schema.string().optional().describe("Optional UTF-8 file path to read the task text from. Exactly one of task/file is required."),
-      },
-      async execute({ type, name, task, file }, context) {
-        const hasTask = !!task?.trim()
-        const hasFile = !!file?.trim()
-        if (hasTask === hasFile) return JSON.stringify({ ok: false, error: "Exactly one of 'task' or 'file' is required for akm_propose." })
-        await ensureFreshProposalCheckpoint(logClient, {
-          sessionID: context.sessionID,
-          directory: context.directory,
-          agent: context.agent,
-        }, "pre-propose")
-        const args = ["propose", type, name]
-        if (hasTask) args.push("--task", task!.trim())
-        if (hasFile) args.push("--file", file!.trim())
-        return runCli(client as unknown as LogCapableClient, args, { toolName: "akm_propose", sessionID: context.sessionID, directory: context.directory, agent: context.agent })
-      },
-    }),
-    akm_init: tool({
-      description: "Initialize AKM's working stash directory and persist `stashDir` in config. This is the agent-safe initialization path; do not use interactive `akm setup` from tools.",
-      args: {},
-      async execute() {
-        return runCli(client as unknown as LogCapableClient, ["init"], { toolName: "akm_init" })
-      },
-    }),
-    akm_help: tool({
-      description: "Discover the right `akm` CLI command and args for tasks not covered by a first-class tool — e.g. save/push, import, clone, update, remove, list sources, registry search, reindex, config, CLI upgrade, run script. Returns a curated quick-reference plus live `akm --help` output. Pass `command` to drill into a specific subcommand.",
-      args: {
-        topic: tool.schema.string().optional().describe("Natural-language description of the task (e.g. 'commit and push my stash', 'install a kit from github'). Returns curated hints if any keywords match."),
-        command: tool.schema.string().optional().describe("Specific akm subcommand to inspect (e.g. 'save', 'clone', 'config'). Runs `akm <command> --help` and returns the output verbatim."),
-      },
-      async execute({ topic, command }) {
-        const cliCommand = resolveAkmCommand()
-        if (typeof cliCommand === "object" && "ok" in cliCommand) return JSON.stringify(cliCommand)
-        const helpArgs = command && command.trim()
-          ? [command.trim(), "--help"]
-          : ["--help"]
-        let helpText = ""
-        try {
-          helpText = execResolvedAkm(cliCommand, helpArgs, {
-            encoding: "utf8",
-            timeout: 30_000,
-          }).toString().trim()
-        } catch (error: unknown) {
-          await writePluginLog(logClient, "error", "AKM help command failed", {
-            subsystem: "help",
-            toolName: "akm_help",
-            command: cliCommand,
-            args: helpArgs,
-            error: formatCliError(error),
           })
-          return JSON.stringify({ ok: false, error: formatCliError(error) })
-        }
-        return JSON.stringify({
-          ok: true,
-          command: command ?? null,
-          topic: topic ?? null,
-          hints: topic ? lookupAkmHelpHint(topic) : [],
-          quickReference: AKM_HELP_QUICK_REFERENCE,
-          help: helpText,
-          workflowTopics: [
-            "proposal",
-            "improve",
-            "propose",
-            "lesson",
-            "tasks",
-            "secret-safety",
-            "include-proposed",
-            "llm-features",
-            "env-safety",
-          ],
-        })
-      },
-    }),
+          return raw
+        },
+      }),
+      akm_curate: tool({
+        description: "Curate stash assets for a task or topic. Returns the top matches as a ranked list so the agent can inspect and use them.",
+        args: {
+          query: tool.schema.string().describe("Task, topic, or natural-language description of what you want to do."),
+          type: tool.schema.enum(ASSET_TYPES as unknown as [string, ...string[]]).optional().describe("Optional asset type filter."),
+          limit: tool.schema.number().optional().describe("Maximum number of curated matches to return. Defaults to 4."),
+          source: tool.schema.string().optional().describe("Search source: 'local', 'registry', 'all', or a configured bundle name."),
+        },
+        async execute({ query, type, limit, source }, context) {
+          return runInProcess(
+            client as unknown as LogCapableClient,
+            "curate",
+            { query, type: type === "any" ? undefined : type, limit, source },
+            { toolName: "akm_curate", sessionID: context.sessionID, directory: context.directory },
+          )
+        },
+      }),
     },
   }
 }
- 
-export const server = AkmPlugin
-export default { server, id: "akm-opencode" }
+
+// A single named export only. The @opencode-ai/plugin loader initializes
+// every exported plugin function it finds in this module, so exporting the
+// same function again under a second name (`server`) or bundled into a
+// default export risks the host registering — and running — the plugin's
+// hooks twice (double auto-feedback, double session-start curates, etc.).
+// The SDK's own example plugin (dist/example.js) exports exactly one named
+// const with no default export; that is the blessed shape.