sap-ai-dev-toolkit 0.7.4 → 0.7.8

package/README.md

@@ -15,7 +15,7 @@
 
 <p align="center">
   <img src="https://img.shields.io/badge/SAP-Business%20Application%20Studio-0A6ED1?style=flat-square&logo=sap&logoColor=white" alt="SAP Business Application Studio">
-  <img src="https://img.shields.io/badge/AI%20agents-Copilot%20%7C%20Claude%20%7C%20Codex%20%7C%20Cursor%20%7C%20Gemini%20%7C%20opencode-000000?style=flat-square" alt="Works with GitHub Copilot, Claude Code, OpenAI Codex, Cursor, Gemini CLI, and opencode">
+  <img src="https://img.shields.io/badge/AI%20agents-Copilot%20%7C%20Claude%20%7C%20Codex%20%7C%20Cursor%20%7C%20Gemini%20%7C%20opencode%20%7C%20Pi-000000?style=flat-square" alt="Works with GitHub Copilot, Claude Code, OpenAI Codex, Cursor, Gemini CLI, opencode, and Pi Coding Agent">
   <img src="https://img.shields.io/badge/MCP-enabled-7B61FF?style=flat-square" alt="MCP enabled">
   <img src="https://img.shields.io/badge/SAP%20ADT-connected-0A6ED1?style=flat-square&logo=sap&logoColor=white" alt="SAP ADT connected">
   <img src="https://img.shields.io/badge/ABAP-CDS%20%7C%20RAP-EA4AAA?style=flat-square" alt="ABAP CDS RAP">
@@ -57,7 +57,7 @@ Then connect a destination in SAP Business Application Studio:
 1. Open the Command Palette.
 2. Run **MCP: List Servers**.
 3. Start the server named after your selected BAS destination (the lowercase slug, for example `demo-abap` for destination `DEMO_ABAP`).
-4. In your AI assistant's chat, choose the best-fit bundled agent from the agent picker (GitHub Copilot, Claude Code, and opencode install the agents): **SAP Solution Architect**, **ABAP Developer**, **ABAP Runtime Debugger**, **RAP Service Developer**, or **HANA Cloud/HDI Specialist**.
+4. In your AI assistant's chat, choose the best-fit bundled agent from the agent picker (GitHub Copilot, Claude Code, and opencode install the agents) or invoke the matching Pi prompt template (`/sap-solution-architect`, `/abap-developer`, `/abap-runtime-debugger`, `/rap-service-developer`, or `/hana-cloud-hdi-specialist`): **SAP Solution Architect**, **ABAP Developer**, **ABAP Runtime Debugger**, **RAP Service Developer**, or **HANA Cloud/HDI Specialist**.
 5. In the Chat tools picker, enable the server for that BAS destination.
 6. Ask the agent to inspect, build, test, or verify something in your SAP landscape.
 
@@ -67,7 +67,7 @@ Use the attached destination-prefixed tools directly in chat. Do not launch `sap
 
 ## 🤖 Available agents and skills
 
-**Agents:** Five user-invocable custom agents are included. Select the best fit from the agent picker in your harness's chat (GitHub Copilot, Claude Code, or opencode), as shown in Quick start.
+**Agents:** Five user-invocable custom agents are included. Select the best fit from the agent picker in your harness's chat (GitHub Copilot, Claude Code, or opencode), or use the matching Pi prompt command, as shown in Quick start.
 
 | | Agent | Best for |
 | --- | --- | --- |
@@ -79,7 +79,7 @@ Use the attached destination-prefixed tools directly in chat. Do not launch `sap
 
 **Included skills:** `abap-development` · `abap-testing-quality` · `cds-development` · `rap-development` · `abap-debugging` · `abap-runtime-analysis` · `rap-service-delivery` · `sap-standard-api-analysis` · `clean-core-extensibility` · `sap-sdlc-orchestration` · `sap-transport-release` · `hana-cloud-inspection` · `hana-cloud-native-development` · `hana-cloud-validation`
 
-Agents and skills install for the harnesses you pick during global installation: a multi-select offers GitHub Copilot and Claude Code pre-checked, plus OpenAI Codex, Cursor, Gemini CLI, and opencode. In non-interactive installs they are installed for GitHub Copilot only. Repository-scoped installation instructions appear below.
+Agents and skills install for the harnesses you pick during global installation: a multi-select offers GitHub Copilot and Claude Code pre-checked, plus OpenAI Codex, Cursor, Gemini CLI, opencode, and Pi Coding Agent. In non-interactive installs they are installed for GitHub Copilot only. Repository-scoped installation instructions appear below.
 
 ## ✨ Your SAP development cockpit, inside your AI assistant
 
@@ -273,7 +273,7 @@ The installer handles VSP provisioning automatically:
 With `H2O_URL` set, an interactive install opens a checkbox picker with no destinations selected by default. Use **Space** to choose destinations and **Enter** to confirm. Press **a** to toggle all destinations (select all if any are unchecked; otherwise clear the selection). Confirming with none selected removes this add-on's managed MCP entries. When the `cf` CLI 8.18 or newer is authenticated to a targeted space, setup first offers an optional import from that space's Destination service; type **y** then **Enter** to include it, or press **Enter** to skip. Accepted CF and BAS destinations appear together in the picker. npm may run its install hook without an interactive terminal, even when the shell is interactive; in that case, selection is skipped without changing MCP config.
 
 
-The same postinstall offers the bundled agents and skills for several AI coding harnesses in a checkbox picker. **GitHub Copilot** and **Claude Code** start pre-checked, so pressing **Enter** alone installs both; **Space** selects or deselects a harness, **a** toggles all six, and confirming with none selected skips the step without changing files. With no interactive terminal, the assets are installed for GitHub Copilot only; set `SAP_AI_DEV_TOOLKIT_HARNESSES` to a comma-separated list of harness ids (`github-copilot`, `claude-code`, `codex`, `cursor`, `gemini-cli`, `opencode`) to choose non-interactively.
+The same postinstall offers the bundled agents and skills for several AI coding harnesses in a checkbox picker. **GitHub Copilot** and **Claude Code** start pre-checked, so pressing **Enter** alone installs both; **Space** selects or deselects a harness, **a** toggles all seven, and confirming with none selected skips the step without changing files. When destination MCP setup succeeds, the generated managed MCP servers are also mirrored into selected harnesses that have a stable user-level JSON MCP configuration (Claude Code, Cursor, Gemini CLI, and Pi Coding Agent). GitHub Copilot continues to use the BAS/VS Code MCP configuration written during destination setup. With no interactive terminal, the assets are installed for GitHub Copilot only; set `SAP_AI_DEV_TOOLKIT_HARNESSES` to a comma-separated list of harness ids (`github-copilot`, `claude-code`, `codex`, `cursor`, `gemini-cli`, `opencode`, `pi-coding-agent`) to choose non-interactively.
 
 Some current npm versions also require install hooks to be approved. If npm reports that `sap-ai-dev-toolkit`'s `postinstall` was blocked, allow it during a fresh install with `npm install --global --allow-scripts=sap-ai-dev-toolkit sap-ai-dev-toolkit`, or run `sap-ai-dev --setup` from an interactive BAS terminal after installation.
 
@@ -348,16 +348,19 @@ The package includes five user-invocable custom agents (**SAP Solution Architect
 
 After destination setup, the installer prints a 🤖 notice and a checkbox picker asking which AI coding harnesses should receive the bundled agents and skills. **Space** selects or deselects, **a** toggles all, **Enter** confirms. **GitHub Copilot** and **Claude Code** are pre-checked, so pressing **Enter** without changes installs both; confirming with none selected skips the step and leaves your files unchanged.
 
-| Harness | Skills land in | Agents land in |
-| --- | --- | --- |
-| GitHub Copilot | `$HOME/.copilot/skills/` | `$HOME/.copilot/agents/*.agent.md` |
-| Claude Code | `$HOME/.claude/skills/` | `$HOME/.claude/agents/<id>.md` (frontmatter reduced to `name` and `description`) |
-| OpenAI Codex | `$HOME/.agents/skills/` | — |
-| Cursor | `$HOME/.cursor/skills/` | — |
-| Gemini CLI | `$HOME/.gemini/skills/` | — |
-| opencode | `$XDG_CONFIG_HOME/opencode/skills/` (default `$HOME/.config/opencode/skills/`) | `$XDG_CONFIG_HOME/opencode/agents/<id>.md` (as subagents) |
-
-All 14 skills use the portable `SKILL.md` format and are installed verbatim. The 5 agents use Copilot's `.agent.md` format, so they are only installed for harnesses with a custom-agent mechanism (GitHub Copilot, Claude Code, opencode), with frontmatter adapted where needed. Selecting several harnesses duplicates the small markdown payloads on disk.
+| Harness | Skills land in | Agents land in | MCP auto-wiring |
+| --- | --- | --- | --- |
+| GitHub Copilot | `$HOME/.copilot/skills/` | `$HOME/.copilot/agents/*.agent.md` | Uses the BAS/VS Code `mcp.json` written by destination setup |
+| Claude Code | `$HOME/.claude/skills/` | `$HOME/.claude/agents/<id>.md` (frontmatter reduced to `name` and `description`) | `$HOME/.claude.json` |
+| OpenAI Codex | `$HOME/.agents/skills/` | — | Not changed automatically |
+| Cursor | `$HOME/.cursor/skills/` | — | `$HOME/.cursor/mcp.json` |
+| Gemini CLI | `$HOME/.gemini/skills/` | — | `$HOME/.gemini/settings.json` |
+| opencode | `$XDG_CONFIG_HOME/opencode/skills/` (default `$HOME/.config/opencode/skills/`) | `$XDG_CONFIG_HOME/opencode/agents/<id>.md` (as subagents) | Not changed automatically |
+| Pi Coding Agent | `$PI_CODING_AGENT_DIR/skills/` (default `$HOME/.pi/agent/skills/`) | `$PI_CODING_AGENT_DIR/prompts/<id>.md` (as `/` prompt commands) | `$PI_CODING_AGENT_DIR/mcp.json` (default `$HOME/.pi/agent/mcp.json`) |
+
+All 14 skills use the portable `SKILL.md` format and are installed verbatim. The 5 agents use Copilot's `.agent.md` format, so they are installed as native custom agents for harnesses with a custom-agent mechanism (GitHub Copilot, Claude Code, opencode), with frontmatter adapted where needed. Pi receives equivalent prompt templates (`/abap-developer`, `/sap-solution-architect`, and so on) because Pi exposes reusable personas through prompts rather than a separate custom-agent file type. Selecting several harnesses duplicates the small markdown payloads on disk.
+
+MCP auto-wiring preserves unrelated servers in each harness config and replaces only entries previously managed by `sap-ai-dev-toolkit`. Generated entries carry `SAP_AI_DEV_TOOLKIT_MANAGED=true` in their server environment so future reinstalls can reconcile them without touching user-owned MCP servers.
 
 These user-level customizations are available across workspaces opened by the same BAS user in the same dev space. The harness must be available in BAS and may need a window reload to discover new files. A non-interactive install skips the picker and installs for GitHub Copilot only; override with `SAP_AI_DEV_TOOLKIT_HARNESSES` (comma-separated harness ids). `npm install --ignore-scripts` skips the postinstall wizard entirely.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sap-ai-dev-toolkit",
-  "version": "0.7.4",
+  "version": "0.7.8",
   "description": "SAP AI development toolkit for BAS, ABAP, RAP, CAP, HANA Cloud, Fiori, UI5, and MCP",
   "author": "Gurkan Yilmaz",
   "type": "module",

package/scripts/postinstall.mjs

@@ -5,6 +5,7 @@ import { fileURLToPath } from 'node:url';
 import { installBinary } from '../src/binary.mjs';
 import { runSetup } from '../src/setup.mjs';
 import { installUserAssetsForHarnesses } from '../src/install-user-assets.mjs';
+import { installMcpServersForHarnesses } from '../src/harness-mcp-config.mjs';
 import { DEFAULT_HARNESS_IDS, HARNESSES, HARNESS_ENV_VAR, NON_INTERACTIVE_HARNESS_IDS, envHarnessSelection, harnessRoot } from '../src/harnesses.mjs';
 import { ReadStream as TTYReadStream, WriteStream as TTYWriteStream } from 'node:tty';
 import { homedir } from 'node:os';
@@ -102,13 +103,13 @@ async function installSelectedHarnessAssets(ids) {
 async function runHarnessAssetInstall() {
   const home = process.env.HOME || homedir();
   const override = await resolveHarnessOverride();
-  await withInstallTerminal(async terminal => {
+  return withInstallTerminal(async terminal => {
     let selected = override;
     if (!terminal) {
       if (!selected) selected = NON_INTERACTIVE_HARNESS_IDS;
       await announce(`Installing bundled agents and skills for ${harnessSelectionLabels(selected)} by default because no interactive terminal is available.`, 'progress');
       await installSelectedHarnessAssets(selected);
-      return;
+      return selected;
     }
     if (!selected) selected = DEFAULT_HARNESS_IDS;
     await announce([
@@ -135,18 +136,35 @@ async function runHarnessAssetInstall() {
     } catch (error) {
       if (error.message === 'Prompt interrupted') {
         await announce('Bundled agents and skills were skipped because the prompt was interrupted. Your files were not changed.', 'info');
-        return;
+        return [];
       }
       throw error;
     }
     if (answer.length === 0) {
       await announce('Bundled agents and skills were skipped. Your files were not changed.', 'info');
-      return;
+      return [];
     }
     await installSelectedHarnessAssets(answer);
+    return answer;
   });
 }
 
+async function wireHarnessMcpServers(ids, servers) {
+  const entries = servers && Object.keys(servers).length ? servers : null;
+  if (!entries || !ids?.length) return;
+  const { results, failures } = await installMcpServersForHarnesses(ids, entries, { env: runtimeEnv });
+  for (const result of results) {
+    if (!result.supported) {
+      await announce(`${result.label}: MCP auto-wiring skipped. ${result.skipped}`, 'info');
+      continue;
+    }
+    await announce(`${result.label}: wired ${result.servers} MCP server${result.servers === 1 ? '' : 's'} in ${result.path}.`, 'success');
+  }
+  for (const failure of failures) {
+    await announce(`${failure.label}: MCP auto-wiring failed: ${failure.error.message}`, 'error');
+  }
+}
+
 
 function probeCell(destination) {
   const probe = destination.probe || {};
@@ -291,11 +309,17 @@ async function main() {
     await announce('Rerun sap-ai-dev --setup.', 'info');
   }
 
+  let harnessIds = [];
   try {
-    await runHarnessAssetInstall();
+    harnessIds = await runHarnessAssetInstall();
   } catch (error) {
     await announce(`Bundled agent and skill installation failed: ${error.message}`, 'error');
   }
+  try {
+    if (setupCompleted) await wireHarnessMcpServers(harnessIds, setupResult?.servers);
+  } catch (error) {
+    await announce(`Harness MCP auto-wiring failed: ${error.message}`, 'error');
+  }
   if (setupCompleted) await announceSetup(setupResult);
 }
 if (process.argv[1] && realpathSync(fileURLToPath(import.meta.url)) === realpathSync(resolve(process.argv[1]))) {

package/src/harness-mcp-config.mjs

@@ -0,0 +1,122 @@
+import { mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises';
+import { homedir } from 'node:os';
+import { basename, dirname, join } from 'node:path';
+import { randomUUID } from 'node:crypto';
+import { harnessById, harnessRoot } from './harnesses.mjs';
+
+const MANAGED_ENV = 'SAP_AI_DEV_TOOLKIT_MANAGED';
+
+function mcpServersPath(harness, { home = process.env.HOME || homedir(), env = process.env } = {}) {
+  switch (harness.id) {
+    case 'claude-code':
+      return join(home, '.claude.json');
+    case 'cursor':
+      return join(harnessRoot(harness, { home, env }), 'mcp.json');
+    case 'gemini-cli':
+      return join(harnessRoot(harness, { home, env }), 'settings.json');
+    case 'pi-coding-agent':
+      return join(harnessRoot(harness, { home, env }), 'mcp.json');
+    default:
+      return null;
+  }
+}
+
+async function readJsonConfig(path) {
+  let raw;
+  try {
+    raw = await readFile(path, 'utf8');
+  } catch (error) {
+    if (error.code === 'ENOENT') return {};
+    throw error;
+  }
+  try {
+    const parsed = JSON.parse(raw);
+    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) throw new Error('top-level value is not an object');
+    return parsed;
+  } catch (error) {
+    throw new Error(`${path} contains invalid JSON: ${error.message}`);
+  }
+}
+
+async function writeJsonConfig(path, config) {
+  await mkdir(dirname(path), { recursive: true, mode: 0o755 });
+  const temporary = join(dirname(path), `.${basename(path)}.${process.pid}.${randomUUID()}.tmp`);
+  try {
+    await writeFile(temporary, `${JSON.stringify(config, null, 2)}\n`, { encoding: 'utf8', mode: 0o600 });
+    await rename(temporary, path);
+  } catch (error) {
+    await rm(temporary, { force: true }).catch(() => {});
+    throw error;
+  }
+}
+
+function isManagedServer(entry) {
+  if (!entry || typeof entry !== 'object') return false;
+  const env = entry.env;
+  return env && typeof env === 'object' && (
+    env[MANAGED_ENV] === 'true'
+    || typeof env.SAP_AI_DEV_TOOLKIT_DESTINATION === 'string'
+    || env.SAP_AI_DEV_TOOLKIT_DESTINATION_SOURCE === 'cloud-foundry'
+  );
+}
+
+function toMcpServersEntry(entry) {
+  const converted = {};
+  if (entry?.type === 'stdio') converted.type = 'stdio';
+  if (typeof entry?.command === 'string') converted.command = entry.command;
+  if (Array.isArray(entry?.args)) converted.args = [...entry.args];
+  converted.env = entry?.env && typeof entry.env === 'object' && !Array.isArray(entry.env)
+    ? { ...entry.env, [MANAGED_ENV]: 'true' }
+    : { [MANAGED_ENV]: 'true' };
+  if (typeof entry?.cwd === 'string') converted.cwd = entry.cwd;
+  if (typeof entry?.description === 'string') converted.description = entry.description;
+  if (typeof entry?.displayName === 'string' && !converted.description) converted.description = entry.displayName;
+  return converted;
+}
+
+export function harnessMcpConfigPath(id, options = {}) {
+  return mcpServersPath(harnessById(id), options);
+}
+
+export async function installMcpServersForHarness({ harness, servers, home, env = process.env } = {}) {
+  const path = mcpServersPath(harness, { home, env });
+  if (!path) {
+    const skipped = harness.id === 'github-copilot'
+      ? 'GitHub Copilot uses the BAS/VS Code MCP configuration already written during destination setup.'
+      : 'No stable user-level MCP JSON config is known for this harness.';
+    return { harness: harness.id, label: harness.label, supported: false, skipped };
+  }
+  const config = await readJsonConfig(path);
+  const existing = config.mcpServers;
+  if (existing !== undefined && (!existing || typeof existing !== 'object' || Array.isArray(existing))) {
+    throw new Error(`${path} has a non-object mcpServers value`);
+  }
+  const mcpServers = { ...(existing || {}) };
+  for (const [name, entry] of Object.entries(mcpServers)) {
+    if (isManagedServer(entry)) delete mcpServers[name];
+  }
+  for (const [name, entry] of Object.entries(servers || {})) {
+    if (Object.hasOwn(mcpServers, name)) {
+      throw new Error(`MCP server "${name}" already exists and is not managed by sap-ai-dev-toolkit`);
+    }
+    mcpServers[name] = toMcpServersEntry(entry);
+  }
+  config.mcpServers = mcpServers;
+  await writeJsonConfig(path, config);
+  return { harness: harness.id, label: harness.label, supported: true, path, servers: Object.keys(servers || {}).length };
+}
+
+export async function installMcpServersForHarnesses(ids, servers, { home, env = process.env } = {}) {
+  const results = [];
+  const failures = [];
+  for (const id of ids) {
+    let harness;
+    try {
+      harness = harnessById(id);
+      results.push(await installMcpServersForHarness({ harness, servers, home, env }));
+    } catch (error) {
+      failures.push({ id, label: harness?.label || id, error });
+    }
+  }
+  return { results, failures };
+}

package/src/harnesses.mjs

@@ -31,6 +31,11 @@ export function agentMarkdownName(fileName) {
   return String(fileName).replace(/\.agent\.md$/, '.md');
 }
 
+export function piCodingAgentRoot({ home = process.env.HOME || homedir(), env = process.env } = {}) {
+  const override = typeof env?.PI_CODING_AGENT_DIR === 'string' ? env.PI_CODING_AGENT_DIR.trim() : '';
+  return override || join(home, '.pi', 'agent');
+}
+
 export function claudeCodeAgentDocument(source) {
   const frontmatter = splitFrontmatter(source);
   if (!frontmatter) throw new Error('unsupported agent frontmatter');
@@ -51,13 +56,35 @@ export function opencodeAgentDocument(source) {
   return renderDocument([{ key: 'description', value: description }, { key: 'mode', value: 'subagent' }], frontmatter.body);
 }
 
+export function piCodingAgentPromptDocument(source) {
+  const frontmatter = splitFrontmatter(source);
+  if (!frontmatter) throw new Error('unsupported agent frontmatter');
+  const name = requiredField(frontmatter.fields, 'name');
+  const description = requiredField(frontmatter.fields, 'description');
+  if (!name || !description) throw new Error('unsupported agent frontmatter');
+  const body = frontmatter.body
+    .replaceAll('from the Chat tools picker', 'from Pi\'s MCP tool context')
+    .replaceAll('the Chat tools picker', 'Pi\'s MCP tool context')
+    .replaceAll('current workspace and SAP MCP server', 'current workspace and configured SAP MCP server');
+  return renderDocument([
+    { key: 'description', value: `Use the ${name} SAP agent persona. ${description}` },
+    { key: 'argument-hint', value: '"[request]"' }
+  ], `Act as **${name}** for the following request. Follow these agent instructions and use relevant installed SAP skills when helpful.
+
+${body.trim()}
+
+User request: $ARGUMENTS
+`);
+}
+
 export const HARNESSES = [
   { id: 'github-copilot', label: 'GitHub Copilot', directory: '.copilot', supportsAgents: true, legacyManifest: true },
   { id: 'claude-code', label: 'Claude Code', directory: '.claude', supportsAgents: true, agentFileName: agentMarkdownName, agentDocument: claudeCodeAgentDocument },
   { id: 'codex', label: 'OpenAI Codex', directory: '.agents', supportsAgents: false },
   { id: 'cursor', label: 'Cursor', directory: '.cursor', supportsAgents: false },
   { id: 'gemini-cli', label: 'Gemini CLI', directory: '.gemini', supportsAgents: false },
-  { id: 'opencode', label: 'opencode', directory: 'opencode', configHome: true, supportsAgents: true, agentFileName: agentMarkdownName, agentDocument: opencodeAgentDocument }
+  { id: 'opencode', label: 'opencode', directory: 'opencode', configHome: true, supportsAgents: true, agentFileName: agentMarkdownName, agentDocument: opencodeAgentDocument },
+  { id: 'pi-coding-agent', label: 'Pi Coding Agent', directory: '.pi/agent', supportsAgents: true, agentTargetPrefix: 'prompts', agentFileName: agentMarkdownName, agentDocument: piCodingAgentPromptDocument, root: piCodingAgentRoot }
 ];
 
 export function harnessById(id) {
@@ -69,6 +96,7 @@ export function harnessById(id) {
 }
 
 export function harnessRoot(harness, { home = process.env.HOME || homedir(), env = process.env } = {}) {
+  if (harness.root) return harness.root({ home, env });
   if (harness.configHome) {
     const override = typeof env?.XDG_CONFIG_HOME === 'string' ? env.XDG_CONFIG_HOME.trim() : '';
     return join(override || join(home, '.config'), harness.directory);

package/src/install-user-assets.mjs

@@ -75,7 +75,7 @@ async function planDestinations(harness, files) {
     if (!harness.supportsAgents) continue;
     const fileName = harness.agentFileName ? harness.agentFileName(basename(file.target)) : basename(file.target);
     const content = harness.agentDocument ? Buffer.from(harness.agentDocument(raw.toString('utf8')), 'utf8') : raw;
-    destinations.push({ target: join('agents', fileName), content });
+    destinations.push({ target: join(harness.agentTargetPrefix || 'agents', fileName), content });
   }
   return destinations;
 }