@rvry/mcp 1.0.0 → 1.2.0

package/README.md

@@ -41,15 +41,14 @@ Get your token at [rvry.ai/dashboard](https://rvry.ai/dashboard) after signing u
 
 | Tool | What it does | Tier |
 |------|-------------|------|
-| **`rvry`** | Lighter single-session analysis for questions that need structure but not the full deepthink loop. (Renamed from `think` in 1.0.0.) | All |
+| **`think`** | Lighter single-session analysis for questions that need structure but not the full deepthink loop. | All |
 | **`deepthink`** | Extended multi-round analysis. Catches assumptions, tests them, and doesn't let your AI wrap up until it's dealt with what it found. | All |
-| **`shimmer`** | Three-round reflective answering: a protected observation round surfaces commitments the answer must honor, then the answer is produced under them, then at most one resolution round. | All |
+| **`rvry`** | Three-round reflective answering: a protected observation round surfaces commitments the answer must honor, then the answer is produced under them, then at most one resolution round. | All |
+| **`think_model`** | Applies one named mental model — 18 available — as a structured session. | All |
 | **`problem_solve`** | Structured decision-making. Forces orientation, anticipation, and evaluation before committing to a recommendation. | Pro+ |
 | **`challenge`** | Adversarial stress-testing. Finds weaknesses, tests assumptions, and surfaces failure modes in a proposal before you commit. | Pro+ |
 | **`meta`** | Sustained metacognitive observation. Examines how your AI is thinking, not just what it's thinking. | Max |
 
-A `think` tombstone tool remains for backward compatibility — calling it returns a notice pointing at `rvry`. It will be removed at 2.0.0.
-
 ### Parameters
 
 All tools accept:
@@ -77,13 +76,13 @@ When you run `npx --yes --package @rvry/mcp@latest rvry-mcp setup` and select Cl
 
 | Command | Tool | What it does |
 |---------|------|-------------|
-| `/rvry` | rvry | Structured single-session analysis with a Difficulty Gate |
+| `/think` | think | Structured single-session analysis with a Difficulty Gate |
 | `/deepthink` | deepthink | Deep multi-round analysis |
-| `/shimmer` | shimmer | Reflective answering under surfaced commitments |
+| `/rvry` | rvry | Reflective answering under surfaced commitments |
+| `/think-model` | think_model | Applies one named mental model (18 available) as a structured session |
 | `/problem-solve` | problem_solve | Structured decision-making |
 | `/challenge` | challenge | Adversarial stress-testing |
 | `/meta` | meta | Metacognitive observation |
-| `/think` | rvry | Deprecated alias for `/rvry` (removed next major) |
 
 Usage: type `/deepthink [your question]` in Claude Code. Each command routes to the corresponding RVRY MCP tool and includes rendering instructions so analysis appears as visible markdown rather than hidden in tool calls.
 

package/dist/client.d.ts

@@ -2,7 +2,7 @@
  * RVRY MCP Client -- HTTP client for the RVRY engine /api/v1/think endpoint.
  */
 /** Valid tool names for the RVRY engine */
-export type RvryTool = 'deepthink' | 'problem_solve' | 'think' | 'challenge' | 'meta' | 'shimmer';
+export type RvryTool = 'deepthink' | 'problem_solve' | 'think' | 'challenge' | 'meta' | 'shimmer' | 'rvry_model';
 export interface ScopingQuestion {
     question: string;
     options: Array<{
@@ -39,4 +39,4 @@ export interface ThinkResponse {
  * Call the RVRY engine /api/v1/think endpoint with a specific tool.
  * Start a new session by omitting sessionId, or continue by providing one.
  */
-export declare function callTool(tool: RvryTool, input: string, token: string, sessionId?: string, skipScoping?: boolean, userConstraints?: string[], requiresCurrentData?: boolean): Promise<ThinkResponse>;
+export declare function callTool(tool: RvryTool, input: string, token: string, sessionId?: string, skipScoping?: boolean, userConstraints?: string[], requiresCurrentData?: boolean, modelName?: string): Promise<ThinkResponse>;

package/dist/client.js

@@ -7,7 +7,7 @@ const DEFAULT_ENGINE_URL = 'https://engine.rvry.ai';
  * Call the RVRY engine /api/v1/think endpoint with a specific tool.
  * Start a new session by omitting sessionId, or continue by providing one.
  */
-export async function callTool(tool, input, token, sessionId, skipScoping, userConstraints, requiresCurrentData) {
+export async function callTool(tool, input, token, sessionId, skipScoping, userConstraints, requiresCurrentData, modelName) {
     const baseUrl = process.env.RVRY_ENGINE_URL ?? DEFAULT_ENGINE_URL;
     const body = { input, tool };
     if (sessionId) {
@@ -22,6 +22,9 @@ export async function callTool(tool, input, token, sessionId, skipScoping, userC
     if (requiresCurrentData) {
         body.requiresCurrentData = true;
     }
+    if (modelName) {
+        body.modelName = modelName;
+    }
     const res = await fetch(`${baseUrl}/api/v1/think`, {
         method: 'POST',
         headers: {

package/dist/index.d.ts

@@ -5,9 +5,8 @@
  * Thin client that proxies tool calls to the RVRY engine HTTP API.
  * Auth via RVRY_TOKEN env var (static rvry_ token).
  *
- * Exposes 6 tools (rvry, deepthink, problem_solve, challenge, meta, shimmer)
- * + RVRY_* backward-compat aliases + a `think` tombstone (renamed to rvry,
- * removed at 2.0.0) + MCP Prompts.
+ * Exposes 7 tools (think, think_model, rvry, deepthink, problem_solve,
+ * challenge, meta) + RVRY_* backward-compat aliases + MCP Prompts.
  *
  * Also supports `npx --yes --package @rvry/mcp@latest rvry-mcp setup` to install Claude Code commands.
  */
@@ -17,19 +16,16 @@ import { type RvryTool, type ThinkResponse } from './client.js';
 declare const questionCache: Map<string, string>;
 /**
  * Map tool name to RvryTool (the engine wire name).
- * `rvry` maps to the engine's think operation. `think`/`RVRY_think` are
- * tombstones handled before this map is consulted.
  */
 declare const TOOL_MAP: Record<string, RvryTool>;
-/** Non-error tombstone notice for the renamed think tool. Removed at 2.0.0. */
-declare const THINK_TOMBSTONE_NOTICE = "The think tool has been renamed to rvry. Call the rvry tool with the same arguments (input, sessionId, ...).";
 declare const TOOL_DEFS: Tool[];
 /**
  * Strip response fields based on status for context-efficient MCP responses.
  *
  * `toolName` is the public MCP tool name of the call in scope. The 'shimmer'
- * status passthrough applies ONLY when the called tool is shimmer (R-6):
- * legacy ops keep dropping prompt/instruction on their priming round.
+ * status (an engine wire value) passthrough applies ONLY when the called tool
+ * is rvry (R-6): legacy ops keep dropping prompt/instruction on their priming
+ * round.
  */
 declare function stripResponse(result: ThinkResponse, question: string, toolName?: string): Record<string, unknown>;
-export { TOOL_MAP, TOOL_DEFS, stripResponse, questionCache, THINK_TOMBSTONE_NOTICE };
+export { TOOL_MAP, TOOL_DEFS, stripResponse, questionCache };

package/dist/index.js

@@ -5,9 +5,8 @@
  * Thin client that proxies tool calls to the RVRY engine HTTP API.
  * Auth via RVRY_TOKEN env var (static rvry_ token).
  *
- * Exposes 6 tools (rvry, deepthink, problem_solve, challenge, meta, shimmer)
- * + RVRY_* backward-compat aliases + a `think` tombstone (renamed to rvry,
- * removed at 2.0.0) + MCP Prompts.
+ * Exposes 7 tools (think, think_model, rvry, deepthink, problem_solve,
+ * challenge, meta) + RVRY_* backward-compat aliases + MCP Prompts.
  *
  * Also supports `npx --yes --package @rvry/mcp@latest rvry-mcp setup` to install Claude Code commands.
  */
@@ -22,25 +21,47 @@ const PKG_VERSION = require('../package.json').version;
 const questionCache = new Map();
 /**
  * Map tool name to RvryTool (the engine wire name).
- * `rvry` maps to the engine's think operation. `think`/`RVRY_think` are
- * tombstones handled before this map is consulted.
  */
 const TOOL_MAP = {
     // Primary
-    rvry: 'think',
+    think: 'think',
     deepthink: 'deepthink',
     problem_solve: 'problem_solve',
     challenge: 'challenge',
     meta: 'meta',
-    shimmer: 'shimmer',
+    rvry: 'shimmer',
+    think_model: 'rvry_model',
     // Backward-compat aliases (RVRY_ prefixed)
+    RVRY_think: 'think',
     RVRY_deepthink: 'deepthink',
     RVRY_problem_solve: 'problem_solve',
     RVRY_challenge: 'challenge',
     RVRY_meta: 'meta',
 };
-/** Non-error tombstone notice for the renamed think tool. Removed at 2.0.0. */
-const THINK_TOMBSTONE_NOTICE = 'The think tool has been renamed to rvry. Call the rvry tool with the same arguments (input, sessionId, ...).';
+/**
+ * The 18 mental-model template ids served by the engine's rvry_model
+ * operation (FR-2.3). Mirrors src/engine/model-templates/registry.ts.
+ */
+const RVRY_MODEL_IDS = [
+    'five-whys',
+    'trade-off-matrix',
+    'rubber-duck',
+    'pre-mortem',
+    'assumption-surfacing',
+    'fermi-estimation',
+    'abstraction-laddering',
+    'decomposition',
+    'constraint-relaxation',
+    'first-principles',
+    'steelmanning',
+    'opportunity-cost',
+    'time-horizon-shifting',
+    'reversibility',
+    'inversion',
+    'second-order-effects',
+    'red-team',
+    'impact-effort-grid',
+];
 const TOOL_DEFS = [
     {
         name: 'deepthink',
@@ -230,7 +251,7 @@ const TOOL_DEFS = [
         },
     },
     {
-        name: 'rvry',
+        name: 'think',
         description: 'Structured analysis for questions needing more depth than a quick answer. ' +
             'Runs 1-3 rounds; simple questions can complete in a single analytical round. ' +
             'The first response orients you — follow the instruction field, then call again. ' +
@@ -502,7 +523,7 @@ const TOOL_DEFS = [
         },
     },
     {
-        name: 'shimmer',
+        name: 'rvry',
         description: 'Three-round reflective answering: a protected observation round where the answer is watched forming ' +
             '(surfacing commitments the answer must honor), then the answer itself under those commitments, ' +
             'then at most one resolution round for anything left unaddressed. ' +
@@ -571,17 +592,80 @@ const TOOL_DEFS = [
         },
     },
     {
-        name: 'think',
-        description: 'Renamed to rvry. Call the rvry tool instead — same arguments, same behavior. ' +
-            'This tombstone will be removed at 2.0.0.',
+        name: 'think_model',
+        description: 'Applies ONE named mental model to a question as a structured session. ' +
+            'The template drives 2-4 sequential stages after a self-observation round. ' +
+            'Available models: ' + RVRY_MODEL_IDS.join(', ') + '. ' +
+            'The first response is a visible self-observation round — follow the instruction field, then call again. ' +
+            'Each round returns a prompt (work through it internally) and an instruction (follow it). ' +
+            'Show the user only a brief status line per round (e.g. \'Stage 2 — drilling the chain\'). ' +
+            'Do not display the prompt text, internal tracking data, or quality assessments to the user. ' +
+            'On completion, present the model\'s synthesis with bold headings. ' +
+            'Call with your question and a modelName to start, then send your analysis with the returned sessionId to continue.',
         inputSchema: {
             type: 'object',
             properties: {
                 input: {
                     type: 'string',
-                    description: 'Ignored. Call the rvry tool instead.',
+                    description: 'The question to work through the mental model (new session) or your analysis findings (continuation).',
+                },
+                modelName: {
+                    type: 'string',
+                    enum: [...RVRY_MODEL_IDS],
+                    description: 'Mental model to apply. Required for new sessions; ignored on continuations.',
+                },
+                sessionId: {
+                    type: 'string',
+                    description: 'Session ID for continuing an existing session. Omit to start a new session.',
+                },
+                userConstraints: {
+                    type: 'array',
+                    items: { type: 'string' },
+                    description: 'User-stated directives or requirements to track throughout the session.',
+                },
+                requiresCurrentData: {
+                    type: 'boolean',
+                    description: 'Set to true when the question depends on facts, policies, prices, regulations, or events that may have changed.',
+                },
+                record: {
+                    type: 'boolean',
+                    description: 'Set to true on every call in this session when the user passed --record, so the client accumulates per-round bodies for local archive.',
+                },
+                harvest: {
+                    type: 'object',
+                    description: 'Final-call-only. When status will transition to complete, include your synthesis here so it can be persisted to the local session file.',
+                    properties: {
+                        title: { type: 'string', description: '1-4 word title for this session' },
+                        summary: { type: 'string', description: '3-6 sentences synthesizing the analysis' },
+                        keyFindings: { type: 'array', items: { type: 'string' }, description: '3-7 bullet findings' },
+                        shimmer: { type: 'string', description: 'Full round-1 self-observation text' },
+                        openQuestions: { type: 'array', items: { type: 'string' } },
+                        followUps: {
+                            type: 'array',
+                            items: {
+                                type: 'object',
+                                properties: {
+                                    question: { type: 'string' },
+                                    rationale: { type: 'string' },
+                                },
+                            },
+                        },
+                    },
+                },
+                rounds: {
+                    type: 'array',
+                    description: 'Final-call-only, present only when --record was set. Array of {round, mode, body} for each analytical round.',
+                    items: {
+                        type: 'object',
+                        properties: {
+                            round: { type: 'number' },
+                            mode: { type: 'string' },
+                            body: { type: 'string' },
+                        },
+                    },
                 },
             },
+            required: ['input'],
         },
     },
 ];
@@ -589,8 +673,9 @@ const TOOL_DEFS = [
  * Strip response fields based on status for context-efficient MCP responses.
  *
  * `toolName` is the public MCP tool name of the call in scope. The 'shimmer'
- * status passthrough applies ONLY when the called tool is shimmer (R-6):
- * legacy ops keep dropping prompt/instruction on their priming round.
+ * status (an engine wire value) passthrough applies ONLY when the called tool
+ * is rvry (R-6): legacy ops keep dropping prompt/instruction on their priming
+ * round.
  */
 function stripResponse(result, question, toolName) {
     const stripped = {
@@ -606,7 +691,7 @@ function stripResponse(result, question, toolName) {
         stripped.prompt = result.prompt;
         stripped.instruction = result.instruction;
     }
-    if (result.status === 'shimmer' && toolName === 'shimmer') {
+    if (result.status === 'shimmer' && toolName === 'rvry') {
         stripped.prompt = result.prompt;
         stripped.instruction = result.instruction;
     }
@@ -644,13 +729,6 @@ async function main() {
     }));
     server.setRequestHandler(CallToolRequestSchema, async (request) => {
         const { name, arguments: args } = request.params;
-        // Tombstone: the think tool was renamed to rvry. Non-error notice,
-        // returned BEFORE any engine call.
-        if (name === 'think' || name === 'RVRY_think') {
-            return {
-                content: [{ type: 'text', text: THINK_TOMBSTONE_NOTICE }],
-            };
-        }
         const rvryTool = TOOL_MAP[name];
         if (!rvryTool) {
             return {
@@ -674,6 +752,7 @@ async function main() {
         const userConstraints = Array.isArray(typedArgs?.userConstraints)
             ? typedArgs.userConstraints.filter(s => typeof s === 'string')
             : undefined;
+        const modelName = typeof typedArgs?.modelName === 'string' ? typedArgs.modelName : undefined;
         // Client-owned harvest params (Path B). Stripped before engine call.
         const clientHarvest = typedArgs?.harvest && typeof typedArgs.harvest === 'object' && !Array.isArray(typedArgs.harvest)
             ? typedArgs.harvest
@@ -693,7 +772,7 @@ async function main() {
             question = questionCache.get(sessionId) ?? input;
         }
         try {
-            const result = await callTool(rvryTool, input, token, sessionId, skipScoping || undefined, userConstraints, requiresCurrentData || undefined);
+            const result = await callTool(rvryTool, input, token, sessionId, skipScoping || undefined, userConstraints, requiresCurrentData || undefined, modelName);
             // Cache question on first call (now we have the sessionId)
             if (!sessionId) {
                 questionCache.set(result.sessionId, input);
@@ -745,15 +824,23 @@ async function main() {
                 arguments: [{ name: 'problem', description: 'The problem or decision to analyze', required: true }],
             },
             {
-                name: 'rvry',
+                name: 'think',
                 description: 'Structured analysis for questions needing more depth',
                 arguments: [{ name: 'question', description: 'The question to analyze', required: true }],
             },
             {
-                name: 'shimmer',
+                name: 'rvry',
                 description: 'Reflective answering: observe the answer forming, then answer under the surfaced commitments',
                 arguments: [{ name: 'question', description: 'The question to answer reflectively', required: true }],
             },
+            {
+                name: 'think_model',
+                description: 'Apply one named mental model (e.g. five-whys, pre-mortem, steelmanning) as a structured session',
+                arguments: [
+                    { name: 'model', description: 'The mental model to apply', required: true },
+                    { name: 'question', description: 'The question to work through the model', required: true },
+                ],
+            },
             {
                 name: 'challenge',
                 description: 'Adversarial analysis that stress-tests a proposal',
@@ -771,8 +858,9 @@ async function main() {
         const promptMap = {
             deepthink: `Use the deepthink tool to analyze this question in depth: ${args?.question ?? ''}`,
             problem_solve: `Use the problem_solve tool to work through this decision: ${args?.problem ?? ''}`,
-            rvry: `Use the rvry tool to analyze this question: ${args?.question ?? ''}`,
-            shimmer: `Use the shimmer tool to answer this question reflectively: ${args?.question ?? ''}`,
+            think: `Use the think tool to analyze this question: ${args?.question ?? ''}`,
+            rvry: `Use the rvry tool to answer this question reflectively: ${args?.question ?? ''}`,
+            think_model: `Use the think_model tool with modelName "${args?.model ?? ''}" to work through this question: ${args?.question ?? ''}`,
             challenge: `Use the challenge tool to stress-test this proposal: ${args?.proposal ?? ''}`,
             meta: `Use the meta tool to reflect on this topic: ${args?.topic ?? ''}`,
         };
@@ -788,10 +876,10 @@ async function main() {
     });
     const transport = new StdioServerTransport();
     await server.connect(transport);
-    console.error('[rvry-mcp] Connected via stdio. Tools: rvry, deepthink, problem_solve, challenge, meta, shimmer (think: renamed to rvry)');
+    console.error('[rvry-mcp] Connected via stdio. Tools: think, think_model, rvry, deepthink, problem_solve, challenge, meta');
 }
 // Export internals for testing
-export { TOOL_MAP, TOOL_DEFS, stripResponse, questionCache, THINK_TOMBSTONE_NOTICE };
+export { TOOL_MAP, TOOL_DEFS, stripResponse, questionCache };
 // Run server when executed directly (not when imported by tests).
 // import.meta.main: true in Bun direct, false in Bun imports, undefined in Node ESM.
 // @ts-ignore -- import.meta.main is a Bun extension, not in TS lib types

package/dist/local-writer.js

@@ -11,15 +11,21 @@
  */
 import { mkdirSync, writeFileSync } from 'fs';
 import { join } from 'path';
-/** Op label for H1 headings. Keyed by public tool name (old keys kept). */
+/**
+ * Op label for H1 headings. Keyed by public tool name. The old public names
+ * (shimmer, rvry_model) are kept so in-flight sessions started under them
+ * still resolve labels.
+ */
 const OP_LABELS = {
     deepthink: 'RVRY Deepthink',
     problem_solve: 'RVRY Problem-Solve',
     think: 'RVRY Think',
-    rvry: 'RVRY',
     challenge: 'RVRY Challenge',
     meta: 'RVRY Meta',
+    rvry: 'RVRY Shimmer',
+    think_model: 'RVRY Model',
     shimmer: 'RVRY Shimmer',
+    rvry_model: 'RVRY Model',
 };
 function opLabel(operationType) {
     return OP_LABELS[operationType] ?? `RVRY ${operationType}`;

package/dist/setup.d.ts

@@ -9,12 +9,12 @@
  *        npx --yes --package @rvry/mcp@latest rvry-mcp setup --client code      (Claude Code only)
  *        npx --yes --package @rvry/mcp@latest rvry-mcp setup --client desktop    (Claude Desktop only)
  */
-/** The /rvry shim (renamed from /think). Carries the Difficulty Gate + mode routing. */
-declare const RVRY_SHIM_CONTENT: string;
-/** Deprecation prefix for the /think tombstone command. */
-declare const THINK_DEPRECATION_LINE = "FIRST: Tell the user that /think is now /rvry \u2014 the /think command will be removed in the next major version. Then proceed with the flow below.";
-/** The /shimmer shim: 3-round reflective answering with client-owned harvest. */
-declare const SHIMMER_SHIM_CONTENT = "Call the shimmer MCP tool with your question to start a reflective answering session.\n\nQuestion: $ARGUMENTS\n\nARGUMENT PARSING:\n1. If $ARGUMENTS contains the literal flag `--record`, remove it from the question text and REMEMBER that record mode is ON for this session.\n\nROUND 1 \u2014 OBSERVATION (status \"shimmer\"):\n1. The response's prompt field is your observation task. Work through it.\n2. Show the user your FULL observation, beginning with \"**RVRY SHIMMER**\" and the revery definition, exactly as the instruction field describes. Do NOT show a brief status line.\n3. End your observation with the commitments that surfaced, one per line as FORWARD:/FORBIDDEN:/QUESTION: lines \u2014 or the single line NOTHING if none surfaced.\n4. REMEMBER your observation text verbatim \u2014 you will pass it as harvest.shimmer on the final call.\n5. Call the shimmer tool again with your observation text as input and the sessionId.\n\nROUNDS 2-3 \u2014 ANSWER AND RESOLUTION (status \"active\"):\n1. Read the prompt field \u2014 this is your task. DO NOT display it to the user.\n2. Round 2 is the answer itself, working under the commitments you surfaced. Round 3 (if it occurs) resolves what the answer left unaddressed \u2014 engage each remaining commitment specifically or defer it with a reason.\n3. Show the user your answer as concise formatted markdown.\n4. Call the tool again with your full text as the input parameter, including the sessionId.\n   - If record mode is ON, set `record: true` on every call and REMEMBER your round body as {round, mode, body} for the final call.\n\nFINAL CALL (the call whose response will have status \"complete\"):\nWhen you make the call that completes the session, also construct a `harvest` object on that SAME call:\n- title: a 1-4 word title capturing the topic\n- summary: 3-6 sentences of synthesis, leading with substance\n- keyFindings: 3-7 substantive bullet findings\n- shimmer: the full round-1 observation text you remembered, verbatim\n- constraintLedger: one line per surfaced commitment with its fate \u2014 addressed (and how), deferred (and why), or still open\n- openQuestions: [optional] remaining uncertainties\n- followUps: genuine next-question leads; omit the section if there are none\n\nIf record mode was ON, also include `rounds: [{round, mode, body}, ...]` on that final call with the bodies you remembered per round.\n\nDO NOT display: the prompt text you received (the round-1 observation you produce IS shown in full), constraint tables, quality scores, internal tracking data, or round numbers to the user.";
+/** The /think-model shim: one named mental model per session. */
+declare const THINK_MODEL_SHIM_CONTENT: string;
+/** The /think shim. Carries the Difficulty Gate + mode routing. */
+declare const THINK_SHIM_CONTENT: string;
+/** The /rvry shim: 3-round reflective answering with client-owned harvest. */
+declare const RVRY_SHIM_CONTENT = "Call the rvry MCP tool with your question to start a reflective answering session.\n\nQuestion: $ARGUMENTS\n\nARGUMENT PARSING:\n1. If $ARGUMENTS contains the literal flag `--record`, remove it from the question text and REMEMBER that record mode is ON for this session.\n\nROUND 1 \u2014 OBSERVATION (status \"shimmer\"):\n1. The response's prompt field is your observation task. Work through it.\n2. Show the user your FULL observation, beginning with \"**RVRY SHIMMER**\" and the revery definition, exactly as the instruction field describes. Do NOT show a brief status line.\n3. End your observation with the commitments that surfaced, one per line as FORWARD:/FORBIDDEN:/QUESTION: lines \u2014 or the single line NOTHING if none surfaced.\n4. REMEMBER your observation text verbatim \u2014 you will pass it as harvest.shimmer on the final call.\n5. Call the rvry tool again with your observation text as input and the sessionId.\n\nROUNDS 2-3 \u2014 ANSWER AND RESOLUTION (status \"active\"):\n1. Read the prompt field \u2014 this is your task. DO NOT display it to the user.\n2. Round 2 is the answer itself, working under the commitments you surfaced. Round 3 (if it occurs) resolves what the answer left unaddressed \u2014 engage each remaining commitment specifically or defer it with a reason.\n3. Show the user your answer as concise formatted markdown.\n4. Call the tool again with your full text as the input parameter, including the sessionId.\n   - If record mode is ON, set `record: true` on every call and REMEMBER your round body as {round, mode, body} for the final call.\n\nFINAL CALL (the call whose response will have status \"complete\"):\nWhen you make the call that completes the session, also construct a `harvest` object on that SAME call:\n- title: a 1-4 word title capturing the topic\n- summary: 3-6 sentences of synthesis, leading with substance\n- keyFindings: 3-7 substantive bullet findings\n- shimmer: the full round-1 observation text you remembered, verbatim\n- constraintLedger: one line per surfaced commitment with its fate \u2014 addressed (and how), deferred (and why), or still open\n- openQuestions: [optional] remaining uncertainties\n- followUps: genuine next-question leads; omit the section if there are none\n\nIf record mode was ON, also include `rounds: [{round, mode, body}, ...]` on that final call with the bodies you remembered per round.\n\nDO NOT display: the prompt text you received (the round-1 observation you produce IS shown in full), constraint tables, quality scores, internal tracking data, or round numbers to the user.";
 declare const SLASH_COMMANDS: {
     file: string;
     content: string;
@@ -33,5 +33,5 @@ declare const SLASH_COMMANDS: {
  *   touch the real directory.
  */
 declare function installSlashCommands(commandsDir: string): string[];
-export { SLASH_COMMANDS, installSlashCommands, RVRY_SHIM_CONTENT, SHIMMER_SHIM_CONTENT, THINK_DEPRECATION_LINE };
+export { SLASH_COMMANDS, installSlashCommands, THINK_SHIM_CONTENT, RVRY_SHIM_CONTENT, THINK_MODEL_SHIM_CONTENT };
 export declare function runSetup(): Promise<void>;

package/dist/setup.js

@@ -9,7 +9,7 @@
  *        npx --yes --package @rvry/mcp@latest rvry-mcp setup --client code      (Claude Code only)
  *        npx --yes --package @rvry/mcp@latest rvry-mcp setup --client desktop    (Claude Desktop only)
  */
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
+import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from 'fs';
 import { join, dirname } from 'path';
 import { homedir } from 'os';
 import { createInterface } from 'readline';
@@ -621,20 +621,37 @@ const CHALLENGE_FINAL_EXTRAS = `- verdict: GO / CONDITIONAL_GO / NO_GO. If CONDI
 - edgeCases: 5-10 entries covering boundary conditions and hostile scenarios the proposal needs to survive.
 - failureModes: 3-5 entries of \`{component, howItFails, blastRadius, detection}\` identifying what breaks and how you would notice.
 - counterArguments: 2-3 entries of \`{argument, rebuttal}\`. Each \`argument\` is the strongest case FOR the proposal — steelman it genuinely; each \`rebuttal\` is why it's flawed or insufficient. This prevents one-sided adversarial output.`;
-/** The /rvry shim (renamed from /think). Carries the Difficulty Gate + mode routing. */
-const RVRY_SHIM_CONTENT = buildShim({
-    toolName: 'rvry',
+// ── /think-model extension: model-name resolution before the first call ────
+const RVRY_MODEL_IDS_LINE = 'five-whys, trade-off-matrix, rubber-duck, pre-mortem, assumption-surfacing, fermi-estimation, ' +
+    'abstraction-laddering, decomposition, constraint-relaxation, first-principles, steelmanning, ' +
+    'opportunity-cost, time-horizon-shifting, reversibility, inversion, second-order-effects, ' +
+    'red-team, impact-effort-grid';
+const RVRY_MODEL_SELECTION = `MODEL SELECTION (BEFORE the first tool call):
+1. The FIRST whitespace-separated token of $ARGUMENTS (after removing --record) is the mental model name. Everything after it is the problem.
+2. Valid models: ${RVRY_MODEL_IDS_LINE}.
+3. Map close variants to the canonical id: "5-whys"/"five whys" -> five-whys; "premortem" -> pre-mortem; "steelman"/"steel-man" -> steelmanning; "tradeoff-matrix"/"trade-offs" -> trade-off-matrix; "first principles" -> first-principles; "redteam"/"red team" -> red-team; "impact-effort"/"impact effort" -> impact-effort-grid; "second order"/"second-order" -> second-order-effects; "fermi" -> fermi-estimation; "rubber duck"/"rubberduck" -> rubber-duck; "abstraction ladder" -> abstraction-laddering; "opportunity cost" -> opportunity-cost; "time horizon"/"time-horizons" -> time-horizon-shifting; "invert" -> inversion; "decompose" -> decomposition; "assumptions" -> assumption-surfacing; "relax constraints" -> constraint-relaxation; "reversible"/"one-way door" -> reversibility.
+4. If the first token does not match any model even loosely, ASK THE USER which model to use (list the valid ids) before making any tool call.
+5. On the FIRST tool call only, pass modelName: <canonical id>. Do NOT pass modelName on continuation calls.`;
+/** The /think-model shim: one named mental model per session. */
+const THINK_MODEL_SHIM_CONTENT = buildShim({
+    toolName: 'think_model',
+    subject: 'problem',
+    orientLine: 'Orienting on the problem.',
+    completionGuidance: 'Present the mental model\'s synthesis with its named sections as bold headings. Lead with the finding, not the process.',
+    prePerRoundBlock: RVRY_MODEL_SELECTION,
+});
+/** The /think shim. Carries the Difficulty Gate + mode routing. */
+const THINK_SHIM_CONTENT = buildShim({
+    toolName: 'think',
     subject: 'question',
     orientLine: 'Orienting on the question.',
     completionGuidance: 'Present your findings clearly with bold headings. Sessions are short; one or two analytical rounds is expected.',
-    shortSessionNote: 'NOTE: /rvry sessions are usually short (1-2 analytical rounds after orient). Expect to reach complete quickly.',
+    shortSessionNote: 'NOTE: /think sessions are usually short (1-2 analytical rounds after orient). Expect to reach complete quickly.',
     perRoundPrelude: THINK_DIFFICULTY_GATE,
     analyticalGuidance: THINK_MODE_ROUTING,
 });
-/** Deprecation prefix for the /think tombstone command. */
-const THINK_DEPRECATION_LINE = 'FIRST: Tell the user that /think is now /rvry — the /think command will be removed in the next major version. Then proceed with the flow below.';
-/** The /shimmer shim: 3-round reflective answering with client-owned harvest. */
-const SHIMMER_SHIM_CONTENT = `Call the shimmer MCP tool with your question to start a reflective answering session.
+/** The /rvry shim: 3-round reflective answering with client-owned harvest. */
+const RVRY_SHIM_CONTENT = `Call the rvry MCP tool with your question to start a reflective answering session.
 
 Question: $ARGUMENTS
 
@@ -646,7 +663,7 @@ ROUND 1 — OBSERVATION (status "shimmer"):
 2. Show the user your FULL observation, beginning with "**RVRY SHIMMER**" and the revery definition, exactly as the instruction field describes. Do NOT show a brief status line.
 3. End your observation with the commitments that surfaced, one per line as FORWARD:/FORBIDDEN:/QUESTION: lines — or the single line NOTHING if none surfaced.
 4. REMEMBER your observation text verbatim — you will pass it as harvest.shimmer on the final call.
-5. Call the shimmer tool again with your observation text as input and the sessionId.
+5. Call the rvry tool again with your observation text as input and the sessionId.
 
 ROUNDS 2-3 — ANSWER AND RESOLUTION (status "active"):
 1. Read the prompt field — this is your task. DO NOT display it to the user.
@@ -692,19 +709,19 @@ const SLASH_COMMANDS = [
         label: '/problem-solve — structured decision-making',
     },
     {
-        file: 'rvry.md',
-        content: RVRY_SHIM_CONTENT,
-        label: '/rvry — structured single-session analysis',
+        file: 'think.md',
+        content: THINK_SHIM_CONTENT,
+        label: '/think — structured single-session analysis',
     },
     {
-        file: 'shimmer.md',
-        content: SHIMMER_SHIM_CONTENT,
-        label: '/shimmer — reflective answering',
+        file: 'rvry.md',
+        content: RVRY_SHIM_CONTENT,
+        label: '/rvry — reflective answering',
     },
     {
-        file: 'think.md',
-        content: `${THINK_DEPRECATION_LINE}\n\n${RVRY_SHIM_CONTENT}`,
-        label: '/think — renamed to /rvry (deprecated alias)',
+        file: 'think-model.md',
+        content: THINK_MODEL_SHIM_CONTENT,
+        label: '/think-model — apply one named mental model',
     },
     {
         file: 'challenge.md',
@@ -759,6 +776,21 @@ function installSlashCommands(commandsDir) {
                 : `  Installed ${cmd.file}`);
             installed.push(cmd.label);
         }
+        // Retire command files from earlier surface names. Content is preserved
+        // as .bak; the live command is removed so a stale /shimmer or /rvry-model
+        // no longer points at a tool this server does not expose.
+        const retiredCommands = {
+            'shimmer.md': '/rvry',
+            'rvry-model.md': '/think-model',
+        };
+        for (const [retired, replacement] of Object.entries(retiredCommands)) {
+            const filePath = join(commandsDir, retired);
+            if (existsSync(filePath)) {
+                writeFileSync(`${filePath}.bak`, readFileSync(filePath, 'utf-8'), 'utf-8');
+                unlinkSync(filePath);
+                console.log(`  Removed ${retired} (replaced by ${replacement}; backed up to ${retired}.bak)`);
+            }
+        }
     }
     catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
@@ -767,7 +799,7 @@ function installSlashCommands(commandsDir) {
     return installed;
 }
 // Exported for tests (content + install behavior).
-export { SLASH_COMMANDS, installSlashCommands, RVRY_SHIM_CONTENT, SHIMMER_SHIM_CONTENT, THINK_DEPRECATION_LINE };
+export { SLASH_COMMANDS, installSlashCommands, THINK_SHIM_CONTENT, RVRY_SHIM_CONTENT, THINK_MODEL_SHIM_CONTENT };
 // ── Main setup flow ────────────────────────────────────────────────
 const BANNER = `
 8888888b.  888     888 8888888b. Y88b   d88P

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rvry/mcp",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "RVRY reasoning depth enforcement (RDE) engine client.",
   "type": "module",
   "bin": {