diff --git a/docs/public/architecture/pm2-to-bun-migration.mdx b/docs/public/architecture/pm2-to-bun-migration.mdx
index d026cd7e..e9b2db84 100644
--- a/docs/public/architecture/pm2-to-bun-migration.mdx
+++ b/docs/public/architecture/pm2-to-bun-migration.mdx
@@ -106,7 +106,7 @@ pm2 logs claude-mem-worker    # View logs
 ```bash
 npm run worker:start    # Start worker
 npm run worker:stop     # Stop worker
-claude-mem restart  # Restart worker
+npm run worker:restart  # Restart worker
 npm run worker:status   # Check status
 npm run worker:logs     # View logs
 ```
@@ -305,7 +305,7 @@ No migration logic runs on subsequent sessions.
 | `pm2 list` | `npm run worker:status` | Shows worker status |
 | `pm2 start <script>` | `npm run worker:start` | Start worker |
 | `pm2 stop claude-mem-worker` | `npm run worker:stop` | Stop worker |
-| `pm2 restart claude-mem-worker` | `claude-mem restart` | Restart worker |
+| `pm2 restart claude-mem-worker` | `npm run worker:restart` | Restart worker |
 | `pm2 delete claude-mem-worker` | `npm run worker:stop` | Remove worker |
 | `pm2 logs claude-mem-worker` | `npm run worker:logs` | View logs |
 | `pm2 describe claude-mem-worker` | `npm run worker:status` | Detailed status |
@@ -451,7 +451,7 @@ pm2 save  # Persist the deletion
 rm ~/.claude-mem/.pm2-migrated
 
 # Restart worker
-claude-mem restart
+npm run worker:restart
 ```
 
 ### Scenario 2: Stale PID File (Process Dead)
@@ -483,7 +483,7 @@ lsof -i :37777
 kill -9 <PID>
 
 # Restart worker
-claude-mem restart
+npm run worker:restart
 ```
 
 ### Common Error Messages
diff --git a/docs/public/architecture/search-architecture.mdx b/docs/public/architecture/search-architecture.mdx
index a36fc08a..b3314e99 100644
--- a/docs/public/architecture/search-architecture.mdx
+++ b/docs/public/architecture/search-architecture.mdx
@@ -416,7 +416,7 @@ If searches fail, check worker service:
 
 ```bash
 npm run worker:status       # Check status
-claude-mem restart      # Restart worker
+npm run worker:restart      # Restart worker
 npm run worker:logs         # View logs
 ```
 
diff --git a/docs/public/architecture/worker-service.mdx b/docs/public/architecture/worker-service.mdx
index df54e3c3..49c7ca17 100644
--- a/docs/public/architecture/worker-service.mdx
+++ b/docs/public/architecture/worker-service.mdx
@@ -597,7 +597,7 @@ npm run worker:start
 npm run worker:stop
 
 # Restart worker
-claude-mem restart
+npm run worker:restart
 
 # View logs
 npm run worker:logs
diff --git a/docs/public/configuration.mdx b/docs/public/configuration.mdx
index 1e906c29..232bf7cd 100644
--- a/docs/public/configuration.mdx
+++ b/docs/public/configuration.mdx
@@ -358,7 +358,7 @@ Edit `~/.claude-mem/settings.json`:
 
 Then restart the worker:
 ```bash
-claude-mem restart
+npm run worker:restart
 ```
 
 ### Custom Model
@@ -373,7 +373,7 @@ Edit `~/.claude-mem/settings.json`:
 Then restart the worker:
 ```bash
 export CLAUDE_MEM_MODEL=opus
-claude-mem restart
+npm run worker:restart
 ```
 
 ### Custom Skip Tools
@@ -430,7 +430,7 @@ Enable debug logging:
 
 ```bash
 export DEBUG=claude-mem:*
-claude-mem restart
+npm run worker:restart
 npm run worker:logs
 ```
 
@@ -448,7 +448,7 @@ npm run worker:logs
 
 1. Restart worker after changes:
    ```bash
-   claude-mem restart
+   npm run worker:restart
    ```
 
 2. Verify environment variables:
@@ -482,7 +482,7 @@ If port 37777 is already in use:
 
 2. Restart worker:
    ```bash
-   claude-mem restart
+   npm run worker:restart
    ```
 
 3. Verify new port:
diff --git a/docs/public/development.mdx b/docs/public/development.mdx
index b0f09742..03546bd1 100644
--- a/docs/public/development.mdx
+++ b/docs/public/development.mdx
@@ -165,7 +165,7 @@ npm run build
 1. Make changes to React components in `src/ui/viewer/`
 2. Build: `npm run build`
 3. Sync to installed plugin: `npm run sync-marketplace`
-4. Restart worker: `claude-mem restart`
+4. Restart worker: `npm run worker:restart`
 5. Refresh browser at http://localhost:37777
 
 **Hot Reload**: Not currently supported. Full rebuild + restart required for changes.
@@ -395,7 +395,7 @@ When developing new features:
    ```bash
    npm run build
    npm run sync-marketplace
-   claude-mem restart
+   npm run worker:restart
    ```
 
 2. **Test in real session**:
@@ -560,7 +560,7 @@ export async function createObservation(
 
 ```bash
 export DEBUG=claude-mem:*
-claude-mem restart
+npm run worker:restart
 npm run worker:logs
 ```
 
diff --git a/docs/public/endless-mode.mdx b/docs/public/endless-mode.mdx
index 744f6df8..e0ccf6ed 100644
--- a/docs/public/endless-mode.mdx
+++ b/docs/public/endless-mode.mdx
@@ -94,7 +94,7 @@ git checkout beta/endless-mode
 npm install
 
 # Restart the worker
-claude-mem restart
+npm run worker:restart
 ```
 
 **To return to stable:**
@@ -103,7 +103,7 @@ claude-mem restart
 cd ~/.claude/plugins/marketplaces/thedotmack/
 git checkout main
 npm install
-claude-mem restart
+npm run worker:restart
 ```
 
 ## Summary
diff --git a/docs/public/hooks-architecture.mdx b/docs/public/hooks-architecture.mdx
index 4d025230..9f81b773 100644
--- a/docs/public/hooks-architecture.mdx
+++ b/docs/public/hooks-architecture.mdx
@@ -534,7 +534,7 @@ npm run worker:status
 npm run worker:logs
 
 # Restart
-claude-mem restart
+npm run worker:restart
 
 # Stop
 npm run worker:stop
diff --git a/docs/public/platform-integration.mdx b/docs/public/platform-integration.mdx
index a9de9742..db17de99 100644
--- a/docs/public/platform-integration.mdx
+++ b/docs/public/platform-integration.mdx
@@ -57,7 +57,7 @@ CLAUDE_MEM_PYTHON_VERSION=3.13              # Python version for chroma-mcp
 ```bash
 npm run build                 # Compile TypeScript (hooks + worker)
 npm run sync-marketplace      # Copy to ~/.claude/plugins
-claude-mem restart        # Restart worker
+npm run worker:restart        # Restart worker
 npm run worker:logs           # View worker logs
 npm run worker:status         # Check worker status
 ```
diff --git a/docs/public/troubleshooting.mdx b/docs/public/troubleshooting.mdx
index 60d2a6a4..51e7c7d7 100644
--- a/docs/public/troubleshooting.mdx
+++ b/docs/public/troubleshooting.mdx
@@ -48,14 +48,14 @@ The skill includes comprehensive diagnostics, automated repair sequences, and de
 
 4. Restart worker service:
    ```bash
-   claude-mem restart
+   npm run worker:restart
    ```
 
 5. Check for port conflicts:
    ```bash
    # If port 37777 is in use by another service
    export CLAUDE_MEM_WORKER_PORT=38000
-   claude-mem restart
+   npm run worker:restart
    ```
 
 ### Theme Toggle Not Persisting
@@ -110,7 +110,7 @@ The skill includes comprehensive diagnostics, automated repair sequences, and de
 
 5. Restart worker and refresh browser:
    ```bash
-   claude-mem restart
+   npm run worker:restart
    ```
 
 ### Chroma/Python Dependency Issues (v5.0.0+)
@@ -225,7 +225,7 @@ The skill includes comprehensive diagnostics, automated repair sequences, and de
 3. Or use a different port:
    ```bash
    export CLAUDE_MEM_WORKER_PORT=38000
-   claude-mem restart
+   npm run worker:restart
    ```
 
 4. Verify new port:
@@ -282,7 +282,7 @@ The skill includes comprehensive diagnostics, automated repair sequences, and de
 
 4. Restart worker:
    ```bash
-   claude-mem restart
+   npm run worker:restart
    ```
 
 ### Manual Recovery for Stuck Observations
@@ -839,7 +839,7 @@ sqlite3 ~/.claude-mem/claude-mem.db "
 
 2. Restart worker:
    ```bash
-   claude-mem restart
+   npm run worker:restart
    ```
 
 3. Clean up old data (see "Database Too Large" above)
@@ -916,7 +916,7 @@ sqlite3 ~/.claude-mem/claude-mem.db "
 
 ```bash
 export DEBUG=claude-mem:*
-claude-mem restart
+npm run worker:restart
 npm run worker:logs
 ```
 
@@ -976,7 +976,7 @@ SELECT created_at, tool_name FROM observations ORDER BY created_at DESC LIMIT 10
 
 **Cause**: Worker not running or port mismatch.
 
-**Solution**: Restart worker with `claude-mem restart`.
+**Solution**: Restart worker with `npm run worker:restart`.
 
 ### "Database is locked"
 
diff --git a/docs/public/usage/getting-started.mdx b/docs/public/usage/getting-started.mdx
index c3e0ac12..9985fd1a 100644
--- a/docs/public/usage/getting-started.mdx
+++ b/docs/public/usage/getting-started.mdx
@@ -86,7 +86,7 @@ npm run worker:start
 npm run worker:stop
 
 # Restart worker service
-claude-mem restart
+npm run worker:restart
 
 # View worker logs
 npm run worker:logs
diff --git a/docs/public/usage/manual-recovery.mdx b/docs/public/usage/manual-recovery.mdx
index 842f7299..77e50235 100644
--- a/docs/public/usage/manual-recovery.mdx
+++ b/docs/public/usage/manual-recovery.mdx
@@ -258,7 +258,7 @@ sqlite3 ~/.claude-mem/claude-mem.db "
 
 3. **Restart worker**:
    ```bash
-   claude-mem restart
+   npm run worker:restart
    ```
 
 4. **Check database integrity**:
@@ -308,7 +308,7 @@ bun scripts/check-pending-queue.ts --process
 4. **Increase worker memory** (if using custom runner):
    ```bash
    export NODE_OPTIONS="--max-old-space-size=4096"
-   claude-mem restart
+   npm run worker:restart
    ```
 
 ## Advanced Usage
diff --git a/docs/public/usage/private-tags.mdx b/docs/public/usage/private-tags.mdx
index b6a30778..aacfc518 100644
--- a/docs/public/usage/private-tags.mdx
+++ b/docs/public/usage/private-tags.mdx
@@ -176,7 +176,7 @@ This design ensures that private content never reaches the database, search indi
 1. Verify correct syntax: `<private>content</private>`
 2. Check `~/.claude-mem/silent.log` for errors
 3. Ensure worker is running: `npm run worker:status`
-4. Restart worker: `claude-mem restart`
+4. Restart worker: `npm run worker:restart`
 
 ### Partial Content Stored
 
diff --git a/docs/public/usage/search-tools.mdx b/docs/public/usage/search-tools.mdx
index 82e21fba..32343138 100644
--- a/docs/public/usage/search-tools.mdx
+++ b/docs/public/usage/search-tools.mdx
@@ -364,7 +364,7 @@ If search isn't working, check the worker service:
 
 ```bash
 npm run worker:status       # Check worker status
-claude-mem restart      # Restart if needed
+npm run worker:restart      # Restart if needed
 npm run worker:logs         # View logs
 ```
 
diff --git a/plugin/scripts/context-hook.js b/plugin/scripts/context-hook.js
index 3f4da415..01eb0a7d 100755
--- a/plugin/scripts/context-hook.js
+++ b/plugin/scripts/context-hook.js
@@ -6,7 +6,7 @@ ${t.stack}`:t.message;if(Array.isArray(t))return`[${t.length} items]`;let r=Obje
 
 `;return E+=`To restart the worker:
 `,E+=`1. Exit Claude Code completely
-`,E+=`2. Run: claude-mem restart
+`,E+=`2. Run: npm run worker:restart
 `,E+="3. Restart Claude Code",r&&(E+=`
 
 If that doesn't work, try: /troubleshoot`),n&&(E=`Worker Error: ${n}
diff --git a/plugin/scripts/mcp-server.cjs b/plugin/scripts/mcp-server.cjs
index 8851d5ff..825bfd9b 100755
--- a/plugin/scripts/mcp-server.cjs
+++ b/plugin/scripts/mcp-server.cjs
@@ -8,7 +8,7 @@ ${e.stack}`:e.message;if(Array.isArray(e))return`[${e.length} items]`;let t=Obje
 
 Available tools: ${Object.keys(cs).join(", ")}`}],isError:!0};let t=cs[e];return{content:[{type:"text",text:`# ${e} Parameters
 
-${JSON.stringify(t,null,2)}`}]}}},{name:"search",description:'Search memory. All parameters optional - call get_schema("search") for details',inputSchema:{type:"object",properties:{},additionalProperties:!0},handler:async a=>{let e=bt.search;return await Pt(e,a)}},{name:"timeline",description:'Timeline context. All parameters optional - call get_schema("timeline") for details',inputSchema:{type:"object",properties:{},additionalProperties:!0},handler:async a=>{let e=bt.timeline;return await Pt(e,a)}},{name:"get_recent_context",description:'Recent context. All parameters optional - call get_schema("get_recent_context") for details',inputSchema:{type:"object",properties:{},additionalProperties:!0},handler:async a=>{let e=bt.get_recent_context;return await Pt(e,a)}},{name:"get_context_timeline",description:"Timeline around observation ID",inputSchema:{type:"object",properties:{anchor:{type:"number",description:'Observation ID (required). Optional params: get_schema("get_context_timeline")'}},required:["anchor"],additionalProperties:!0},handler:async a=>{let e=bt.get_context_timeline;return await Pt(e,a)}},{name:"help",description:'Get detailed docs. All parameters optional - call get_schema("help") for details',inputSchema:{type:"object",properties:{},additionalProperties:!0},handler:async a=>{let e=bt.help;return await Pt(e,a)}},{name:"get_observation",description:"Fetch observation by ID",inputSchema:{type:"object",properties:{id:{type:"number",description:"Observation ID (required)"}},required:["id"]},handler:async a=>await us("/api/observation",a.id)},{name:"get_observations",description:"Batch fetch observations",inputSchema:{type:"object",properties:{ids:{type:"array",items:{type:"number"},description:'Array of observation IDs (required). Optional params: get_schema("get_observations")'}},required:["ids"],additionalProperties:!0},handler:async a=>await Td("/api/observations/batch",a)},{name:"get_session",description:"Fetch session by ID",inputSchema:{type:"object",properties:{id:{type:"number",description:"Session ID (required)"}},required:["id"]},handler:async a=>await us("/api/session",a.id)},{name:"get_prompt",description:"Fetch prompt by ID",inputSchema:{type:"object",properties:{id:{type:"number",description:"Prompt ID (required)"}},required:["id"]},handler:async a=>await us("/api/prompt",a.id)}],ds=new ia({name:"mem-search-server",version:"1.0.0"},{capabilities:{tools:{}}});ds.setRequestHandler(Ia,async()=>({tools:ho.map(a=>({name:a.name,description:a.description,inputSchema:a.inputSchema}))}));ds.setRequestHandler(Aa,async a=>{let e=ho.find(t=>t.name===a.params.name);if(!e)throw new Error(`Unknown tool: ${a.params.name}`);try{return await e.handler(a.params.arguments||{})}catch(t){return{content:[{type:"text",text:`Tool execution failed: ${t.message}`}],isError:!0}}});async function po(){me.info("SYSTEM","MCP server shutting down"),process.exit(0)}process.on("SIGTERM",po);process.on("SIGINT",po);async function Ad(){let a=new la;await ds.connect(a),me.info("SYSTEM","Claude-mem search server started"),setTimeout(async()=>{await Id()?me.info("SYSTEM","Worker available",void 0,{workerUrl:it}):(me.warn("SYSTEM","Worker not available",void 0,{workerUrl:it}),me.warn("SYSTEM","Tools will fail until Worker is started"),me.warn("SYSTEM","Start Worker with: claude-mem restart"))},0)}Ad().catch(a=>{me.error("SYSTEM","Fatal error",void 0,a),process.exit(1)});
+${JSON.stringify(t,null,2)}`}]}}},{name:"search",description:'Search memory. All parameters optional - call get_schema("search") for details',inputSchema:{type:"object",properties:{},additionalProperties:!0},handler:async a=>{let e=bt.search;return await Pt(e,a)}},{name:"timeline",description:'Timeline context. All parameters optional - call get_schema("timeline") for details',inputSchema:{type:"object",properties:{},additionalProperties:!0},handler:async a=>{let e=bt.timeline;return await Pt(e,a)}},{name:"get_recent_context",description:'Recent context. All parameters optional - call get_schema("get_recent_context") for details',inputSchema:{type:"object",properties:{},additionalProperties:!0},handler:async a=>{let e=bt.get_recent_context;return await Pt(e,a)}},{name:"get_context_timeline",description:"Timeline around observation ID",inputSchema:{type:"object",properties:{anchor:{type:"number",description:'Observation ID (required). Optional params: get_schema("get_context_timeline")'}},required:["anchor"],additionalProperties:!0},handler:async a=>{let e=bt.get_context_timeline;return await Pt(e,a)}},{name:"help",description:'Get detailed docs. All parameters optional - call get_schema("help") for details',inputSchema:{type:"object",properties:{},additionalProperties:!0},handler:async a=>{let e=bt.help;return await Pt(e,a)}},{name:"get_observation",description:"Fetch observation by ID",inputSchema:{type:"object",properties:{id:{type:"number",description:"Observation ID (required)"}},required:["id"]},handler:async a=>await us("/api/observation",a.id)},{name:"get_observations",description:"Batch fetch observations",inputSchema:{type:"object",properties:{ids:{type:"array",items:{type:"number"},description:'Array of observation IDs (required). Optional params: get_schema("get_observations")'}},required:["ids"],additionalProperties:!0},handler:async a=>await Td("/api/observations/batch",a)},{name:"get_session",description:"Fetch session by ID",inputSchema:{type:"object",properties:{id:{type:"number",description:"Session ID (required)"}},required:["id"]},handler:async a=>await us("/api/session",a.id)},{name:"get_prompt",description:"Fetch prompt by ID",inputSchema:{type:"object",properties:{id:{type:"number",description:"Prompt ID (required)"}},required:["id"]},handler:async a=>await us("/api/prompt",a.id)}],ds=new ia({name:"mem-search-server",version:"1.0.0"},{capabilities:{tools:{}}});ds.setRequestHandler(Ia,async()=>({tools:ho.map(a=>({name:a.name,description:a.description,inputSchema:a.inputSchema}))}));ds.setRequestHandler(Aa,async a=>{let e=ho.find(t=>t.name===a.params.name);if(!e)throw new Error(`Unknown tool: ${a.params.name}`);try{return await e.handler(a.params.arguments||{})}catch(t){return{content:[{type:"text",text:`Tool execution failed: ${t.message}`}],isError:!0}}});async function po(){me.info("SYSTEM","MCP server shutting down"),process.exit(0)}process.on("SIGTERM",po);process.on("SIGINT",po);async function Ad(){let a=new la;await ds.connect(a),me.info("SYSTEM","Claude-mem search server started"),setTimeout(async()=>{await Id()?me.info("SYSTEM","Worker available",void 0,{workerUrl:it}):(me.warn("SYSTEM","Worker not available",void 0,{workerUrl:it}),me.warn("SYSTEM","Tools will fail until Worker is started"),me.warn("SYSTEM","Start Worker with: npm run worker:restart"))},0)}Ad().catch(a=>{me.error("SYSTEM","Fatal error",void 0,a),process.exit(1)});
 /*! Bundled license information:
 
 uri-js/dist/es5/uri.all.js:
diff --git a/plugin/scripts/new-hook.js b/plugin/scripts/new-hook.js
index 102791c7..d2a429f7 100755
--- a/plugin/scripts/new-hook.js
+++ b/plugin/scripts/new-hook.js
@@ -6,7 +6,7 @@ ${t.stack}`:t.message;if(Array.isArray(t))return`[${t.length} items]`;let r=Obje
 
 `;return i+=`To restart the worker:
 `,i+=`1. Exit Claude Code completely
-`,i+=`2. Run: claude-mem restart
+`,i+=`2. Run: npm run worker:restart
 `,i+="3. Restart Claude Code",r&&(i+=`
 
 If that doesn't work, try: /troubleshoot`),n&&(i=`Worker Error: ${n}
diff --git a/plugin/scripts/save-hook.js b/plugin/scripts/save-hook.js
index 2011dd4d..e07e5acc 100755
--- a/plugin/scripts/save-hook.js
+++ b/plugin/scripts/save-hook.js
@@ -6,7 +6,7 @@ ${t.stack}`:t.message;if(Array.isArray(t))return`[${t.length} items]`;let r=Obje
 
 `;return E+=`To restart the worker:
 `,E+=`1. Exit Claude Code completely
-`,E+=`2. Run: claude-mem restart
+`,E+=`2. Run: npm run worker:restart
 `,E+="3. Restart Claude Code",r&&(E+=`
 
 If that doesn't work, try: /troubleshoot`),n&&(E=`Worker Error: ${n}
diff --git a/plugin/scripts/smart-install.js b/plugin/scripts/smart-install.js
index d6fa6166..e6406181 100644
--- a/plugin/scripts/smart-install.js
+++ b/plugin/scripts/smart-install.js
@@ -291,7 +291,7 @@ function installCLI() {
       console.error('📋 Add to PATH (run once in PowerShell as Admin):');
       console.error(`   [Environment]::SetEnvironmentVariable("Path", $env:Path + ";${cliDir}", "User")`);
       console.error('');
-      console.error('   Then restart your terminal and use: claude-mem start|stop|restart|status');
+      console.error('   Then restart your terminal and use: npm run worker:start|stop|restart|status');
     } catch (error) {
       console.error(`⚠️  Could not install CLI: ${error.message}`);
       console.error(`   You can still use: bun "${WORKER_CLI}" <command>`);
@@ -333,9 +333,9 @@ exec "${bunPath}" "${WORKER_CLI}" "$@"
         console.error('📋 Add to PATH (add to ~/.bashrc or ~/.zshrc):');
         console.error('   export PATH="$HOME/.local/bin:$PATH"');
         console.error('');
-        console.error('   Then restart your terminal and use: claude-mem start|stop|restart|status');
+        console.error('   Then restart your terminal and use: npm run worker:start|stop|restart|status');
       } else {
-        console.error('   Usage: claude-mem start|stop|restart|status');
+        console.error('   Usage: npm run worker:start|stop|restart|status');
       }
     } catch (error) {
       console.error(`⚠️  Could not install CLI: ${error.message}`);
diff --git a/plugin/scripts/summary-hook.js b/plugin/scripts/summary-hook.js
index fc089873..3d6b3606 100755
--- a/plugin/scripts/summary-hook.js
+++ b/plugin/scripts/summary-hook.js
@@ -6,7 +6,7 @@ ${t.stack}`:t.message;if(Array.isArray(t))return`[${t.length} items]`;let r=Obje
 
 `;return i+=`To restart the worker:
 `,i+=`1. Exit Claude Code completely
-`,i+=`2. Run: claude-mem restart
+`,i+=`2. Run: npm run worker:restart
 `,i+="3. Restart Claude Code",r&&(i+=`
 
 If that doesn't work, try: /troubleshoot`),n&&(i=`Worker Error: ${n}
diff --git a/plugin/scripts/user-message-hook.js b/plugin/scripts/user-message-hook.js
index a488781f..19d936d5 100755
--- a/plugin/scripts/user-message-hook.js
+++ b/plugin/scripts/user-message-hook.js
@@ -6,7 +6,7 @@ ${t.stack}`:t.message;if(Array.isArray(t))return`[${t.length} items]`;let r=Obje
 
 `;return i+=`To restart the worker:
 `,i+=`1. Exit Claude Code completely
-`,i+=`2. Run: claude-mem restart
+`,i+=`2. Run: npm run worker:restart
 `,i+="3. Restart Claude Code",r&&(i+=`
 
 If that doesn't work, try: /troubleshoot`),n&&(i=`Worker Error: ${n}
diff --git a/plugin/skills/mem-search/operations/formatting.md b/plugin/skills/mem-search/operations/formatting.md
index 2921e6bd..1b26c502 100644
--- a/plugin/skills/mem-search/operations/formatting.md
+++ b/plugin/skills/mem-search/operations/formatting.md
@@ -288,7 +288,7 @@ npm run worker:status
 If the worker is stopped, restart it:
 
 ```bash
-claude-mem restart
+npm run worker:restart
 ```
 ```
 
diff --git a/plugin/skills/troubleshoot/operations/automated-fixes.md b/plugin/skills/troubleshoot/operations/automated-fixes.md
index 25531546..73597127 100644
--- a/plugin/skills/troubleshoot/operations/automated-fixes.md
+++ b/plugin/skills/troubleshoot/operations/automated-fixes.md
@@ -44,7 +44,7 @@ npm run worker:status
 ```bash
 cd ~/.claude/plugins/marketplaces/thedotmack/ && \
 npm install && \
-claude-mem restart
+npm run worker:restart
 ```
 
 ## Fix: Stale PID File
@@ -70,7 +70,7 @@ curl -s http://127.0.0.1:37777/health
 mkdir -p ~/.claude-mem && \
 echo '{"CLAUDE_MEM_WORKER_PORT":"37778"}' > ~/.claude-mem/settings.json && \
 cd ~/.claude/plugins/marketplaces/thedotmack/ && \
-claude-mem restart && \
+npm run worker:restart && \
 sleep 2 && \
 curl -s http://127.0.0.1:37778/health
 ```
@@ -86,7 +86,7 @@ curl -s http://127.0.0.1:37778/health
 cp ~/.claude-mem/claude-mem.db ~/.claude-mem/claude-mem.db.backup && \
 sqlite3 ~/.claude-mem/claude-mem.db "PRAGMA integrity_check;" && \
 cd ~/.claude/plugins/marketplaces/thedotmack/ && \
-claude-mem restart
+npm run worker:restart
 ```
 
 **If integrity check fails, recreate database:**
@@ -94,7 +94,7 @@ claude-mem restart
 # WARNING: This deletes all memory data
 mv ~/.claude-mem/claude-mem.db ~/.claude-mem/claude-mem.db.old && \
 cd ~/.claude/plugins/marketplaces/thedotmack/ && \
-claude-mem restart
+npm run worker:restart
 ```
 
 ## Fix: Clean Reinstall
@@ -135,7 +135,7 @@ find ~/.claude-mem/logs/ -name "worker-*.log" -mtime +7 -delete
 
 # Restart worker for fresh log
 cd ~/.claude/plugins/marketplaces/thedotmack/
-claude-mem restart
+npm run worker:restart
 ```
 
 **Note:** Logs auto-rotate daily, manual cleanup rarely needed.
diff --git a/plugin/skills/troubleshoot/operations/common-issues.md b/plugin/skills/troubleshoot/operations/common-issues.md
index 4d825207..11f97a24 100644
--- a/plugin/skills/troubleshoot/operations/common-issues.md
+++ b/plugin/skills/troubleshoot/operations/common-issues.md
@@ -29,7 +29,7 @@ Quick fixes for frequently encountered claude-mem problems.
 3. Restart worker and start new session:
    ```bash
    cd ~/.claude/plugins/marketplaces/thedotmack/
-   claude-mem restart
+   npm run worker:restart
    ```
 
 4. Create a test observation: `/skill version-bump` then cancel
@@ -173,7 +173,7 @@ Quick fixes for frequently encountered claude-mem problems.
 4. If FTS5 out of sync, restart worker (triggers reindex):
    ```bash
    cd ~/.claude/plugins/marketplaces/thedotmack/
-   claude-mem restart
+   npm run worker:restart
    ```
 
 ## Issue: Port Conflicts
@@ -194,7 +194,7 @@ Quick fixes for frequently encountered claude-mem problems.
    mkdir -p ~/.claude-mem
    echo '{"CLAUDE_MEM_WORKER_PORT":"37778"}' > ~/.claude-mem/settings.json
    cd ~/.claude/plugins/marketplaces/thedotmack/
-   claude-mem restart
+   npm run worker:restart
    ```
 
 ## Issue: Database Corrupted
@@ -219,7 +219,7 @@ Quick fixes for frequently encountered claude-mem problems.
    ```bash
    rm ~/.claude-mem/claude-mem.db
    cd ~/.claude/plugins/marketplaces/thedotmack/
-   claude-mem restart
+   npm run worker:restart
    # Worker will create new database
    ```
 
diff --git a/plugin/skills/troubleshoot/operations/database.md b/plugin/skills/troubleshoot/operations/database.md
index df061c76..4a9808fb 100644
--- a/plugin/skills/troubleshoot/operations/database.md
+++ b/plugin/skills/troubleshoot/operations/database.md
@@ -173,7 +173,7 @@ If FTS5 counts don't match, triggers may have failed. Restart worker to rebuild:
 
 ```bash
 cd ~/.claude/plugins/marketplaces/thedotmack/
-claude-mem restart
+npm run worker:restart
 ```
 
 The worker will rebuild FTS5 indexes on startup if they're out of sync.
@@ -263,7 +263,7 @@ sqlite3 ~/.claude-mem/claude-mem.db "SELECT COUNT(*) FROM observations;"
    ```bash
    mv ~/.claude-mem/claude-mem.db ~/.claude-mem/claude-mem.db.archive
    cd ~/.claude/plugins/marketplaces/thedotmack/
-   claude-mem restart
+   npm run worker:restart
    ```
 
 ## Database Recovery
diff --git a/plugin/skills/troubleshoot/operations/reference.md b/plugin/skills/troubleshoot/operations/reference.md
index 673372e0..361696b5 100644
--- a/plugin/skills/troubleshoot/operations/reference.md
+++ b/plugin/skills/troubleshoot/operations/reference.md
@@ -13,7 +13,7 @@ npm run worker:status
 npm run worker:start
 
 # Restart worker
-claude-mem restart
+npm run worker:restart
 
 # Stop worker
 npm run worker:stop
diff --git a/plugin/skills/troubleshoot/operations/worker.md b/plugin/skills/troubleshoot/operations/worker.md
index 7cda51e0..b1208e64 100644
--- a/plugin/skills/troubleshoot/operations/worker.md
+++ b/plugin/skills/troubleshoot/operations/worker.md
@@ -152,7 +152,7 @@ npm run worker:start
 ```bash
 # Restart worker (stops and starts)
 cd ~/.claude/plugins/marketplaces/thedotmack/
-claude-mem restart
+npm run worker:restart
 
 # Or manually stop and start
 npm run worker:stop
@@ -219,7 +219,7 @@ npm run worker:start
 **Port conflict:**
 ```bash
 echo '{"CLAUDE_MEM_WORKER_PORT":"37778"}' > ~/.claude-mem/settings.json
-claude-mem restart
+npm run worker:restart
 ```
 
 **Stale PID file:**
@@ -261,14 +261,14 @@ If fails, backup and recreate database.
 **Out of memory:**
 Check if database is too large or memory leak. Restart:
 ```bash
-claude-mem restart
+npm run worker:restart
 ```
 
 **Port conflict race condition:**
 Another process grabbing port intermittently. Change port:
 ```bash
 echo '{"CLAUDE_MEM_WORKER_PORT":"37778"}' > ~/.claude-mem/settings.json
-claude-mem restart
+npm run worker:restart
 ```
 
 ## Worker Management Commands
@@ -284,7 +284,7 @@ npm run worker:start
 npm run worker:stop
 
 # Restart worker
-claude-mem restart
+npm run worker:restart
 
 # View logs
 npm run worker:logs
@@ -355,7 +355,7 @@ All should return appropriate responses (HTML for viewer, JSON for APIs).
 |---------|---------|----------------|
 | Check if running | `npm run worker:status` | Shows PID and uptime |
 | Worker not running | `npm run worker:start` | Worker starts successfully |
-| Worker crashed | `claude-mem restart` | Worker restarts |
+| Worker crashed | `npm run worker:restart` | Worker restarts |
 | View recent errors | `grep -i error ~/.claude-mem/logs/worker-$(date +%Y-%m-%d).log \| tail -20` | Shows recent errors |
 | Port in use | `lsof -i :37777` | Shows process using port |
 | Stale PID | `rm ~/.claude-mem/worker.pid && npm run worker:start` | Removes stale PID and starts |
diff --git a/src/servers/mcp-server.ts b/src/servers/mcp-server.ts
index c4d68cc3..9893c8af 100644
--- a/src/servers/mcp-server.ts
+++ b/src/servers/mcp-server.ts
@@ -496,7 +496,7 @@ async function main() {
     if (!workerAvailable) {
       logger.warn('SYSTEM', 'Worker not available', undefined, { workerUrl: WORKER_BASE_URL });
       logger.warn('SYSTEM', 'Tools will fail until Worker is started');
-      logger.warn('SYSTEM', 'Start Worker with: claude-mem restart');
+      logger.warn('SYSTEM', 'Start Worker with: npm run worker:restart');
     } else {
       logger.info('SYSTEM', 'Worker available', undefined, { workerUrl: WORKER_BASE_URL });
     }
diff --git a/src/utils/error-messages.ts b/src/utils/error-messages.ts
index 0a286f29..3cd8f8c3 100644
--- a/src/utils/error-messages.ts
+++ b/src/utils/error-messages.ts
@@ -31,7 +31,7 @@ export function getWorkerRestartInstructions(
   let message = `${prefix}${portInfo}\n\n`;
   message += `To restart the worker:\n`;
   message += `1. Exit Claude Code completely\n`;
-  message += `2. Run: claude-mem restart\n`;
+  message += `2. Run: npm run worker:restart\n`;
   message += `3. Restart Claude Code`;
 
   if (includeSkillFallback) {