kspec 1.0.26 → 1.0.29

package/README.md

@@ -181,47 +181,29 @@ kspec is designed for team collaboration. Most files should be committed to shar
 
 ### Setting Up MCP for Teams
 
-**Problem**: API tokens should never be committed, but teams need consistent MCP configuration.
-
-**Solution**: Use environment variables with a committed template.
-
-1. Commit a template file (`.kiro/mcp.json.template`):
-   ```json
-   {
-     "mcpServers": {
-       "atlassian": {
-         "command": "npx",
-         "args": ["-y", "@anthropic/mcp-atlassian"],
-         "env": {
-           "ATLASSIAN_HOST": "${ATLASSIAN_HOST}",
-           "ATLASSIAN_EMAIL": "${ATLASSIAN_EMAIL}",
-           "ATLASSIAN_API_TOKEN": "${ATLASSIAN_API_TOKEN}"
-         }
-       }
-     }
-   }
-   ```
-
-2. Each team member creates their personal config:
-   ```bash
-   # Copy template to home directory
-   mkdir -p ~/.kiro && chmod 700 ~/.kiro
-   cp .kiro/mcp.json.template ~/.kiro/mcp.json
-   chmod 600 ~/.kiro/mcp.json
-
-   # Edit with real credentials
-   nano ~/.kiro/mcp.json
-   ```
-
-3. Or use environment variables directly:
-   ```bash
-   # Add to ~/.bashrc or ~/.zshrc
-   export ATLASSIAN_HOST="https://your-domain.atlassian.net"
-   export ATLASSIAN_EMAIL="your-email@example.com"
-   export ATLASSIAN_API_TOKEN="your-api-token"
-   ```
-
-See [SECURITY.md](SECURITY.md) for detailed security best practices.
+`kspec init` creates `.kiro/mcp.json.template` which uses mcp-remote with OAuth (no API tokens needed):
+
+```json
+{
+  "mcpServers": {
+    "atlassian": {
+      "command": "npx",
+      "args": ["-y", "mcp-remote", "https://mcp.atlassian.com/v1/sse"],
+      "timeout": 120000
+    }
+  }
+}
+```
+
+Each team member copies to their settings:
+```bash
+mkdir -p ~/.kiro/settings
+cp .kiro/mcp.json.template ~/.kiro/settings/mcp.json
+```
+
+Or add via CLI: `kiro-cli mcp add --name atlassian`
+
+See [SECURITY.md](SECURITY.md) for security best practices.
 
 ## Jira Integration
 
@@ -254,37 +236,32 @@ Generate Jira subtasks from tasks.md for progress tracking.
 
 ### Prerequisites
 
-`kspec init` creates `.kiro/mcp.json.template` automatically. To enable Jira integration:
+Configure Atlassian MCP using one of these methods:
 
+**Option 1: Use kiro-cli** (recommended)
 ```bash
-# Copy template to your home directory (keeps secrets out of repo)
-mkdir -p ~/.kiro && chmod 700 ~/.kiro
-cp .kiro/mcp.json.template ~/.kiro/mcp.json
-chmod 600 ~/.kiro/mcp.json
-
-# Edit with your real credentials
-nano ~/.kiro/mcp.json
+kiro-cli mcp add --name atlassian
 ```
 
-Replace the `${...}` placeholders with your actual values:
+**Option 2: Manual configuration**
+
+Add to `.kiro/settings/mcp.json` (workspace) or `~/.kiro/settings/mcp.json` (user):
 
 ```json
 {
   "mcpServers": {
     "atlassian": {
       "command": "npx",
-      "args": ["-y", "@anthropic/mcp-atlassian"],
-      "env": {
-        "ATLASSIAN_HOST": "https://your-domain.atlassian.net",
-        "ATLASSIAN_EMAIL": "your-email@example.com",
-        "ATLASSIAN_API_TOKEN": "your-api-token"
-      }
+      "args": ["-y", "mcp-remote", "https://mcp.atlassian.com/v1/sse"],
+      "timeout": 120000
     }
   }
 }
 ```
 
-Get your API token: https://id.atlassian.com/manage-profile/security/api-tokens
+Or add via CLI: `kiro-cli mcp add --name atlassian`
+
+See: https://kiro.dev/docs/cli/mcp/
 
 See [Team Collaboration](#team-collaboration) for secure team setup with environment variables.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kspec",
-  "version": "1.0.26",
+  "version": "1.0.29",
   "description": "Spec-driven development workflow for Kiro CLI",
   "main": "src/index.js",
   "bin": {

package/src/index.js

@@ -9,7 +9,10 @@ const STEERING_DIR = '.kiro/steering';
 const AGENTS_DIR = '.kiro/agents';
 const CONFIG_FILE = path.join(KSPEC_DIR, 'config.json');
 const UPDATE_CHECK_FILE = path.join(os.homedir(), '.kspec-update-check');
-const KIRO_MCP_CONFIG = path.join(os.homedir(), '.kiro', 'mcp.json');
+const KIRO_MCP_CONFIG_USER = path.join(os.homedir(), '.kiro', 'settings', 'mcp.json');
+const KIRO_MCP_CONFIG_WORKSPACE = path.join('.kiro', 'settings', 'mcp.json');
+// Legacy path for backwards compatibility
+const KIRO_MCP_CONFIG_LEGACY = path.join(os.homedir(), '.kiro', 'mcp.json');
 
 // Default config
 const defaultConfig = {
@@ -95,11 +98,20 @@ async function checkForUpdates() {
 
 // MCP Integration Detection
 function getMcpConfig() {
-  try {
-    if (fs.existsSync(KIRO_MCP_CONFIG)) {
-      return JSON.parse(fs.readFileSync(KIRO_MCP_CONFIG, 'utf8'));
-    }
-  } catch {}
+  // Check in order: workspace, user, legacy
+  const configPaths = [
+    KIRO_MCP_CONFIG_WORKSPACE,
+    KIRO_MCP_CONFIG_USER,
+    KIRO_MCP_CONFIG_LEGACY
+  ];
+
+  for (const configPath of configPaths) {
+    try {
+      if (fs.existsSync(configPath)) {
+        return JSON.parse(fs.readFileSync(configPath, 'utf8'));
+      }
+    } catch {}
+  }
   return null;
 }
 
@@ -130,26 +142,24 @@ function requireAtlassianMcp() {
   if (!hasAtlassianMcp()) {
     die(`Atlassian MCP not configured.
 
-To use Jira integration, you need to:
-1. Install the Atlassian MCP server
-2. Configure it in ~/.kiro/mcp.json
+To use Jira integration, configure Atlassian MCP in one of these locations:
+- Workspace: .kiro/settings/mcp.json
+- User: ~/.kiro/settings/mcp.json
 
-Example ~/.kiro/mcp.json:
+Example configuration:
 {
   "mcpServers": {
     "atlassian": {
       "command": "npx",
-      "args": ["-y", "@anthropic/mcp-atlassian"],
-      "env": {
-        "ATLASSIAN_HOST": "https://your-domain.atlassian.net",
-        "ATLASSIAN_EMAIL": "your-email@example.com",
-        "ATLASSIAN_API_TOKEN": "your-api-token"
-      }
+      "args": ["-y", "mcp-remote", "https://mcp.atlassian.com/v1/sse"],
+      "timeout": 120000
     }
   }
 }
 
-Get your API token: https://id.atlassian.com/manage-profile/security/api-tokens`);
+Or run: kiro-cli mcp add --name atlassian
+
+See: https://kiro.dev/docs/cli/mcp/`);
   }
   return getAtlassianMcpName();
 }
@@ -809,8 +819,9 @@ Output: APPROVE / REQUEST_CHANGES with specific issues.`,
     name: 'kspec-jira',
     description: 'Jira integration for specs',
     model: 'claude-sonnet-4',
-    tools: ['read', 'write', 'mcp'],
-    allowedTools: ['read', 'write', 'mcp'],
+    tools: ['read', 'write', '@atlassian'],
+    allowedTools: ['read', 'write', '@atlassian'],
+    includeMcpJson: true,
     resources: [
       'file://.kspec/CONTEXT.md',
       'file://.kiro/steering/**/*.md',
@@ -908,7 +919,7 @@ const commands = {
       }
     }
 
-    // Create MCP template (safe to commit, no secrets)
+    // Create MCP template (safe to commit, uses OAuth via mcp-remote)
     const mcpTemplatePath = path.join('.kiro', 'mcp.json.template');
     if (!fs.existsSync(mcpTemplatePath)) {
       ensureDir('.kiro');
@@ -916,17 +927,13 @@ const commands = {
         mcpServers: {
           atlassian: {
             command: 'npx',
-            args: ['-y', '@anthropic/mcp-atlassian'],
-            env: {
-              ATLASSIAN_HOST: '${ATLASSIAN_HOST}',
-              ATLASSIAN_EMAIL: '${ATLASSIAN_EMAIL}',
-              ATLASSIAN_API_TOKEN: '${ATLASSIAN_API_TOKEN}'
-            }
+            args: ['-y', 'mcp-remote', 'https://mcp.atlassian.com/v1/sse'],
+            timeout: 120000
           }
         }
       };
       fs.writeFileSync(mcpTemplatePath, JSON.stringify(mcpTemplate, null, 2));
-      log(`Created ${mcpTemplatePath} (commit this, set env vars for secrets)`);
+      log(`Created ${mcpTemplatePath} (commit this, OAuth handles auth)`);
     }
 
     // Update .gitignore for kspec (append if exists, create if not)