Merge remote-tracking branch 'upstream/next' into kimi-runtime-support

# Conflicts:
#	bin/install.js
#	src/runtime-homes.cts

src/runtime-artifact-layout.cts

@@ -22,6 +22,7 @@ const {
   stageSkillsForProfile,
   stageAgentsForProfile,
   stageSkillsForRuntimeAsSkills,
+  stageCommandsForRuntimeFlat,
 } = installProfiles;
 
 // In .cts (CommonJS output) files, `require` is available as a global.
@@ -271,6 +272,40 @@ function skillsKind(
   };
 }
 
+/**
+ * Build a converted-commands kind descriptor for runtimes that use a flat
+ * commands directory with per-file conversion (e.g. Cursor 1.6 slash commands).
+ *
+ * Unlike `commandsKind` (which passes raw source files through), this kind
+ * applies `converterName` from bin/install.js exports to each file during
+ * staging, writing flat `${prefix}${stem}.md` files to the staged directory.
+ *
+ * The staged files are then written by `_copyStaged` (commands branch) which
+ * handles prefix logic via the existing layout machinery.
+ *
+ * @param destSubpath   destination subpath within configDir (e.g. 'commands')
+ * @param prefix        filename prefix, e.g. 'gsd-'
+ * @param converterName name of converter function in bin/install.js exports
+ * @param configDir     runtime config dir (for .gsd-source marker resolution)
+ */
+function convertedCommandsKind(
+  destSubpath: string,
+  prefix: string,
+  converterName: string,
+  configDir: string,
+): ArtifactKind {
+  return {
+    kind: 'commands',
+    destSubpath,
+    prefix,
+    stage: (resolved) => {
+      const installExports = getInstallExports();
+      const converter = installExports[converterName] as (content: string, commandName: string) => string;
+      return stageCommandsForRuntimeFlat(findInstallSourceRoot(configDir), resolved, converter, prefix);
+    },
+  };
+}
+
 // ---------------------------------------------------------------------------
 // Public API
 // ---------------------------------------------------------------------------
@@ -303,7 +338,14 @@ function resolveRuntimeArtifactLayout(runtime: string, configDir: string, scope:
       break;
 
     case 'cursor':
-      kinds = [skillsKind('skills', 'gsd-', 'convertClaudeCommandToCursorSkill', 'cursor', configDir)];
+      // Cursor 1.6+ supports two artifact surfaces:
+      //   1. skills/gsd-<name>/SKILL.md  — rich skills with frontmatter + adapter header
+      //   2. commands/gsd-<name>.md      — plain markdown slash commands (no frontmatter)
+      //      accessed via '/' in the Agent input (#785)
+      kinds = [
+        skillsKind('skills', 'gsd-', 'convertClaudeCommandToCursorSkill', 'cursor', configDir),
+        convertedCommandsKind('commands', 'gsd-', 'convertClaudeCommandToCursorCommand', configDir),
+      ];
       break;
 
     case 'gemini':
@@ -327,7 +369,10 @@ function resolveRuntimeArtifactLayout(runtime: string, configDir: string, scope:
       break;
 
     case 'augment':
-      kinds = [skillsKind('skills', 'gsd-', 'convertClaudeCommandToAugmentSkill', 'augment', configDir)];
+      kinds = [
+        commandsKind('commands', 'gsd-', configDir),
+        skillsKind('skills', 'gsd-', 'convertClaudeCommandToAugmentSkill', 'augment', configDir),
+      ];
       break;
 
     case 'trae':
@@ -347,7 +392,7 @@ function resolveRuntimeArtifactLayout(runtime: string, configDir: string, scope:
       break;
 
     case 'cline':
-      kinds = [];
+      kinds = scope === 'global' ? [skillsKind('skills', 'gsd-', 'convertClaudeCommandToClineSkill', 'cline', configDir)] : [];
       break;
 
     case 'kimi':
@@ -360,11 +405,21 @@ function resolveRuntimeArtifactLayout(runtime: string, configDir: string, scope:
       break;
 
     case 'opencode':
-      kinds = [commandsKind('command', 'gsd-', configDir)];
+      // OpenCode reads flat slash commands from command/ and on-demand skills
+      // from skills/<name>/SKILL.md (https://opencode.ai/docs/skills). Emit both.
+      kinds = [
+        commandsKind('command', 'gsd-', configDir),
+        skillsKind('skills', 'gsd-', 'convertClaudeCommandToOpencodeSkill', 'opencode', configDir),
+      ];
       break;
 
     case 'kilo':
-      kinds = [commandsKind('command', 'gsd-', configDir)];
+      // Kilo derives from OpenCode and shares the skills/<name>/SKILL.md layout
+      // (https://kilo.ai/docs/customize/skills). Emit flat commands + skills.
+      kinds = [
+        commandsKind('command', 'gsd-', configDir),
+        skillsKind('skills', 'gsd-', 'convertClaudeCommandToKiloSkill', 'kilo', configDir),
+      ];
       break;
 
     default: