feat(tools): inject current model info into slashcommand and skill output

- Add setSessionModel/getSessionModel to session state
- Store model info from chat.message hook
- Display **Current Model**: provider/modelID in command/skill output

Author: Max_Pro

src/features/claude-code-session-state/state.ts

@@ -14,16 +14,31 @@ export function getMainSessionID(): string | undefined {
 export function _resetForTesting(): void {
   _mainSessionID = undefined
   subagentSessions.clear()
+  sessionAgentMap.clear()
+  sessionModelMap.clear()
 }
 
 const sessionAgentMap = new Map<string, string>()
+const sessionModelMap = new Map<string, { providerID: string; modelID: string }>()
 
 export function setSessionAgent(sessionID: string, agent: string): void {
   if (!sessionAgentMap.has(sessionID)) {
     sessionAgentMap.set(sessionID, agent)
   }
 }
 
+export function setSessionModel(sessionID: string, model: { providerID: string; modelID: string }): void {
+  sessionModelMap.set(sessionID, model)
+}
+
+export function getSessionModel(sessionID: string): { providerID: string; modelID: string } | undefined {
+  return sessionModelMap.get(sessionID)
+}
+
+export function clearSessionModel(sessionID: string): void {
+  sessionModelMap.delete(sessionID)
+}
+
 export function updateSessionAgent(sessionID: string, agent: string): void {
   sessionAgentMap.set(sessionID, agent)
 }

src/index.ts

@@ -54,6 +54,8 @@ import {
   setMainSession,
   getMainSessionID,
   setSessionAgent,
+  setSessionModel,
+  getSessionModel,
   updateSessionAgent,
   clearSessionAgent,
 } from "./features/claude-code-session-state";
@@ -380,7 +382,13 @@ const OhMyOpenCodePlugin: Plugin = async (ctx) => {
         setSessionAgent(input.sessionID, input.agent);
       }
 
-      const message = (output as { message: { variant?: string } }).message
+      const message = (output as { message: { variant?: string; model?: { providerID?: string; modelID?: string } } }).message
+      if (message.model?.providerID && message.model?.modelID) {
+        setSessionModel(input.sessionID, {
+          providerID: message.model.providerID,
+          modelID: message.model.modelID,
+        });
+      }
       if (firstMessageVariantGate.shouldOverride(input.sessionID)) {
         const variant = resolveAgentVariant(pluginConfig, input.agent)
         if (variant !== undefined) {

src/tools/skill/tools.ts

@@ -5,6 +5,7 @@ import type { SkillArgs, SkillInfo, SkillLoadOptions } from "./types"
 import type { LoadedSkill } from "../../features/opencode-skill-loader"
 import { getAllSkills, extractSkillTemplate } from "../../features/opencode-skill-loader/skill-content"
 import { injectGitMasterConfig } from "../../features/opencode-skill-loader/skill-content"
+import { getSessionModel } from "../../features/claude-code-session-state"
 import type { SkillMcpManager, SkillMcpClientInfo, SkillMcpServerContext } from "../../features/skill-mcp-manager"
 import type { Tool, Resource, Prompt } from "@modelcontextprotocol/sdk/types.js"
 
@@ -163,7 +164,7 @@ export function createSkillTool(options: SkillLoadOptions = {}): ToolDefinition
     args: {
       name: tool.schema.string().describe("The skill identifier from available_skills (e.g., 'code-review')"),
     },
-    async execute(args: SkillArgs, ctx?: { agent?: string }) {
+    async execute(args: SkillArgs, ctx?: { agent?: string; sessionID?: string }) {
       const skills = await getSkills()
       const skill = skills.find(s => s.name === args.name)
 
@@ -183,11 +184,13 @@ export function createSkillTool(options: SkillLoadOptions = {}): ToolDefinition
       }
 
       const dir = skill.path ? dirname(skill.path) : skill.resolvedPath || process.cwd()
+      const currentModel = ctx?.sessionID ? getSessionModel(ctx.sessionID) : undefined
 
       const output = [
         `## Skill: ${skill.name}`,
         "",
         `**Base directory**: ${dir}`,
+        ...(currentModel ? [`**Current Model**: ${currentModel.providerID}/${currentModel.modelID}`] : []),
         "",
         body,
       ]

src/tools/slashcommand/tools.ts

@@ -7,6 +7,7 @@ import { isMarkdownFile } from "../../shared/file-utils"
 import { getClaudeConfigDir } from "../../shared"
 import { discoverAllSkills, type LoadedSkill } from "../../features/opencode-skill-loader"
 import { loadBuiltinCommands } from "../../features/builtin-commands"
+import { getSessionModel } from "../../features/claude-code-session-state"
 import type { CommandScope, CommandMetadata, CommandInfo, SlashcommandToolOptions } from "./types"
 
 function discoverCommandsFromDir(commandsDir: string, scope: CommandScope): CommandInfo[] {
@@ -100,7 +101,12 @@ function skillToCommandInfo(skill: LoadedSkill): CommandInfo {
   }
 }
 
-async function formatLoadedCommand(cmd: CommandInfo): Promise<string> {
+interface CurrentModelInfo {
+  providerID: string
+  modelID: string
+}
+
+async function formatLoadedCommand(cmd: CommandInfo, currentModel?: CurrentModelInfo): Promise<string> {
   const sections: string[] = []
 
   sections.push(`# /${cmd.name} Command\n`)
@@ -126,6 +132,11 @@ async function formatLoadedCommand(cmd: CommandInfo): Promise<string> {
   }
 
   sections.push(`**Scope**: ${cmd.scope}\n`)
+  
+  if (currentModel) {
+    sections.push(`**Current Model**: ${currentModel.providerID}/${currentModel.modelID}\n`)
+  }
+  
   sections.push("---\n")
   sections.push("## Command Instructions\n")
 
@@ -230,7 +241,7 @@ export function createSlashcommandTool(options: SlashcommandToolOptions = {}): T
         ),
     },
 
-    async execute(args) {
+    async execute(args, ctx) {
       const allItems = await getAllItems()
 
       if (!args.command) {
@@ -244,7 +255,8 @@ export function createSlashcommandTool(options: SlashcommandToolOptions = {}): T
       )
 
       if (exactMatch) {
-        return await formatLoadedCommand(exactMatch)
+        const currentModel = ctx?.sessionID ? getSessionModel(ctx.sessionID) : undefined
+        return await formatLoadedCommand(exactMatch, currentModel)
       }
 
       const partialMatches = allItems.filter((cmd) =>