@adversity/coding-tool-x 3.0.6 → 3.1.1

package/src/server/services/codex-settings-manager.js

@@ -2,6 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const toml = require('toml');
+const tomlStringify = require('@iarna/toml').stringify;
 
 // Codex 配置文件路径
 function getConfigPath() {
@@ -35,6 +36,167 @@ function hasBackup() {
   return fs.existsSync(getConfigBackupPath()) || fs.existsSync(getAuthBackupPath());
 }
 
+const INVALID_ENV_NAME_PATTERN = /[\r\n]/;
+const SHELL_MARKER_PREFIX = '# Added by Coding-Tool for Codex';
+
+function normalizeEnvName(envName) {
+  const normalized = String(envName || '').trim();
+  if (!normalized || INVALID_ENV_NAME_PATTERN.test(normalized)) {
+    return null;
+  }
+  return normalized;
+}
+
+function ensureParentDir(filePath) {
+  const dirPath = path.dirname(filePath);
+  if (!fs.existsSync(dirPath)) {
+    fs.mkdirSync(dirPath, { recursive: true });
+  }
+}
+
+function writeFileAtomic(filePath, content) {
+  ensureParentDir(filePath);
+  const tempPath = `${filePath}.tmp-${process.pid}-${Date.now()}`;
+
+  try {
+    fs.writeFileSync(tempPath, content, 'utf8');
+    fs.renameSync(tempPath, filePath);
+  } finally {
+    if (fs.existsSync(tempPath)) {
+      try {
+        fs.unlinkSync(tempPath);
+      } catch (cleanupErr) {
+        // ignore cleanup errors
+      }
+    }
+  }
+}
+
+function normalizeHomePath(filePath) {
+  const normalizedPath = String(filePath || '').replace(/\\/g, '/');
+  const normalizedHome = os.homedir().replace(/\\/g, '/');
+  if (normalizedPath.startsWith(normalizedHome)) {
+    return `~${normalizedPath.slice(normalizedHome.length)}`;
+  }
+  return filePath;
+}
+
+function compactBlankLines(lines) {
+  const compacted = [];
+  let previousIsBlank = false;
+
+  for (const line of lines) {
+    const isBlank = line.trim() === '';
+    if (isBlank) {
+      if (!previousIsBlank) {
+        compacted.push('');
+      }
+      previousIsBlank = true;
+      continue;
+    }
+
+    compacted.push(line);
+    previousIsBlank = false;
+  }
+
+  while (compacted.length > 0 && compacted[compacted.length - 1].trim() === '') {
+    compacted.pop();
+  }
+
+  return compacted;
+}
+
+function isPowerShellProfile(filePath) {
+  return String(filePath || '').toLowerCase().endsWith('.ps1');
+}
+
+function getShellConfigCandidates() {
+  const homeDir = os.homedir();
+  const shell = String(process.env.SHELL || '').toLowerCase();
+  const candidates = [];
+
+  if (process.platform === 'win32') {
+    if (shell.includes('zsh')) {
+      candidates.push(path.join(homeDir, '.zshrc'));
+    }
+
+    if (shell.includes('bash')) {
+      candidates.push(path.join(homeDir, '.bashrc'));
+      candidates.push(path.join(homeDir, '.bash_profile'));
+    }
+
+    candidates.push(path.join(homeDir, 'Documents', 'PowerShell', 'Microsoft.PowerShell_profile.ps1'));
+    candidates.push(path.join(homeDir, 'Documents', 'WindowsPowerShell', 'Microsoft.PowerShell_profile.ps1'));
+    candidates.push(path.join(homeDir, '.bashrc'));
+    candidates.push(path.join(homeDir, '.profile'));
+  } else if (shell.includes('zsh')) {
+    candidates.push(path.join(homeDir, '.zshrc'));
+    candidates.push(path.join(homeDir, '.zprofile'));
+    candidates.push(path.join(homeDir, '.profile'));
+  } else if (shell.includes('bash')) {
+    if (process.platform === 'darwin') {
+      candidates.push(path.join(homeDir, '.bash_profile'));
+      candidates.push(path.join(homeDir, '.bashrc'));
+    } else {
+      candidates.push(path.join(homeDir, '.bashrc'));
+      candidates.push(path.join(homeDir, '.bash_profile'));
+    }
+    candidates.push(path.join(homeDir, '.profile'));
+  } else {
+    candidates.push(path.join(homeDir, '.zshrc'));
+    candidates.push(path.join(homeDir, '.bashrc'));
+    candidates.push(path.join(homeDir, '.bash_profile'));
+    candidates.push(path.join(homeDir, '.profile'));
+  }
+
+  return [...new Set(candidates)];
+}
+
+function getShellReloadCommand(configPath) {
+  if (!configPath) {
+    return process.platform === 'win32' ? '重启终端' : 'source ~/.zshrc';
+  }
+
+  const displayPath = normalizeHomePath(configPath);
+  const normalized = String(displayPath || '').replace(/\\/g, '/').toLowerCase();
+
+  if (normalized.endsWith('microsoft.powershell_profile.ps1')) {
+    return '. $PROFILE';
+  }
+  if (normalized.endsWith('/.zshrc')) {
+    return 'source ~/.zshrc';
+  }
+  if (normalized.endsWith('/.bash_profile')) {
+    return 'source ~/.bash_profile';
+  }
+  if (normalized.endsWith('/.bashrc')) {
+    return 'source ~/.bashrc';
+  }
+  if (normalized.endsWith('/.profile')) {
+    return 'source ~/.profile';
+  }
+
+  if (process.platform === 'win32') {
+    return '. $PROFILE';
+  }
+
+  return `source ${displayPath}`;
+}
+
+function escapeShellValue(value) {
+  return String(value ?? '')
+    .replace(/\\/g, '\\\\')
+    .replace(/"/g, '\\"')
+    .replace(/\$/g, '\\$')
+    .replace(/`/g, '\\`');
+}
+
+function escapePowerShellValue(value) {
+  return String(value ?? '')
+    .replace(/`/g, '``')
+    .replace(/"/g, '`"');
+}
+
 // 读取 config.toml
 function readConfig() {
   try {
@@ -89,7 +251,8 @@ function configToToml(config) {
 // 写入 config.toml
 function writeConfig(config) {
   try {
-    const content = configToToml(config);
+    const safeConfig = JSON.parse(JSON.stringify(config || {}));
+    const content = tomlStringify(safeConfig);
     fs.writeFileSync(getConfigPath(), content, 'utf8');
   } catch (err) {
     throw new Error('Failed to write config.toml: ' + err.message);
@@ -182,28 +345,28 @@ function restoreSettings() {
 
 // 获取用户的 shell 配置文件路径
 function getShellConfigPath() {
-  const shell = process.env.SHELL || '';
-  if (shell.includes('zsh')) {
-    return path.join(os.homedir(), '.zshrc');
-  } else if (shell.includes('bash')) {
-    // macOS 使用 .bash_profile，Linux 使用 .bashrc
-    const bashProfile = path.join(os.homedir(), '.bash_profile');
-    const bashrc = path.join(os.homedir(), '.bashrc');
-    if (fs.existsSync(bashProfile)) {
-      return bashProfile;
-    }
-    return bashrc;
-  }
-  // 默认使用 .zshrc (macOS 默认)
-  return path.join(os.homedir(), '.zshrc');
+  const candidates = getShellConfigCandidates();
+  const existing = candidates.find(filePath => fs.existsSync(filePath));
+  return existing || candidates[0];
 }
 
 // 注入环境变量到 shell 配置文件
 function injectEnvToShell(envName, envValue) {
+  const normalizedEnvName = normalizeEnvName(envName);
+  if (!normalizedEnvName) {
+    return {
+      success: false,
+      error: `Invalid environment variable name: ${envName}`,
+      isFirstTime: false
+    };
+  }
+
   const configPath = getShellConfigPath();
-  const exportLine = `export ${envName}="${envValue}"`;
-  // 使用更具体的标记，包含环境变量名，方便后续精确移除
-  const marker = `# Added by Coding-Tool for Codex [${envName}]`;
+  const marker = `${SHELL_MARKER_PREFIX} [${normalizedEnvName}]`;
+  const usePowerShell = isPowerShellProfile(configPath);
+  const exportLine = usePowerShell
+    ? `$env:${normalizedEnvName} = "${escapePowerShellValue(envValue)}"`
+    : `export ${normalizedEnvName}="${escapeShellValue(envValue)}"`;
 
   try {
     let content = '';
@@ -211,23 +374,52 @@ function injectEnvToShell(envName, envValue) {
       content = fs.readFileSync(configPath, 'utf8');
     }
 
-    // 检查是否已经存在这个环境变量配置
-    const regex = new RegExp(`^export ${envName}=`, 'm');
-    const alreadyExists = regex.test(content);
+    const envKeyEscaped = String(normalizedEnvName).replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    const envLineRegex = usePowerShell
+      ? new RegExp(`^\\s*\\$env:${envKeyEscaped}\\s*=`, 'i')
+      : new RegExp(`^\\s*(?:export\\s+)?${envKeyEscaped}=`);
 
-    if (alreadyExists) {
-      // 已存在，替换它（保留原有的标记注释）
-      content = content.replace(
-        new RegExp(`^(# Added by Coding-Tool for Codex \\[${envName}\\]\n)?export ${envName}=.*$`, 'm'),
-        `${marker}\n${exportLine}`
-      );
-    } else {
-      // 不存在，追加到文件末尾
-      content = content.trimEnd() + `\n\n${marker}\n${exportLine}\n`;
+    const originalLines = content ? content.split(/\r?\n/) : [];
+    const cleanedLines = [];
+    let existed = false;
+
+    for (let i = 0; i < originalLines.length; i++) {
+      const currentLine = originalLines[i];
+      const trimmedLine = currentLine.trim();
+
+      if (trimmedLine === marker) {
+        const nextLine = originalLines[i + 1] || '';
+        if (envLineRegex.test(nextLine.trim())) {
+          i += 1;
+        }
+        existed = true;
+        continue;
+      }
+
+      if (envLineRegex.test(trimmedLine)) {
+        existed = true;
+        continue;
+      }
+
+      cleanedLines.push(currentLine);
+    }
+
+    while (cleanedLines.length > 0 && cleanedLines[cleanedLines.length - 1].trim() === '') {
+      cleanedLines.pop();
+    }
+
+    if (cleanedLines.length > 0) {
+      cleanedLines.push('');
+    }
+
+    cleanedLines.push(marker, exportLine);
+
+    const nextContent = `${cleanedLines.join('\n')}\n`;
+    if (nextContent !== content) {
+      writeFileAtomic(configPath, nextContent);
     }
 
-    fs.writeFileSync(configPath, content, 'utf8');
-    return { success: true, path: configPath, isFirstTime: !alreadyExists };
+    return { success: true, path: configPath, isFirstTime: !existed };
   } catch (err) {
     // 不抛出错误，只是警告，因为这不是致命问题
     console.warn(`[Codex] Failed to inject env to shell config: ${err.message}`);
@@ -237,6 +429,14 @@ function injectEnvToShell(envName, envValue) {
 
 // 从 shell 配置文件移除环境变量
 function removeEnvFromShell(envName) {
+  const normalizedEnvName = normalizeEnvName(envName);
+  if (!normalizedEnvName) {
+    return {
+      success: false,
+      error: `Invalid environment variable name: ${envName}`
+    };
+  }
+
   const configPath = getShellConfigPath();
 
   try {
@@ -244,24 +444,46 @@ function removeEnvFromShell(envName) {
       return { success: true };
     }
 
-    let content = fs.readFileSync(configPath, 'utf8');
+    const content = fs.readFileSync(configPath, 'utf8');
+    const usePowerShell = isPowerShellProfile(configPath);
+    const marker = `${SHELL_MARKER_PREFIX} [${normalizedEnvName}]`;
+    const envKeyEscaped = String(normalizedEnvName).replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    const envLineRegex = usePowerShell
+      ? new RegExp(`^\\s*\\$env:${envKeyEscaped}\\s*=`, 'i')
+      : new RegExp(`^\\s*(?:export\\s+)?${envKeyEscaped}=`);
+
+    const originalLines = content ? content.split(/\r?\n/) : [];
+    const cleanedLines = [];
+    let changed = false;
+
+    for (let i = 0; i < originalLines.length; i++) {
+      const currentLine = originalLines[i];
+      const trimmedLine = currentLine.trim();
+
+      if (trimmedLine === marker) {
+        const nextLine = originalLines[i + 1] || '';
+        if (envLineRegex.test(nextLine.trim())) {
+          i += 1;
+        }
+        changed = true;
+        continue;
+      }
 
-    // 移除具体标记的环境变量（推荐方式）
-    content = content.replace(
-      new RegExp(`\\n?# Added by Coding-Tool for Codex \\[${envName}\\]\\nexport ${envName}=.*\\n?`, 'g'),
-      '\n'
-    );
+      if (envLineRegex.test(trimmedLine)) {
+        changed = true;
+        continue;
+      }
 
-    // 如果没有标记，也尝试移除（兼容旧数据）
-    content = content.replace(
-      new RegExp(`^export ${envName}=.*\\n?`, 'gm'),
-      ''
-    );
+      cleanedLines.push(currentLine);
+    }
 
-    // 清理多余的空行
-    content = content.replace(/\n\n\n+/g, '\n\n');
+    if (!changed) {
+      return { success: true };
+    }
 
-    fs.writeFileSync(configPath, content, 'utf8');
+    const normalized = compactBlankLines(cleanedLines);
+    const nextContent = normalized.length > 0 ? `${normalized.join('\n')}\n` : '';
+    writeFileAtomic(configPath, nextContent);
     return { success: true };
   } catch (err) {
     console.warn(`[Codex] Failed to remove env from shell config: ${err.message}`);
@@ -306,8 +528,8 @@ function setProxyConfig(proxyPort) {
     const shellInjectResult = injectEnvToShell('CC_PROXY_KEY', 'PROXY_KEY');
 
     // 获取 shell 配置文件路径用于提示信息
-    const shellConfigPath = getShellConfigPath();
-    const sourceCommand = process.env.SHELL?.includes('zsh') ? 'source ~/.zshrc' : 'source ~/.bashrc';
+    const shellConfigPath = shellInjectResult.path || getShellConfigPath();
+    const sourceCommand = getShellReloadCommand(shellConfigPath);
 
     console.log(`Codex settings updated to use proxy on port ${proxyPort}`);
     return {
@@ -341,7 +563,7 @@ function isProxyConfig() {
     const currentProvider = config.model_provider;
     if (currentProvider && config.model_providers && config.model_providers[currentProvider]) {
       const baseUrl = config.model_providers[currentProvider].base_url || '';
-      if (baseUrl.includes('127.0.0.1') && baseUrl.includes('10089')) {
+      if (baseUrl.includes('127.0.0.1') || baseUrl.includes('localhost')) {
         return true;
       }
     }

package/src/server/services/codex-statistics-service.js

@@ -6,7 +6,7 @@ const os = require('os');
  * Codex 统计服务 - 数据采集和存储
  *
  * 文件结构：
- * ~/.claude/cc-tool/
+ * ~/.cc-tool/
  *   ├── codex-statistics.json         # Codex 总体统计
  *   └── codex-daily-stats/
  *       ├── 2025-12-05.json           # 每日汇总统计
@@ -15,7 +15,7 @@ const os = require('os');
 
 // 获取基础目录
 function getBaseDir() {
-  const dir = path.join(os.homedir(), '.claude', 'cc-tool');
+  const dir = path.join(os.homedir(), '.cc-tool');
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }

package/src/server/services/commands-service.js

@@ -1,11 +1,7 @@
 /**
  * Commands 服务
  *
- * 管理 Claude Code 自定义命令的 CRUD 操作
- * 命令目录:
- * - 用户级: ~/.claude/commands/
- * - 项目级: .claude/commands/
- *
+ * 管理 Claude/OpenCode 自定义命令的 CRUD 操作
  * 支持从 GitHub 仓库扫描和安装命令
  */
 
@@ -13,6 +9,7 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const { RepoScannerBase } = require('./repo-scanner-base');
+const { NATIVE_PATHS } = require('../../config/paths');
 const {
   parseCommandContent,
   detectCommandFormat,
@@ -21,11 +18,35 @@ const {
   parseFrontmatter
 } = require('./format-converter');
 
-// 命令目录路径
-const USER_COMMANDS_DIR = path.join(os.homedir(), '.claude', 'commands');
-
 // 默认仓库源
 const DEFAULT_REPOS = [];
+const SUPPORTED_PLATFORMS = ['claude', 'opencode'];
+const OPENCODE_CONFIG_DIR = NATIVE_PATHS.opencode.config;
+
+const PLATFORM_CONFIG = {
+  claude: {
+    userCommandsDir: path.join(os.homedir(), '.claude', 'commands'),
+    projectCommandsDir: (projectPath) => path.join(projectPath, '.claude', 'commands'),
+    repoType: 'commands'
+  },
+  opencode: {
+    userCommandsDir: path.join(OPENCODE_CONFIG_DIR, 'commands'),
+    legacyUserCommandsDir: path.join(OPENCODE_CONFIG_DIR, 'command'),
+    projectCommandsDir: (projectPath) => {
+      const modern = path.join(projectPath, '.opencode', 'commands');
+      const legacy = path.join(projectPath, '.opencode', 'command');
+      if (fs.existsSync(legacy) && !fs.existsSync(modern)) {
+        return legacy;
+      }
+      return modern;
+    },
+    repoType: 'opencode-commands'
+  }
+};
+
+function normalizePlatform(platform) {
+  return SUPPORTED_PLATFORMS.includes(platform) ? platform : 'claude';
+}
 
 /**
  * 确保目录存在
@@ -60,6 +81,9 @@ function generateCommandFrontmatter(data) {
   if (data.agent) {
     lines.push(`agent: ${data.agent}`);
   }
+  if (typeof data.subtask === 'boolean') {
+    lines.push(`subtask: ${data.subtask}`);
+  }
 
   lines.push('---');
   return lines.join('\n');
@@ -105,6 +129,9 @@ function scanCommandsDir(dir, basePath, scope) {
             description: frontmatter.description || '',
             allowedTools: frontmatter['allowed-tools'] || '',
             argumentHint: frontmatter['argument-hint'] || '',
+            agent: frontmatter.agent || '',
+            model: frontmatter.model || '',
+            subtask: frontmatter.subtask || '',
             body,
             fullContent: content,
             updatedAt: fs.statSync(fullPath).mtime.getTime()
@@ -125,10 +152,10 @@ function scanCommandsDir(dir, basePath, scope) {
  * Commands 仓库扫描器
  */
 class CommandsRepoScanner extends RepoScannerBase {
-  constructor() {
+  constructor(platform, installDir) {
     super({
-      type: 'commands',
-      installDir: USER_COMMANDS_DIR,
+      type: PLATFORM_CONFIG[platform]?.repoType || 'commands',
+      installDir,
       markerFile: null, // 直接扫描 .md 文件
       fileExtension: '.md',
       defaultRepos: DEFAULT_REPOS
@@ -159,6 +186,9 @@ class CommandsRepoScanner extends RepoScannerBase {
         description: frontmatter.description || '',
         allowedTools: frontmatter['allowed-tools'] || '',
         argumentHint: frontmatter['argument-hint'] || '',
+        agent: frontmatter.agent || '',
+        model: frontmatter.model || '',
+        subtask: frontmatter.subtask || '',
         body,
         fullContent: content,
         installed: this.isInstalled(relativePath),
@@ -208,12 +238,28 @@ class CommandsRepoScanner extends RepoScannerBase {
  * Commands 服务类
  */
 class CommandsService {
-  constructor() {
-    this.userCommandsDir = USER_COMMANDS_DIR;
-    this.repoScanner = new CommandsRepoScanner();
+  constructor(platform = 'claude') {
+    this.platform = normalizePlatform(platform);
+    const config = PLATFORM_CONFIG[this.platform];
+
+    this.userCommandsDir = config.userCommandsDir;
+    if (this.platform === 'opencode') {
+      const legacyUserDir = config.legacyUserCommandsDir;
+      if (legacyUserDir && fs.existsSync(legacyUserDir) && !fs.existsSync(this.userCommandsDir)) {
+        this.userCommandsDir = legacyUserDir;
+      }
+    }
+
+    this.projectCommandsDir = config.projectCommandsDir;
+    this.repoScanner = new CommandsRepoScanner(this.platform, this.userCommandsDir);
     ensureDir(this.userCommandsDir);
   }
 
+  getProjectCommandsDir(projectPath) {
+    if (!projectPath) return null;
+    return this.projectCommandsDir(projectPath);
+  }
+
   /**
    * 获取所有命令列表
    * @param {string} projectPath - 项目路径（可选，用于获取项目级命令）
@@ -227,7 +273,7 @@ class CommandsService {
 
     // 获取项目级命令（如果提供了项目路径）
     if (projectPath) {
-      const projectCommandsDir = path.join(projectPath, '.claude', 'commands');
+      const projectCommandsDir = this.getProjectCommandsDir(projectPath);
       const projectCommands = scanCommandsDir(projectCommandsDir, projectCommandsDir, 'project');
       commands.push(...projectCommands);
     }
@@ -295,7 +341,7 @@ class CommandsService {
   getCommand(name, scope, projectPath = null, namespace = null) {
     const baseDir = scope === 'user'
       ? this.userCommandsDir
-      : path.join(projectPath, '.claude', 'commands');
+      : this.getProjectCommandsDir(projectPath);
 
     const relativePath = namespace
       ? path.join(namespace, `${name}.md`)
@@ -319,6 +365,9 @@ class CommandsService {
       description: frontmatter.description || '',
       allowedTools: frontmatter['allowed-tools'] || '',
       argumentHint: frontmatter['argument-hint'] || '',
+      agent: frontmatter.agent || '',
+      model: frontmatter.model || '',
+      subtask: frontmatter.subtask || '',
       body,
       fullContent: content,
       updatedAt: fs.statSync(fullPath).mtime.getTime()
@@ -328,7 +377,7 @@ class CommandsService {
   /**
    * 创建命令
    */
-  createCommand({ name, scope, projectPath, namespace, description, allowedTools, argumentHint, body }) {
+  createCommand({ name, scope, projectPath, namespace, description, allowedTools, argumentHint, agent, model, subtask, body }) {
     if (!name || !name.trim()) {
       throw new Error('命令名称不能为空');
     }
@@ -340,7 +389,7 @@ class CommandsService {
 
     const baseDir = scope === 'user'
       ? this.userCommandsDir
-      : path.join(projectPath, '.claude', 'commands');
+      : this.getProjectCommandsDir(projectPath);
 
     const targetDir = namespace ? path.join(baseDir, namespace) : baseDir;
     ensureDir(targetDir);
@@ -355,8 +404,13 @@ class CommandsService {
     // 生成文件内容
     const frontmatterData = {};
     if (description) frontmatterData.description = description;
-    if (allowedTools) frontmatterData['allowed-tools'] = allowedTools;
-    if (argumentHint) frontmatterData['argument-hint'] = argumentHint;
+    if (this.platform !== 'opencode') {
+      if (allowedTools) frontmatterData['allowed-tools'] = allowedTools;
+      if (argumentHint) frontmatterData['argument-hint'] = argumentHint;
+    }
+    if (agent) frontmatterData.agent = agent;
+    if (model) frontmatterData.model = model;
+    if (typeof subtask === 'boolean') frontmatterData.subtask = subtask;
 
     let content = '';
     if (Object.keys(frontmatterData).length > 0) {
@@ -372,10 +426,10 @@ class CommandsService {
   /**
    * 更新命令
    */
-  updateCommand({ name, scope, projectPath, namespace, description, allowedTools, argumentHint, body }) {
+  updateCommand({ name, scope, projectPath, namespace, description, allowedTools, argumentHint, agent, model, subtask, body }) {
     const baseDir = scope === 'user'
       ? this.userCommandsDir
-      : path.join(projectPath, '.claude', 'commands');
+      : this.getProjectCommandsDir(projectPath);
 
     const relativePath = namespace
       ? path.join(namespace, `${name}.md`)
@@ -390,8 +444,13 @@ class CommandsService {
     // 生成文件内容
     const frontmatterData = {};
     if (description) frontmatterData.description = description;
-    if (allowedTools) frontmatterData['allowed-tools'] = allowedTools;
-    if (argumentHint) frontmatterData['argument-hint'] = argumentHint;
+    if (this.platform !== 'opencode') {
+      if (allowedTools) frontmatterData['allowed-tools'] = allowedTools;
+      if (argumentHint) frontmatterData['argument-hint'] = argumentHint;
+    }
+    if (agent) frontmatterData.agent = agent;
+    if (model) frontmatterData.model = model;
+    if (typeof subtask === 'boolean') frontmatterData.subtask = subtask;
 
     let content = '';
     if (Object.keys(frontmatterData).length > 0) {
@@ -410,7 +469,7 @@ class CommandsService {
   deleteCommand(name, scope, projectPath = null, namespace = null) {
     const baseDir = scope === 'user'
       ? this.userCommandsDir
-      : path.join(projectPath, '.claude', 'commands');
+      : this.getProjectCommandsDir(projectPath);
 
     const relativePath = namespace
       ? path.join(namespace, `${name}.md`)