coding-friend-cli 1.17.4 → 1.19.0

package/README.md

@@ -48,8 +48,11 @@ cf host [path]       # Build and serve learning docs at localhost:3333
 cf mcp [path]        # Setup MCP server for LLM integration
                      # [path] is optional, default is `docs/learn`
                      # This prints a JSON config snippet to add to your client's MCP
-cf permission        # Manage Claude Code permission rules for Coding Friend
-cf permission --all  # Apply all recommended permissions without prompts
+cf permission              # Manage Claude Code permission rules (interactive)
+cf permission --all        # Apply all recommended permissions without prompts
+cf permission --user       # Save to user-level settings (~/.claude/settings.json)
+cf permission --project    # Save to project-level settings (.claude/settings.local.json)
+cf permission --all --user # Apply all recommended permissions to user settings
 cf statusline        # Setup coding-friend statusline
 cf update               # Update plugin + CLI + statusline
 cf update --cli         # Update only the CLI (npm package)
@@ -73,8 +76,11 @@ cf memory rm --prune        # Remove orphaned projects (source dir missing or 0
 cf memory start-daemon  # Start memory daemon (enables Tier 2 search)
 cf memory stop-daemon   # Stop memory daemon
 cf memory rebuild    # Rebuild search index from markdown files
-cf memory init       # Initialize SQLite backend (Tier 1) and import memories
+cf memory init       # Initialize memory system (interactive wizard)
+cf memory config     # Configure memory system settings
 cf memory mcp        # Show MCP server config for clients
+cf status            # Show comprehensive Coding Friend status
+                     # (versions, plugin, memory, config)
 cf session save      # Save current Claude Code session to docs/sessions/
 cf session load      # Load a saved session from docs/sessions/
 cf help              # Show all commands

package/dist/chunk-7CAIGH2Y.js

@@ -0,0 +1,365 @@
+import {
+  readJson,
+  writeJson
+} from "./chunk-RWUTFVRB.js";
+
+// src/lib/permissions.ts
+import { homedir } from "os";
+var STATIC_RULES = [
+  // Core Utilities (hooks & infrastructure)
+  {
+    rule: "Bash(cat *)",
+    description: "[read-only] Read file contents \xB7 Used by: session-init hook, skills",
+    category: "Core Utilities",
+    recommended: true
+  },
+  {
+    rule: "Bash(grep *)",
+    description: "[read-only] Search file contents \xB7 Used by: session-init hook, skills",
+    category: "Core Utilities",
+    recommended: true
+  },
+  {
+    rule: "Bash(sed *)",
+    description: "[modify] Text transformation \xB7 Used by: session-init hook",
+    category: "Core Utilities",
+    recommended: true
+  },
+  {
+    rule: "Bash(tr *)",
+    description: "[read-only] Character translation \xB7 Used by: session-init hook",
+    category: "Core Utilities",
+    recommended: true
+  },
+  {
+    rule: "Bash(wc *)",
+    description: "[read-only] Count lines/words \xB7 Used by: cf-verification, skills",
+    category: "Core Utilities",
+    recommended: true
+  },
+  {
+    rule: "Bash(mkdir *)",
+    description: "[write] Create directories \xB7 Used by: docs folder setup, /tmp/coding-friend",
+    category: "Core Utilities",
+    recommended: true
+  },
+  {
+    rule: "Bash(find *)",
+    description: "[read-only] Find files \xB7 Used by: /cf-learn list-learn-files",
+    category: "Core Utilities",
+    recommended: true
+  },
+  {
+    rule: "Bash(ls *)",
+    description: "[read-only] List files \xB7 Used by: statusline hook, session-init hook",
+    category: "Core Utilities",
+    recommended: true
+  },
+  {
+    rule: "Bash(jq *)",
+    description: "[read-only] Parse JSON \xB7 Used by: statusline hook, session-init hook, memory-capture hook",
+    category: "Core Utilities",
+    recommended: true
+  },
+  {
+    rule: "Bash(date *)",
+    description: "[read-only] Format timestamps \xB7 Used by: statusline hook",
+    category: "Core Utilities",
+    recommended: true
+  },
+  {
+    rule: "Bash(pwd)",
+    description: "[read-only] Get current directory \xB7 Used by: session-init hook, /cf-learn",
+    category: "Core Utilities",
+    recommended: true
+  },
+  {
+    rule: "Bash(stat *)",
+    description: "[read-only] File stats \xB7 Used by: statusline hook cache check",
+    category: "Core Utilities",
+    recommended: true
+  },
+  {
+    rule: "Bash(node -e *)",
+    description: "[execute] Run inline Node.js \xB7 Used by: memory-capture hook JSON parsing",
+    category: "Core Utilities",
+    recommended: true
+  },
+  {
+    rule: "Bash(touch /tmp/coding-friend/*)",
+    description: "[write] Create temp marker files \xB7 Used by: /cf-review mark-reviewed",
+    category: "Core Utilities",
+    recommended: true
+  },
+  // Git Operations
+  {
+    rule: "Bash(git status *)",
+    description: "[read-only] Check working tree status \xB7 Used by: /cf-commit, /cf-review, cf-verification",
+    category: "Git",
+    recommended: true
+  },
+  {
+    rule: "Bash(git diff *)",
+    description: "[read-only] View file changes \xB7 Used by: /cf-commit, /cf-review, cf-verification",
+    category: "Git",
+    recommended: true
+  },
+  {
+    rule: "Bash(git log *)",
+    description: "[read-only] View commit history \xB7 Used by: /cf-commit, /cf-review, cf-sys-debug",
+    category: "Git",
+    recommended: true
+  },
+  {
+    rule: "Bash(git branch *)",
+    description: "[read-only] List/manage branches \xB7 Used by: /cf-ship, cf-sys-debug",
+    category: "Git",
+    recommended: true
+  },
+  {
+    rule: "Bash(git rev-parse *)",
+    description: "[read-only] Check git repo state \xB7 Used by: hooks, /cf-commit",
+    category: "Git",
+    recommended: true
+  },
+  {
+    rule: "Bash(git add *)",
+    description: "[modify] Stage files for commit \xB7 Used by: /cf-commit, /cf-ship",
+    category: "Git",
+    recommended: true
+  },
+  {
+    rule: "Bash(git reset HEAD *)",
+    description: "[modify] Unstage files \xB7 Used by: /cf-commit",
+    category: "Git",
+    recommended: true
+  },
+  {
+    rule: "Bash(git commit *)",
+    description: "[modify] Create commits \xB7 Used by: /cf-commit, /cf-ship",
+    category: "Git",
+    recommended: true
+  },
+  {
+    rule: "Bash(git push *)",
+    description: "[remote] Push commits to remote \xB7 Used by: /cf-ship",
+    category: "Git",
+    recommended: true
+  },
+  {
+    rule: "Bash(git pull *)",
+    description: "[remote] Pull changes from remote \xB7 Used by: /cf-ship",
+    category: "Git",
+    recommended: true
+  },
+  // GitHub CLI
+  {
+    rule: "Bash(gh pr *)",
+    description: "[remote] Manage GitHub pull requests \xB7 Used by: /cf-ship",
+    category: "GitHub CLI",
+    recommended: true
+  },
+  // Testing & Build
+  {
+    rule: "Bash(npm test *)",
+    description: "[execute] Run test suites \xB7 Used by: cf-verification, /cf-fix, cf-tdd",
+    category: "Testing & Build",
+    recommended: true
+  },
+  {
+    rule: "Bash(npm run *)",
+    description: "[execute] Run npm scripts (build, lint, format) \xB7 Used by: cf-verification, /cf-commit",
+    category: "Testing & Build",
+    recommended: true
+  },
+  {
+    rule: "Bash(npx *)",
+    description: "[execute] Run npx commands (eslint, tsc) \xB7 Used by: cf-verification",
+    category: "Testing & Build",
+    recommended: true
+  },
+  // MCP Memory Tools
+  {
+    rule: "mcp__coding-friend-memory__memory_search",
+    description: "[read-only] Search project memories \xB7 Used by: cf-explorer agent, all skills",
+    category: "MCP Memory",
+    recommended: true
+  },
+  {
+    rule: "mcp__coding-friend-memory__memory_list",
+    description: "[read-only] List all memories \xB7 Used by: /cf-scan",
+    category: "MCP Memory",
+    recommended: true
+  },
+  {
+    rule: "mcp__coding-friend-memory__memory_retrieve",
+    description: "[read-only] Get a specific memory by ID \xB7 Used by: skills",
+    category: "MCP Memory",
+    recommended: true
+  },
+  {
+    rule: "mcp__coding-friend-memory__memory_store",
+    description: "[write] Create new memory \xB7 Used by: /cf-remember, /cf-scan, /cf-ask",
+    category: "MCP Memory",
+    recommended: true
+  },
+  {
+    rule: "mcp__coding-friend-memory__memory_update",
+    description: "[modify] Update existing memory \xB7 Used by: /cf-remember, /cf-scan",
+    category: "MCP Memory",
+    recommended: true
+  },
+  {
+    rule: "mcp__coding-friend-memory__memory_delete",
+    description: "[modify] Delete a memory \xB7 Used by: /cf-scan",
+    category: "MCP Memory",
+    recommended: true
+  },
+  // Web & Research
+  {
+    rule: "WebSearch",
+    description: "[network] Perform web searches \xB7 Used by: /cf-research",
+    category: "Web & Research",
+    recommended: false
+  },
+  {
+    rule: "WebFetch(domain:*)",
+    description: "[network] Fetch content from web pages \xB7 Used by: /cf-research",
+    category: "Web & Research",
+    recommended: false
+  }
+];
+var PLUGIN_CACHE_TILDE = "~/.claude/plugins/cache/coding-friend-marketplace/coding-friend";
+function buildPluginScriptRules() {
+  const absBase = `${homedir()}/.claude/plugins/cache/coding-friend-marketplace/coding-friend`;
+  return [
+    {
+      rule: `Bash(bash ${absBase}/*)`,
+      description: "[execute] Run Coding Friend plugin scripts (unquoted) \xB7 Used by: all skills",
+      category: "Plugin Scripts",
+      recommended: true
+    },
+    {
+      rule: `Bash(bash "${absBase}/*)`,
+      description: "[execute] Run Coding Friend plugin scripts (quoted) \xB7 Used by: all skills",
+      category: "Plugin Scripts",
+      recommended: true
+    },
+    {
+      rule: `Read(${PLUGIN_CACHE_TILDE}/**)`,
+      description: "[read-only] Read plugin files \xB7 Used by: hooks, agents",
+      category: "Plugin Scripts",
+      recommended: true
+    },
+    {
+      rule: "Read(~/.coding-friend/**)",
+      description: "[read-only] Read user global config \xB7 Used by: session-init hook, /cf-learn",
+      category: "Plugin Scripts",
+      recommended: true
+    }
+  ];
+}
+function getAllRules() {
+  return [...STATIC_RULES, ...buildPluginScriptRules()];
+}
+var PERMISSION_RULES = getAllRules();
+function getExistingRules(settingsPath) {
+  const settings = readJson(settingsPath);
+  if (!settings) return [];
+  const permissions = settings.permissions;
+  return permissions?.allow ?? [];
+}
+function getMissingRules(existing, rules) {
+  return rules.filter((r) => !existing.includes(r.rule));
+}
+function buildLearnDirRules(learnPath, autoCommit) {
+  const rules = [
+    {
+      rule: `Read(${learnPath}/**)`,
+      description: "[read-only] Read learning docs \xB7 Used by: /cf-learn",
+      category: "External Learn Directory",
+      recommended: true
+    },
+    {
+      rule: `Edit(${learnPath}/**)`,
+      description: "[modify] Edit learning docs \xB7 Used by: /cf-learn",
+      category: "External Learn Directory",
+      recommended: true
+    },
+    {
+      rule: `Write(${learnPath}/**)`,
+      description: "[write] Write learning docs \xB7 Used by: /cf-learn",
+      category: "External Learn Directory",
+      recommended: true
+    }
+  ];
+  if (autoCommit) {
+    const quoted = learnPath.includes(" ") ? `"${learnPath}"` : learnPath;
+    rules.push({
+      rule: `Bash(cd ${quoted} && git add *)`,
+      description: "[modify] Stage learning docs for commit \xB7 Used by: /cf-learn auto-commit",
+      category: "External Learn Directory",
+      recommended: true
+    });
+    rules.push({
+      rule: `Bash(cd ${quoted} && git commit *)`,
+      description: "[modify] Commit learning docs \xB7 Used by: /cf-learn auto-commit",
+      category: "External Learn Directory",
+      recommended: true
+    });
+  }
+  return rules;
+}
+function applyPermissions(settingsPath, toAdd, toRemove) {
+  const settings = readJson(settingsPath) ?? {};
+  const permissions = settings.permissions ?? {};
+  const existing = permissions.allow ?? [];
+  const afterRemove = existing.filter((r) => !toRemove.includes(r));
+  const afterAdd = [
+    ...afterRemove,
+    ...toAdd.filter((r) => !afterRemove.includes(r))
+  ];
+  permissions.allow = afterAdd;
+  settings.permissions = permissions;
+  writeJson(settingsPath, settings);
+}
+function groupByCategory(rules) {
+  const groups = /* @__PURE__ */ new Map();
+  for (const rule of rules) {
+    const list = groups.get(rule.category) ?? [];
+    list.push(rule);
+    groups.set(rule.category, list);
+  }
+  return groups;
+}
+var OLD_PLUGIN_PATH_PATTERN = "/.claude/plugins/cache/coding-friend-marketplace/coding-friend/";
+function cleanupStalePluginRules(settingsPath) {
+  const existing = getExistingRules(settingsPath);
+  const currentRules = new Set(getAllRules().map((r) => r.rule));
+  const stale = existing.filter(
+    (r) => r.includes(OLD_PLUGIN_PATH_PATTERN) && !currentRules.has(r)
+  );
+  if (stale.length === 0) return 0;
+  applyPermissions(settingsPath, [], stale);
+  return stale.length;
+}
+function logPluginScriptWarning(log, chalk) {
+  log.warn(
+    `Plugin script rules use ${chalk.bold("wide patterns")} that allow executing any script in the Coding Friend plugin cache.`
+  );
+  log.dim(
+    "This is scoped to Coding Friend only and survives plugin updates automatically."
+  );
+}
+
+export {
+  STATIC_RULES,
+  getAllRules,
+  getExistingRules,
+  getMissingRules,
+  buildLearnDirRules,
+  applyPermissions,
+  groupByCategory,
+  cleanupStalePluginRules,
+  logPluginScriptWarning
+};

package/dist/{chunk-UWQPMVJY.js → chunk-IRPW2BMP.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-ORACWEDN.js";
 import {
   ensureShellCompletion
-} from "./chunk-DVMWMXDZ.js";
+} from "./chunk-NEQZP5D4.js";
 import {
   resolveScope
 } from "./chunk-C5LYVVEI.js";
@@ -255,6 +255,8 @@ async function updateCommand(opts) {
 
 export {
   semverCompare,
+  getCliVersion,
+  getLatestCliVersion,
   getLatestVersion,
   updateCommand
 };

package/dist/{chunk-YC6MBHCT.js → chunk-JFGLNTZI.js}

@@ -66,6 +66,18 @@ function enableMarketplaceAutoUpdate() {
     return false;
   }
 }
+function detectPluginScope() {
+  const scopeOrder = ["local", "project", "user"];
+  for (const scope of scopeOrder) {
+    const settings = readJson(
+      settingsPathForScope(scope)
+    );
+    if (!settings) continue;
+    const enabled = settings.enabledPlugins;
+    if (enabled && PLUGIN_ID in enabled) return scope;
+  }
+  return "user";
+}
 function setPluginEnabled(scope, enabled) {
   const filePath = settingsPathForScope(scope);
   const settings = readJson(filePath) ?? {};
@@ -89,5 +101,6 @@ export {
   isMarketplaceRegistered,
   isPluginDisabled,
   enableMarketplaceAutoUpdate,
+  detectPluginScope,
   setPluginEnabled
 };

package/dist/{chunk-DVMWMXDZ.js → chunk-NEQZP5D4.js}

@@ -21,7 +21,7 @@ ${MARKER_START}
 _cf_completions() {
   local cur="\${COMP_WORDS[COMP_CWORD]}"
   local prev="\${COMP_WORDS[COMP_CWORD-1]}"
-  local commands="install uninstall disable enable init config host mcp memory permission statusline update dev session"
+  local commands="install uninstall disable enable init config host mcp memory permission statusline update status dev session"
   local scope_flags="--user --global --project --local"
   local update_flags="--cli --plugin --statusline --user --global --project --local"
 
@@ -33,7 +33,7 @@ _cf_completions() {
 
   # Subcommands for 'memory'
   if [[ "\${COMP_WORDS[1]}" == "memory" && \${COMP_CWORD} -eq 2 ]]; then
-    COMPREPLY=($(compgen -W "status search list rm init start-daemon stop-daemon rebuild mcp" -- "$cur"))
+    COMPREPLY=($(compgen -W "status search list rm init config start-daemon stop-daemon rebuild mcp" -- "$cur"))
     return
   fi
 
@@ -61,6 +61,12 @@ _cf_completions() {
     return
   fi
 
+  # Flag completion for permission
+  if [[ "\${COMP_WORDS[1]}" == "permission" && "$cur" == -* ]]; then
+    COMPREPLY=($(compgen -W "--all --user --project" -- "$cur"))
+    return
+  fi
+
   COMPREPLY=($(compgen -W "$commands" -- "$cur"))
 }
 complete -o default -F _cf_completions cf
@@ -82,6 +88,7 @@ var ZSH_FUNCTION_BODY = `_cf() {
     'statusline:Setup coding-friend statusline in Claude Code'
     'update:Update coding-friend plugin and refresh statusline'
     'dev:Switch between local and remote plugin for development'
+    'status:Show comprehensive Coding Friend status'
     'session:Save and load Claude Code sessions across machines'
   )
 
@@ -110,6 +117,14 @@ var ZSH_FUNCTION_BODY = `_cf() {
     _values 'flags' $scope_flags
   elif (( CURRENT >= 3 )) && [[ "\${words[2]}" == "update" ]]; then
     _values 'flags' $update_flags
+  elif (( CURRENT >= 3 )) && [[ "\${words[2]}" == "permission" ]]; then
+    local -a permission_flags
+    permission_flags=(
+      '--all[Apply all recommended permissions without prompts]'
+      '--user[Save to user-level settings]'
+      '--project[Save to project-level settings]'
+    )
+    _values 'flags' $permission_flags
   elif (( CURRENT == 3 )) && [[ "\${words[2]}" == "dev" ]]; then
     local -a subcommands
     subcommands=(
@@ -128,7 +143,8 @@ var ZSH_FUNCTION_BODY = `_cf() {
       'search:Search memories by query'
       'list:List memories (--projects for all DBs)'
       'rm:Remove a project database'
-      'init:Initialize Tier 1 (SQLite + Hybrid Search)'
+      'init:Initialize memory system (interactive wizard)'
+      'config:Configure memory system settings'
       'start-daemon:Start the memory daemon (Tier 2)'
       'stop-daemon:Stop the memory daemon'
       'rebuild:Rebuild the daemon search index'
@@ -171,6 +187,7 @@ complete -c cf -n "__fish_use_subcommand" -a permission -d "Manage Claude Code p
 complete -c cf -n "__fish_use_subcommand" -a statusline -d "Setup coding-friend statusline in Claude Code"
 complete -c cf -n "__fish_use_subcommand" -a update -d "Update coding-friend plugin and refresh statusline"
 complete -c cf -n "__fish_use_subcommand" -a dev -d "Switch between local and remote plugin for development"
+complete -c cf -n "__fish_use_subcommand" -a status -d "Show comprehensive Coding Friend status"
 complete -c cf -n "__fish_use_subcommand" -a session -d "Save and load Claude Code sessions across machines"
 # Scope flags for install/uninstall/disable/enable
 complete -c cf -n "__fish_seen_subcommand_from install uninstall disable enable" -l user -d "User scope (all projects)"
@@ -185,6 +202,10 @@ complete -c cf -n "__fish_seen_subcommand_from update" -l user -d "User scope (a
 complete -c cf -n "__fish_seen_subcommand_from update" -l global -d "User scope (all projects)"
 complete -c cf -n "__fish_seen_subcommand_from update" -l project -d "Project scope"
 complete -c cf -n "__fish_seen_subcommand_from update" -l local -d "Local scope"
+# Flags for permission
+complete -c cf -n "__fish_seen_subcommand_from permission" -l all -d "Apply all recommended permissions"
+complete -c cf -n "__fish_seen_subcommand_from permission" -l user -d "Save to user-level settings"
+complete -c cf -n "__fish_seen_subcommand_from permission" -l project -d "Save to project-level settings"
 # Dev subcommands
 complete -c cf -n "__fish_seen_subcommand_from dev" -a on -d "Switch to local plugin source"
 complete -c cf -n "__fish_seen_subcommand_from dev" -a off -d "Switch back to remote marketplace"
@@ -197,7 +218,8 @@ complete -c cf -n "__fish_seen_subcommand_from memory" -a status -d "Show memory
 complete -c cf -n "__fish_seen_subcommand_from memory" -a search -d "Search memories by query"
 complete -c cf -n "__fish_seen_subcommand_from memory" -a list -d "List memories (--projects for all DBs)"
 complete -c cf -n "__fish_seen_subcommand_from memory" -a rm -d "Remove a project database"
-complete -c cf -n "__fish_seen_subcommand_from memory" -a init -d "Initialize Tier 1 (SQLite + Hybrid Search)"
+complete -c cf -n "__fish_seen_subcommand_from memory" -a init -d "Initialize memory system (interactive wizard)"
+complete -c cf -n "__fish_seen_subcommand_from memory" -a config -d "Configure memory system settings"
 complete -c cf -n "__fish_seen_subcommand_from memory" -a start-daemon -d "Start the memory daemon (Tier 2)"
 complete -c cf -n "__fish_seen_subcommand_from memory" -a stop-daemon -d "Stop the memory daemon"
 complete -c cf -n "__fish_seen_subcommand_from memory" -a rebuild -d "Rebuild the daemon search index"
@@ -211,9 +233,9 @@ var POWERSHELL_BLOCK = `
 ${MARKER_START}
 Register-ArgumentCompleter -Native -CommandName cf -ScriptBlock {
   param($wordToComplete, $commandAst, $cursorPosition)
-  $commands = @('install','uninstall','disable','enable','init','config','host','mcp','memory','permission','statusline','update','dev','session')
+  $commands = @('install','uninstall','disable','enable','init','config','host','mcp','memory','permission','statusline','update','status','dev','session')
   $devSubcommands = @('on','off','status','restart','sync','update')
-  $memorySubcommands = @('status','search','list','rm','init','start-daemon','stop-daemon','rebuild','mcp')
+  $memorySubcommands = @('status','search','list','rm','init','config','start-daemon','stop-daemon','rebuild','mcp')
   $sessionSubcommands = @('save','load')
   $scopeFlags = @('--user','--global','--project','--local')
   $updateFlags = @('--cli','--plugin','--statusline','--user','--global','--project','--local')
@@ -230,6 +252,9 @@ Register-ArgumentCompleter -Native -CommandName cf -ScriptBlock {
   } elseif ($words.Count -ge 2 -and ($words[1].ToString() -eq 'install' -or $words[1].ToString() -eq 'uninstall' -or $words[1].ToString() -eq 'disable' -or $words[1].ToString() -eq 'enable')) {
     $scopeFlags | Where-Object { $_ -like "$wordToComplete*" } |
       ForEach-Object { [System.Management.Automation.CompletionResult]::new($_, $_, 'ParameterValue', $_) }
+  } elseif ($words.Count -ge 2 -and $words[1].ToString() -eq 'permission') {
+    @('--all','--user','--project') | Where-Object { $_ -like "$wordToComplete*" } |
+      ForEach-Object { [System.Management.Automation.CompletionResult]::new($_, $_, 'ParameterValue', $_) }
   } elseif ($words.Count -ge 2 -and $words[1].ToString() -eq 'update') {
     $updateFlags | Where-Object { $_ -like "$wordToComplete*" } |
       ForEach-Object { [System.Management.Automation.CompletionResult]::new($_, $_, 'ParameterValue', $_) }

package/dist/{chunk-KTX4MGMR.js → chunk-QMD7P67N.js}

@@ -9,10 +9,33 @@ import {
 } from "./chunk-RWUTFVRB.js";
 
 // src/lib/config.ts
+function deepMerge(base, override) {
+  const result = { ...base };
+  for (const key of Object.keys(override)) {
+    const baseVal = result[key];
+    const overVal = override[key];
+    if (baseVal && overVal && typeof baseVal === "object" && typeof overVal === "object" && !Array.isArray(baseVal) && !Array.isArray(overVal)) {
+      result[key] = deepMerge(
+        baseVal,
+        overVal
+      );
+    } else {
+      result[key] = overVal;
+    }
+  }
+  return result;
+}
 function loadConfig() {
   const global = readJson(globalConfigPath());
   const local = readJson(localConfigPath());
-  return { ...DEFAULT_CONFIG, ...global, ...local };
+  const base = deepMerge(
+    DEFAULT_CONFIG,
+    global ?? {}
+  );
+  return deepMerge(
+    base,
+    local ?? {}
+  );
 }
 function resolveDocsDir(explicitPath) {
   if (explicitPath) {
@@ -33,9 +56,6 @@ function resolveMemoryDir(explicitPath) {
     return resolvePath(explicitPath);
   }
   const config = loadConfig();
-  if (config.memory?.docsDir) {
-    return resolvePath(config.memory.docsDir);
-  }
   if (config.docsDir) {
     return resolvePath(`${config.docsDir}/memory`);
   }