opencode-claude-memory 1.2.0 → 1.3.1

package/README.md

@@ -24,6 +24,8 @@ Claude Code writes memory → OpenCode reads it. OpenCode writes memory → Clau
   Install + enable plugin, then keep using `opencode` as usual.
 - **Local-first, no migration**
   Memory stays as local Markdown files in the same directory Claude Code already uses.
+- **Auto-dream consolidation**
+  Periodically runs a background memory consolidation pass (Claude-style auto-dream gating).
 
 ## 🚀 Quick Start
 
@@ -36,7 +38,7 @@ opencode-memory install   # one-time: installs shell hook
 
 This installs:
 - The **plugin** — memory tools + system prompt injection
-- The `opencode-memory` **CLI** — wraps opencode with post-session memory extraction
+- The `opencode-memory` **CLI** — wraps opencode with automatic memory extraction + auto-dream consolidation
 - A **shell hook** — defines an `opencode()` function in your `.zshrc`/`.bashrc` that delegates to `opencode-memory`
 
 ### 2. Configure
@@ -54,7 +56,7 @@ This installs:
 opencode
 ```
 
-That’s it. Memory extraction runs in the background after each session.
+That’s it. Memory extraction runs in the background after each session, and auto-dream consolidation is checked with time/session gates.
 
 To uninstall:
 
@@ -92,8 +94,10 @@ graph LR
     B --> C[opencode-memory finds real binary]
     C --> D[Runs opencode normally]
     D --> E[You exit]
-    E --> F[Fork session + extract memories]
-    F --> G[Memories saved to ~/.claude/projects/]
+    E --> F[Extract memories if needed]
+    F --> G[Evaluate auto-dream gate]
+    G --> H[Consolidate memories if gate passes]
+    H --> I[Memories saved to ~/.claude/projects/]
 ```
 
 The shell hook defines an `opencode()` function that delegates to `opencode-memory`:
@@ -101,8 +105,11 @@ The shell hook defines an `opencode()` function that delegates to `opencode-memo
 1. Shell function intercepts `opencode` command (higher priority than PATH)
 2. `opencode-memory` finds the real `opencode` binary in PATH
 3. Runs it with all your arguments
-4. After you exit, forks the session with a memory extraction prompt
-5. Extraction runs **in the background** — you're never blocked
+4. After you exit, it checks whether the session already wrote memory files
+5. If needed, it forks the session with a memory extraction prompt
+6. It evaluates the auto-dream gate (default: at least 24h since last consolidation and 5 touched sessions)
+7. If the gate passes, it runs a background consolidation pass to merge/prune memories
+8. Maintenance runs **in the background** unless `OPENCODE_MEMORY_FOREGROUND=1`
 
 ### Compatibility details
 
@@ -137,22 +144,35 @@ File-based memory is transparent, local-first, easy to inspect/diff/back up, and
 
 Yes. Set `OPENCODE_MEMORY_EXTRACT=0`.
 
+### Can I disable auto-dream?
+
+Yes. Set `OPENCODE_MEMORY_AUTODREAM=0`. You can also tune gates with:
+- `OPENCODE_MEMORY_AUTODREAM_MIN_HOURS`
+- `OPENCODE_MEMORY_AUTODREAM_MIN_SESSIONS`
+
 ## 🔧 Configuration
 
 ### Environment variables
 
-- `OPENCODE_MEMORY_EXTRACT` (default `1`): set `0` to disable auto-extraction
-- `OPENCODE_MEMORY_FOREGROUND` (default `0`): set `1` to run extraction in foreground
+- `OPENCODE_MEMORY_EXTRACT` (default `1`): set `0` to disable automatic memory extraction
+- `OPENCODE_MEMORY_FOREGROUND` (default `0`): set `1` to run maintenance in foreground
 - `OPENCODE_MEMORY_MODEL`: override model used for extraction
 - `OPENCODE_MEMORY_AGENT`: override agent used for extraction
+- `OPENCODE_MEMORY_AUTODREAM` (default `1`): set `0` to disable auto-dream consolidation
+- `OPENCODE_MEMORY_AUTODREAM_MIN_HOURS` (default `24`): min hours between consolidation runs
+- `OPENCODE_MEMORY_AUTODREAM_MIN_SESSIONS` (default `5`): min touched sessions since last consolidation
+- `OPENCODE_MEMORY_AUTODREAM_MODEL`: override model used for auto-dream
+- `OPENCODE_MEMORY_AUTODREAM_AGENT`: override agent used for auto-dream
 
 ### Logs
 
-Extraction logs are written to `$TMPDIR/opencode-memory-logs/extract-*.log`.
+Logs are written to `$TMPDIR/opencode-memory-logs/`:
+- `extract-*.log`: automatic memory extraction
+- `dream-*.log`: auto-dream consolidation
 
 ### Concurrency safety
 
-A file lock prevents multiple extractions from running simultaneously on the same project. Stale locks are cleaned up automatically.
+Lock files prevent concurrent extraction/consolidation runs per project root. Stale locks are cleaned up automatically.
 
 ## 📝 Memory format
 

package/bin/opencode-memory

@@ -1,34 +1,39 @@
 #!/usr/bin/env bash
 #
-# opencode-memory — Wrapper for OpenCode with automatic memory extraction.
+# opencode-memory — Wrapper for OpenCode with post-session memory maintenance.
 #
 # Installs a shell hook (function) that intercepts the `opencode` command,
-# then wraps the real binary with post-session memory extraction.
+# then wraps the real binary with post-session extraction and auto-dream.
 #
 # Subcommands:
 #   opencode-memory install    — Install shell hook to ~/.zshrc or ~/.bashrc
 #   opencode-memory uninstall  — Remove shell hook
-#   opencode-memory [args...]  — Run opencode with memory extraction
+#   opencode-memory [args...]  — Run opencode with post-session memory maintenance
 #
 # How it works:
 #   1. Shell hook defines `opencode()` function that delegates to `opencode-memory`
 #   2. `opencode-memory` finds the real `opencode` binary in PATH
 #   3. Runs it normally with all your arguments
 #   4. After you exit, finds the most recent session
-#   5. Forks that session and sends a memory extraction prompt
-#   6. The extraction runs in the background so you're not blocked
+#   5. Optionally runs memory extraction (conversation -> memories)
+#   6. Optionally runs auto-dream consolidation (memory pruning/merge)
 #
 # Requirements:
 #   - Real `opencode` CLI reachable in PATH
-#   - `jq` for JSON parsing
-#   - The opencode-memory plugin installed (provides memory_save tool)
+#   - `jq` for auto-dream gate/session counting
+#   - The opencode-memory plugin installed (provides memory_* tools)
 #
 # Environment variables:
-#   OPENCODE_MEMORY_EXTRACT=0    — Disable auto-extraction
-#   OPENCODE_MEMORY_FOREGROUND=1 — Run extraction in foreground (for debugging)
-#   OPENCODE_MEMORY_MODEL=...    — Override model for extraction (e.g., "anthropic/claude-sonnet-4-20250514")
-#   OPENCODE_MEMORY_AGENT=...    — Override agent for extraction
-#   OPENCODE_MEMORY_DIR=...      — Override working directory for opencode
+#   OPENCODE_MEMORY_EXTRACT=0                 — Disable post-session extraction
+#   OPENCODE_MEMORY_FOREGROUND=1              — Run maintenance in foreground (debug)
+#   OPENCODE_MEMORY_MODEL=...                 — Extraction model override
+#   OPENCODE_MEMORY_AGENT=...                 — Extraction agent override
+#   OPENCODE_MEMORY_AUTODREAM=0               — Disable auto-dream consolidation
+#   OPENCODE_MEMORY_AUTODREAM_MIN_HOURS=24    — Min hours between auto-dream runs
+#   OPENCODE_MEMORY_AUTODREAM_MIN_SESSIONS=5  — Min touched sessions since last consolidation
+#   OPENCODE_MEMORY_AUTODREAM_MODEL=...       — Auto-dream model override
+#   OPENCODE_MEMORY_AUTODREAM_AGENT=...       — Auto-dream agent override
+#   OPENCODE_MEMORY_DIR=...                   — Override working directory for opencode
 #
 
 set -euo pipefail
@@ -161,20 +166,51 @@ EXTRACT_ENABLED="${OPENCODE_MEMORY_EXTRACT:-1}"
 FOREGROUND="${OPENCODE_MEMORY_FOREGROUND:-0}"
 EXTRACT_MODEL="${OPENCODE_MEMORY_MODEL:-}"
 EXTRACT_AGENT="${OPENCODE_MEMORY_AGENT:-}"
+
+AUTODREAM_ENABLED="${OPENCODE_MEMORY_AUTODREAM:-1}"
+AUTODREAM_MIN_HOURS="${OPENCODE_MEMORY_AUTODREAM_MIN_HOURS:-24}"
+AUTODREAM_MIN_SESSIONS="${OPENCODE_MEMORY_AUTODREAM_MIN_SESSIONS:-5}"
+AUTODREAM_SCAN_LIMIT="${OPENCODE_MEMORY_AUTODREAM_SCAN_LIMIT:-200}"
+AUTODREAM_MODEL="${OPENCODE_MEMORY_AUTODREAM_MODEL:-$EXTRACT_MODEL}"
+AUTODREAM_AGENT="${OPENCODE_MEMORY_AUTODREAM_AGENT:-$EXTRACT_AGENT}"
+AUTODREAM_STALE_LOCK_SECS=$((60 * 60))
+
 WORKING_DIR="${OPENCODE_MEMORY_DIR:-$(pwd)}"
 
-# Lock file to prevent concurrent extractions on the same project
-LOCK_DIR="${TMPDIR:-/tmp}/opencode-memory-locks"
+TMP_BASE_DIR="${TMPDIR:-/tmp}"
+while [ "$TMP_BASE_DIR" != "/" ] && [ "${TMP_BASE_DIR%/}" != "$TMP_BASE_DIR" ]; do
+  TMP_BASE_DIR="${TMP_BASE_DIR%/}"
+done
+if [ -z "$TMP_BASE_DIR" ]; then
+  TMP_BASE_DIR="/"
+fi
+
+# Scope lock files at project root granularity (not per-subdirectory).
+PROJECT_SCOPE_DIR="$WORKING_DIR"
+if git -C "$WORKING_DIR" rev-parse --show-toplevel >/dev/null 2>&1; then
+  PROJECT_SCOPE_DIR="$(git -C "$WORKING_DIR" rev-parse --show-toplevel 2>/dev/null || echo "$WORKING_DIR")"
+fi
+
+PROJECT_KEY="$(printf '%s' "$PROJECT_SCOPE_DIR" | cksum | awk '{print $1}')"
+
+# Lock files (prevent concurrent work on the same project)
+LOCK_DIR="$TMP_BASE_DIR/opencode-memory-locks"
 mkdir -p "$LOCK_DIR"
-LOCK_FILE="$LOCK_DIR/$(echo "$WORKING_DIR" | sed 's/[^a-zA-Z0-9]/-/g').lock"
+EXTRACT_LOCK_FILE="$LOCK_DIR/${PROJECT_KEY}.extract.lock"
 
-# Log file for background extraction
-LOG_DIR="${TMPDIR:-/tmp}/opencode-memory-logs"
+STATE_DIR="${CLAUDE_CONFIG_DIR:-$HOME/.claude}/opencode-memory"
+mkdir -p "$STATE_DIR"
+CONSOLIDATION_LOCK_FILE="$STATE_DIR/${PROJECT_KEY}.consolidate-lock"
+
+# Logs
+LOG_DIR="$TMP_BASE_DIR/opencode-memory-logs"
 mkdir -p "$LOG_DIR"
-LOG_FILE="$LOG_DIR/extract-$(date +%Y%m%d-%H%M%S).log"
+TASK_LOG_PREFIX="$(date +%Y%m%d-%H%M%S)-${PROJECT_KEY}"
+EXTRACT_LOG_FILE="$LOG_DIR/extract-${TASK_LOG_PREFIX}.log"
+AUTODREAM_LOG_FILE="$LOG_DIR/dream-${TASK_LOG_PREFIX}.log"
 
 # ============================================================================
-# Extraction Prompt
+# Prompts
 # ============================================================================
 
 # Adapted from Claude Code's extraction prompt, simplified for OpenCode's
@@ -217,6 +253,44 @@ For each memory worth saving, call `memory_save` with:
 5. Be selective: 0-3 memories per session is typical. Quality over quantity.
 6. Do NOT save a memory about the extraction process itself.'
 
+# Periodic memory consolidation inspired by Claude Code auto-dream.
+AUTODREAM_PROMPT="$(cat <<'EOF'
+You are performing an auto-dream memory consolidation pass.
+
+Goal: tighten and de-duplicate memory files so future sessions can orient faster.
+
+## Available tools
+- memory_list
+- memory_search
+- memory_read
+- memory_save
+- memory_delete
+
+## Phase 1 — Orient
+1. Use memory_list to inspect current memory inventory.
+2. Identify overlapping or stale entries that can be merged/updated/deleted.
+
+## Phase 2 — Consolidate
+1. Merge duplicates into a single stronger memory using memory_save.
+2. Rewrite vague descriptions so retrieval is easier and more precise.
+3. For feedback/project entries, ensure content is structured as:
+   - main rule/fact
+   - **Why:**
+   - **How to apply:**
+
+## Phase 3 — Prune
+1. Delete memories that are clearly obsolete, contradictory, or low-value.
+2. Keep total memory set concise and high signal.
+
+## Guardrails
+- Do NOT invent facts.
+- If confidence is low, keep existing memory instead of guessing.
+- If memory quality is already strong, make no changes and explicitly say so.
+
+Return a short summary of what you updated, merged, or removed.
+EOF
+)"
+
 # ============================================================================
 # Helper Functions
 # ============================================================================
@@ -225,85 +299,310 @@ log() {
   echo "[opencode-memory] $*" >&2
 }
 
+is_positive_int() {
+  [[ "$1" =~ ^[0-9]+$ ]] && [ "$1" -gt 0 ]
+}
+
+if ! is_positive_int "$AUTODREAM_MIN_HOURS"; then
+  log "Invalid OPENCODE_MEMORY_AUTODREAM_MIN_HOURS=$AUTODREAM_MIN_HOURS, using default 24"
+  AUTODREAM_MIN_HOURS=24
+fi
+if ! is_positive_int "$AUTODREAM_MIN_SESSIONS"; then
+  log "Invalid OPENCODE_MEMORY_AUTODREAM_MIN_SESSIONS=$AUTODREAM_MIN_SESSIONS, using default 5"
+  AUTODREAM_MIN_SESSIONS=5
+fi
+if ! is_positive_int "$AUTODREAM_SCAN_LIMIT"; then
+  log "Invalid OPENCODE_MEMORY_AUTODREAM_SCAN_LIMIT=$AUTODREAM_SCAN_LIMIT, using default 200"
+  AUTODREAM_SCAN_LIMIT=200
+fi
+
 has_new_memories() {
-  # Check if any memory file was modified during the session
-  # Checks all projects' memory directories for files newer than the timestamp marker
+  # Check if any memory file was modified during the session.
   local mem_base="${CLAUDE_CONFIG_DIR:-$HOME/.claude}/projects"
-
   if [ ! -d "$mem_base" ]; then
     return 1
   fi
 
-  # Find any .md file under projects/*/memory/ newer than our timestamp
   local newer_files
   newer_files=$(find "$mem_base" -path "*/memory/*.md" -newer "$TIMESTAMP_FILE" 2>/dev/null | head -1)
-
   [ -n "$newer_files" ]
 }
 
+cleanup_timestamp() {
+  rm -f "$TIMESTAMP_FILE"
+}
+
+get_session_list_json() {
+  local limit="$1"
+  local output
+
+  if output=$("$REAL_OPENCODE" session list --format json -n "$limit" 2>/dev/null); then
+    echo "$output"
+    return 0
+  fi
+
+  if output=$("$REAL_OPENCODE" session list --format json 2>/dev/null); then
+    echo "$output"
+    return 0
+  fi
+
+  return 1
+}
+
 get_latest_session_id() {
   local session_json
-  session_json=$("$REAL_OPENCODE" session list --format json -n 1 2>/dev/null) || return 1
+  session_json=$(get_session_list_json 1) || return 1
 
-  # Parse with jq if available, fallback to grep
+  # Parse with jq if available, fallback to grep.
   if command -v jq &>/dev/null; then
     echo "$session_json" | jq -r '.[0].id // empty'
   else
-    # Rough fallback: extract first "id" value
     echo "$session_json" | grep -o '"id"[[:space:]]*:[[:space:]]*"[^"]*"' | head -1 | sed 's/.*"id"[[:space:]]*:[[:space:]]*"\([^"]*\)"/\1/'
   fi
 }
 
-acquire_lock() {
-  if [ -f "$LOCK_FILE" ]; then
+file_mtime_secs() {
+  local file="$1"
+  if [ ! -f "$file" ]; then
+    echo 0
+    return 0
+  fi
+
+  if stat -c %Y "$file" >/dev/null 2>&1; then
+    stat -c %Y "$file"
+    return 0
+  fi
+
+  stat -f %m "$file"
+}
+
+# Claude-style lock/mtime semantics:
+# - lock file CONTENT (PID) = current holder
+# - lock file MTIME = last successful consolidation timestamp
+read_last_consolidated_at_secs() {
+  file_mtime_secs "$CONSOLIDATION_LOCK_FILE"
+}
+
+set_file_mtime_secs() {
+  local file="$1"
+  local secs="$2"
+
+  if command -v python3 >/dev/null 2>&1; then
+    python3 - "$file" "$secs" <<'PY'
+import os
+import sys
+
+path = sys.argv[1]
+secs = int(sys.argv[2])
+os.utime(path, (secs, secs))
+PY
+    return 0
+  fi
+
+  # Best effort fallback; may not be portable across all environments.
+  touch -d "@$secs" "$file" >/dev/null 2>&1 || true
+}
+
+acquire_simple_lock() {
+  local lock_file="$1"
+  local lock_name="$2"
+
+  if [ -f "$lock_file" ]; then
     local lock_pid
-    lock_pid=$(cat "$LOCK_FILE" 2>/dev/null || true)
+    lock_pid=$(cat "$lock_file" 2>/dev/null || true)
     if [ -n "$lock_pid" ] && kill -0 "$lock_pid" 2>/dev/null; then
-      log "Another extraction is already running (PID $lock_pid), skipping"
+      log "Another $lock_name is already running (PID $lock_pid), skipping"
       return 1
     fi
-    # Stale lock — remove it
-    rm -f "$LOCK_FILE"
+    rm -f "$lock_file"
   fi
-  echo $$ > "$LOCK_FILE"
+
+  echo $$ > "$lock_file"
   return 0
 }
 
-release_lock() {
-  rm -f "$LOCK_FILE"
+release_simple_lock() {
+  local lock_file="$1"
+  rm -f "$lock_file"
 }
 
-cleanup_timestamp() {
-  rm -f "$TIMESTAMP_FILE"
+count_sessions_touched_since_ms() {
+  local since_ms="$1"
+  local exclude_session_id="$2"
+
+  if ! command -v jq >/dev/null 2>&1; then
+    echo ""
+    return 1
+  fi
+
+  local session_json
+  session_json=$(get_session_list_json "$AUTODREAM_SCAN_LIMIT") || {
+    echo ""
+    return 1
+  }
+
+  echo "$session_json" | jq -r --argjson since "$since_ms" --arg exclude "$exclude_session_id" '
+    [ .[]
+      | select((.id // "") != $exclude)
+      | select(((.time.updated // .time.created // 0) | tonumber) > $since)
+    ] | length
+  '
 }
 
-run_extraction() {
+CONSOLIDATION_PRIOR_MTIME=0
+
+try_acquire_consolidation_lock() {
+  local path="$CONSOLIDATION_LOCK_FILE"
+  local now mtime holder age
+
+  # Returns prior mtime via CONSOLIDATION_PRIOR_MTIME so callers can rollback
+  # on failure (preserving last successful consolidation time semantics).
+
+  now=$(date +%s)
+  mtime=0
+  holder=""
+
+  if [ -f "$path" ]; then
+    mtime=$(file_mtime_secs "$path")
+    holder=$(cat "$path" 2>/dev/null || true)
+    age=$((now - mtime))
+
+    if [ "$age" -lt "$AUTODREAM_STALE_LOCK_SECS" ] && [ -n "$holder" ] && kill -0 "$holder" 2>/dev/null; then
+      log "Auto-dream lock held by live PID $holder (${age}s old), skipping"
+      return 1
+    fi
+  fi
+
+  mkdir -p "$(dirname "$path")"
+  echo $$ > "$path"
+
+  local verify
+  verify=$(cat "$path" 2>/dev/null || true)
+  if [ "$verify" != "$$" ]; then
+    return 1
+  fi
+
+  CONSOLIDATION_PRIOR_MTIME="$mtime"
+  return 0
+}
+
+rollback_consolidation_lock() {
+  local prior_mtime="$1"
+  local path="$CONSOLIDATION_LOCK_FILE"
+
+  if [ "$prior_mtime" -eq 0 ]; then
+    rm -f "$path"
+    return 0
+  fi
+
+  : > "$path"
+  set_file_mtime_secs "$path" "$prior_mtime"
+}
+
+run_extraction_if_needed() {
   local session_id="$1"
+  local memory_written_during_session="$2"
+
+  if [ "$EXTRACT_ENABLED" = "0" ]; then
+    return 0
+  fi
+
+  if [ "$memory_written_during_session" = "1" ]; then
+    log "Main agent already wrote memories during session, skipping extraction"
+    return 0
+  fi
+
+  if ! acquire_simple_lock "$EXTRACT_LOCK_FILE" "memory extraction"; then
+    return 0
+  fi
 
   log "Extracting memories from session $session_id..."
-  log "Log file: $LOG_FILE"
+  log "Extraction log: $EXTRACT_LOG_FILE"
 
-  # Build the opencode run command
   local cmd=("$REAL_OPENCODE" run -s "$session_id" --fork)
-
   if [ -n "$EXTRACT_MODEL" ]; then
     cmd+=(-m "$EXTRACT_MODEL")
   fi
-
   if [ -n "$EXTRACT_AGENT" ]; then
     cmd+=(--agent "$EXTRACT_AGENT")
   fi
-
   cmd+=("$EXTRACT_PROMPT")
 
-  # Execute
-  if "${cmd[@]}" >> "$LOG_FILE" 2>&1; then
+  if "${cmd[@]}" >> "$EXTRACT_LOG_FILE" 2>&1; then
     log "Memory extraction completed successfully"
   else
-    log "Memory extraction failed (exit code $?). Check $LOG_FILE for details"
+    local code=$?
+    log "Memory extraction failed (exit code $code). Check $EXTRACT_LOG_FILE for details"
+  fi
+
+  release_simple_lock "$EXTRACT_LOCK_FILE"
+}
+
+run_autodream_if_needed() {
+  local session_id="$1"
+
+  if [ "$AUTODREAM_ENABLED" = "0" ]; then
+    return 0
+  fi
+
+  if ! command -v jq >/dev/null 2>&1; then
+    log "jq not found, skipping auto-dream (requires JSON session parsing)"
+    return 0
+  fi
+
+  local last_at now hours_since since_ms touched_count
+  last_at=$(read_last_consolidated_at_secs)
+  now=$(date +%s)
+
+  hours_since=$(((now - last_at) / 3600))
+  if [ "$hours_since" -lt "$AUTODREAM_MIN_HOURS" ]; then
+    return 0
+  fi
+
+  since_ms=$((last_at * 1000))
+  touched_count=$(count_sessions_touched_since_ms "$since_ms" "$session_id" || true)
+  if [ -z "$touched_count" ]; then
+    log "Unable to inspect touched sessions, skipping auto-dream"
+    return 0
+  fi
+
+  if [ "$touched_count" -lt "$AUTODREAM_MIN_SESSIONS" ]; then
+    return 0
+  fi
+
+  if ! try_acquire_consolidation_lock; then
+    return 0
+  fi
+
+  log "Auto-dream firing (${hours_since}h since last consolidation, ${touched_count} sessions touched)"
+  log "Auto-dream log: $AUTODREAM_LOG_FILE"
+
+  local cmd=("$REAL_OPENCODE" run -s "$session_id" --fork)
+  if [ -n "$AUTODREAM_MODEL" ]; then
+    cmd+=(-m "$AUTODREAM_MODEL")
+  fi
+  if [ -n "$AUTODREAM_AGENT" ]; then
+    cmd+=(--agent "$AUTODREAM_AGENT")
+  fi
+  cmd+=("$AUTODREAM_PROMPT")
+
+  if "${cmd[@]}" >> "$AUTODREAM_LOG_FILE" 2>&1; then
+    log "Auto-dream consolidation completed successfully"
+    # Keep lock mtime at "now" to represent last consolidated timestamp.
+  else
+    local code=$?
+    log "Auto-dream consolidation failed (exit code $code). Rolling back gate timestamp"
+    rollback_consolidation_lock "$CONSOLIDATION_PRIOR_MTIME"
+    return 0
   fi
+}
+
+run_post_session_tasks() {
+  local session_id="$1"
+  local memory_written_during_session="$2"
 
-  release_lock
+  run_extraction_if_needed "$session_id" "$memory_written_during_session"
+  run_autodream_if_needed "$session_id"
 }
 
 # ============================================================================
@@ -317,45 +616,36 @@ TIMESTAMP_FILE=$(mktemp)
 opencode_exit=0
 "$REAL_OPENCODE" "$@" || opencode_exit=$?
 
-# Step 2: Check if extraction is enabled
-if [ "$EXTRACT_ENABLED" = "0" ]; then
+# Step 2: If no maintenance task is enabled, exit early
+if [ "$EXTRACT_ENABLED" = "0" ] && [ "$AUTODREAM_ENABLED" = "0" ]; then
   cleanup_timestamp
   exit $opencode_exit
 fi
 
 # Step 3: Get the most recent session ID
-session_id=$(get_latest_session_id)
-
+session_id=$(get_latest_session_id || true)
 if [ -z "$session_id" ]; then
-  log "No session found, skipping memory extraction"
+  log "No session found, skipping post-session memory maintenance"
   cleanup_timestamp
   exit $opencode_exit
 fi
 
-# Step 3.5: Check if memories were already written during the session
+# Step 4: Check whether main session already wrote memory files
+memory_written_during_session=0
 if has_new_memories; then
-  log "Main agent already wrote memories during session, skipping extraction"
-  cleanup_timestamp
-  exit $opencode_exit
+  memory_written_during_session=1
 fi
 
-# Step 4: Acquire lock (prevent concurrent extractions)
-if ! acquire_lock; then
-  cleanup_timestamp
-  exit $opencode_exit
-fi
+# Timestamp file is no longer needed after the check above.
+cleanup_timestamp
 
-# Step 5: Run extraction
+# Step 5: Run tasks (foreground for debug, background by default)
 if [ "$FOREGROUND" = "1" ]; then
-  # Foreground mode (for debugging)
-  run_extraction "$session_id"
-  cleanup_timestamp
+  run_post_session_tasks "$session_id" "$memory_written_during_session"
 else
-  # Background mode (default) — user isn't blocked
-  run_extraction "$session_id" &
+  run_post_session_tasks "$session_id" "$memory_written_during_session" &
   disown
-  log "Memory extraction started in background (PID $!)"
-  cleanup_timestamp
+  log "Post-session memory maintenance started in background (PID $!)"
 fi
 
 exit $opencode_exit

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-claude-memory",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "type": "module",
   "description": "Claude Code-compatible memory compatibility layer for OpenCode — zero config, local-first, no migration",
   "main": "src/index.ts",