@opengsd/gsd-core 1.11.0 → 1.12.0

package/gsd-core/bin/lib/runtime-artifact-conversion.cjs

@@ -37,6 +37,7 @@ const { getDirName } = runtimeNamePolicy;
 const capabilityRegistry = require("./capability-registry.cjs");
 const hostIntegration = require("./host-integration.cjs");
 const shell_command_projection_cjs_1 = require("./shell-command-projection.cjs");
+const frontmatterModule = require("./frontmatter.cjs");
 const pattern_cjs_1 = require("./pattern.cjs");
 const markdown_sectionizer_cjs_1 = require("./markdown-sectionizer.cjs");
 // #2870: install-scope.cts is a leaf-tier sibling (imports only
@@ -847,7 +848,8 @@ function buildKimiAgentArtifacts({ rootAgent = '', subagents = [], requestedSuba
 /**
  * Apply Antigravity-specific content conversion — path replacement + command name conversion.
  * Path mappings depend on install mode:
- *   Global: ~/.claude/ → ~/.gemini/antigravity/, ./.claude/ → ./.agents/
+ *   Global: ~/.claude/skills/ → ~/.gemini/config/skills/ (#3738),
+ *          ~/.claude/ → ~/.gemini/antigravity/, ./.claude/ → ./.agents/
  *   Local:  ~/.claude/ → .agents/, ./.claude/ → ./.agents/
  * Applied to ALL Antigravity content (skills, agents, engine files).
  * @param {string} content - Source content to convert
@@ -856,6 +858,18 @@ function buildKimiAgentArtifacts({ rootAgent = '', subagents = [], requestedSuba
 function convertClaudeToAntigravityContent(content, isGlobal = false) {
     let c = content;
     if (isGlobal) {
+        // #3738: global skills install under ~/.gemini/config/skills (the dir AGY
+        // scans for global discovery), so skills-path references must divert there
+        // — BEFORE the configHome rewrite below, which is correct for gsd-core
+        // runtime-file references (settings, workflows, VERSION) but wrong for the
+        // skills dir itself.
+        c = c.replace(/\$HOME\/\.claude\/skills\//g, '$HOME/.gemini/config/skills/');
+        c = c.replace(/~\/\.claude\/skills\//g, '~/.gemini/config/skills/');
+        // Bare skills form (no trailing slash) — must also precede the generic
+        // slash rule, which would otherwise divert it to the retired configHome
+        // path ($HOME/.gemini/antigravity/skills).
+        c = c.replace(/\$HOME\/\.claude\/skills\b/g, '$HOME/.gemini/config/skills');
+        c = c.replace(/~\/\.claude\/skills\b/g, '~/.gemini/config/skills');
         c = c.replace(/\$HOME\/\.claude\//g, '$HOME/.gemini/antigravity/');
         c = c.replace(/~\/\.claude\//g, '~/.gemini/antigravity/');
         // Bare form (no trailing slash) — must come after slash form to avoid double-replace
@@ -1702,7 +1716,26 @@ function neutralizeAgentReferences(content, instructionFile) {
     c = c.replace(/Do NOT load full `AGENTS\.md` files[^\n]*/g, '');
     return c;
 }
-function convertClaudeToOpencodeFrontmatter(content, { isAgent = false, modelOverride = null } = {}) {
+/**
+ * Render one frontmatter `key: value` line whose value came from user config.
+ *
+ * #3706: both `model:` and `variant:` interpolate a value read from
+ * `.planning/config.json` / `~/.gsd/defaults.json`. Raw interpolation lets a value
+ * containing a newline inject additional TOP-LEVEL frontmatter keys into the
+ * generated agent file — proven by execution during the #3705 security review
+ * (`"sonnet\ntools: [\"*\"]\npermission: bypass"` produced two extra keys).
+ *
+ * That sink predates #3706, but this change adds a SECOND write to it, so it is
+ * closed here rather than doubled. Both the decision and the escaping live in
+ * frontmatter.cts so there is exactly one set of YAML scalar rules; a value that
+ * round-trips bare is still emitted bare, so generated files do not churn.
+ */
+function frontmatterScalar(key, value) {
+    return frontmatterModule.agentScalarNeedsDoubleQuoting(value)
+        ? `${key} "${frontmatterModule.escapeDoubleQuotedScalar(value)}"`
+        : `${key} ${value}`;
+}
+function convertClaudeToOpencodeFrontmatter(content, { isAgent = false, modelOverride = null, variant = null } = {}) {
     // Replace tool name references in content (applies to all files)
     let convertedContent = content;
     convertedContent = convertedContent.replace(/\bAskUserQuestion\b/g, 'question');
@@ -1827,7 +1860,23 @@ function convertClaudeToOpencodeFrontmatter(content, { isAgent = false, modelOve
         // respected on OpenCode (which uses static agent frontmatter, not inline
         // Task() model parameters). See #2256.
         if (modelOverride) {
-            newLines.push(['model:', modelOverride].join(' '));
+            newLines.push(frontmatterScalar('model:', modelOverride));
+        }
+        // #3706: deliver the RESOLVED reasoning effort to the spawned subagent.
+        // `query resolve-model` reported an effort that never reached OpenCode, so
+        // every subagent ran at whatever opencode.jsonc defaults the model to — for
+        // a custom provider commonly the most expensive setting.
+        //
+        // OpenCode ONLY: `EFFORT_ARGV` declares surfaces for claude/opencode/codex
+        // and NO kilo entry, so the Kilo converter below deliberately does not emit
+        // this. Unlike the model side — where #2794 J8 requires kilo and opencode to
+        // resolve identically — there is no kilo effort surface to render into, and
+        // inventing one would emit a key that runtime never documented.
+        //
+        // Omitted entirely when absent, per #1156's rule for `model: inherit`:
+        // never an empty or sentinel value, let the runtime use its own default.
+        if (variant) {
+            newLines.push(frontmatterScalar('variant:', variant));
         }
     }
     // For commands: add tools object if we had allowed-tools or tools
@@ -1999,7 +2048,7 @@ function convertClaudeToKiloFrontmatter(content, { isAgent = false, modelOverrid
         // model emission exactly (#2093 UPGRADE 2 / ADR-1239; Kilo is an OpenCode
         // fork with the same static-frontmatter model constraint). See #2256.
         if (modelOverride) {
-            newLines.push(['model:', modelOverride].join(' '));
+            newLines.push(frontmatterScalar('model:', modelOverride));
         }
         newLines.push(...buildKiloAgentPermissionBlock(agentTools));
     }
@@ -2692,7 +2741,13 @@ function restoreClaudeGlobalAtRefTilde(content, pathPrefix) {
         return content;
     const tildeEquivalent = '~' + pathPrefix.slice('$HOME'.length);
     const atRefRe = new RegExp(`(?<!["'])@${(0, pattern_cjs_1.escapeRegex)(pathPrefix)}`, 'g');
-    return content.replace(atRefRe, `@${tildeEquivalent}`);
+    // Function replacement, not a string. A string replacement treats `$&` and the
+    // backtick-dollar form in the SUBSTITUTION as special patterns, so a --config-dir
+    // containing either corrupts output: `$HOME/.cl$&ude/` yielded
+    // `@~/.cl@$HOME/.cl$&ude/ude/x`, and the backtick form silently DROPPED text.
+    // Pre-existing, and #3719 adds a THIRD call site to this sink — which is how the
+    // previous two came to share the defect in the first place.
+    return content.replace(atRefRe, () => `@${tildeEquivalent}`);
 }
 /**
  * Apply the per-runtime rewrite table to a single content string.
@@ -3124,8 +3179,34 @@ function applyAgentPathRewrites(content, runtime, pathPrefix) {
     const normalizedPathPrefix = pathPrefix.replace(/\/$/, '');
     content = content.replace(/~\/\.claude\//g, pathPrefix);
     content = content.replace(/\$HOME\/\.claude\//g, pathPrefix);
-    content = content.replace(/~\/\.claude\b/g, normalizedPathPrefix);
-    content = content.replace(/\$HOME\/\.claude\b/g, normalizedPathPrefix);
+    // #3719 review (MAJOR): a bare `\b` is satisfied by ANY non-word character,
+    // including '-' — for a --config-dir whose name EXTENDS '.claude' (e.g.
+    // '.claude-work'), this re-matched the '.claude' PREFIX of the emitted
+    // '.claude-work' path and corrupted it to '.claude-work-work'. Guard with
+    // the SAME negative-lookahead convention already used at
+    // copyWithPathReplacement's call site (bin/install.js:7729-7730).
+    content = content.replace(/~\/\.claude(?![\w-])/g, normalizedPathPrefix);
+    content = content.replace(/\$HOME\/\.claude(?![\w-])/g, normalizedPathPrefix);
+    // #3719: the THIRD emit path that needed this restore. #3133 added it to the
+    // skill/command pipeline (`_applyRuntimeRewrites` case 'claude') and #3544 to
+    // bin/install.js's spec-tree copy; the agents pipeline never got it, so every
+    // `@~/.claude/...` include in a global Claude install shipped as `@$HOME/...`
+    // and resolved to NOTHING (27 of 34 emitted agents, 103 lines).
+    //
+    // Guarded on `claude` for the same reason the sibling call site lives inside
+    // `case 'claude'`: the helper self-guards only on the `$HOME` PREFIX, and every
+    // runtime's global prefix is a `$HOME` form (`$HOME/.cursor/`, ...), so an
+    // unguarded call would rewrite `@`-refs for runtimes whose resolver has no
+    // documented `~` expansion at all.
+    //
+    // Passed the NORMALIZED prefix, not `pathPrefix`. The two word-boundary
+    // replaces above emit the trailing-slash-free form, and the helper's regex is
+    // anchored to the exact prefix string it is handed — so `restore(pathPrefix)`
+    // fixes `@$HOME/.claude/x` and leaves a bare `@$HOME/.claude` broken. The
+    // normalized form is a PREFIX of both, so one call covers both.
+    if (runtime === 'claude') {
+        content = restoreClaudeGlobalAtRefTilde(content, normalizedPathPrefix);
+    }
     return content;
 }
 // ── End rewrite engine ────────────────────────────────────────────────────────
@@ -3243,7 +3324,14 @@ function applyAgentFrontmatterExtensions(content, { runtime, agentName, targetDi
     // effort key, so skipping injection is the whole job.
     if (universalEffort !== 'inherit') {
         const renderedEffort = _getGsdEffortCatalog().renderEffortForRuntime(runtime, universalEffort).value;
-        result = injectEffortFrontmatter(result, renderedEffort);
+        // #3007: `value` is `string | null` — a rejected/unrenderable level (e.g.
+        // 'ultra', or a catalog with no advertised level at or above the request)
+        // renders null. Same posture as the 'inherit' case above: omit the key
+        // entirely rather than writing a literal `effort: null`, so the host
+        // falls back to its own default instead of failing to parse.
+        if (renderedEffort !== null) {
+            result = injectEffortFrontmatter(result, renderedEffort);
+        }
     }
     const disallowedTools = READONLY_AGENT_DISALLOWED_TOOLS[agentName];
     if (disallowedTools)

package/gsd-core/bin/lib/runtime-artifact-layout.cjs

@@ -36,6 +36,10 @@ const conversionExports = runtimeArtifactConversion;
 // rather than re-deriving the chain per runtime.
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const installModelOverrideResolver = require("./install-model-override-resolver.cjs");
+// eslint-disable-next-line @typescript-eslint/no-require-imports -- export= CommonJS module, same as the sibling resolver import above
+const installEffortResolver = require("./install-effort-resolver.cjs");
+// eslint-disable-next-line @typescript-eslint/no-require-imports -- export= CommonJS module, same as the sibling resolver import above
+const modelCatalog = require("./model-catalog.cjs");
 const shell_command_projection_cjs_1 = require("./shell-command-projection.cjs");
 // #2870: `isGlobalScope` centralizes the `scope === 'global'` boolean
 // projection both kind-builder closures below need at the converters'
@@ -346,11 +350,40 @@ function convertedAgentsKind(destSubpath, prefix, converterName, configDir, scop
                 const overrideTargetDir = agentCtx?.targetDir ?? configDir;
                 const modelOverrides = installModelOverrideResolver.readGsdEffectiveModelOverrides(overrideTargetDir);
                 const runtimeResolver = installModelOverrideResolver.readGsdRuntimeProfileResolver(overrideTargetDir);
+                // #3706: the resolved reasoning effort, threaded exactly as the model is —
+                // config read ONCE per stage(), per-agent value resolved per file.
+                //
+                // Gated on the effort config being PRESENT, not on a value coming back.
+                // `resolveInstallTimeEffort` always returns something (measured: 'high'
+                // even with no project config and no effort block), so "skip when
+                // resolution yields no value" has no trigger and would stamp `variant:`
+                // into every generated agent file for every existing install. OpenCode's
+                // built-in variant sets are provider-specific upstream (Anthropic ships
+                // only `high`/`max`), so a level GSD resolved is not guaranteed to name a
+                // variant the user's provider actually has — emitting one unasked-for is
+                // the risk this gate avoids. #1156's rule for `model: inherit` is the
+                // precedent: do not emit a key the runtime may not understand.
+                //
+                // OpenCode only; the kilo converter ignores the field (no EFFORT_ARGV.kilo).
+                const effortConfig = converterName === 'convertClaudeToOpencodeFrontmatter'
+                    ? installEffortResolver.readGsdEffectiveEffortConfig(overrideTargetDir)
+                    : null;
                 converter = (content, _isGlobal, meta) => {
                     const modelOverride = meta
                         ? installModelOverrideResolver.resolveAgentModelOverride(meta.agentName, modelOverrides, runtimeResolver)
                         : null;
-                    return rawConverter(content, { isAgent: true, modelOverride });
+                    // The universal level is NOT emitted raw. `clampEffortForHost` is the
+                    // declared OpenCode effort capability (EFFORT_ARGV.opencode: its own
+                    // `supported` set + `clamp`), and it is what rejects a level that is
+                    // not a wire value — most importantly `inherit`, which per #3533 (10d)
+                    // means "omit the key and follow the host default" and must never be
+                    // written literally. Anything unsupported clamps to null, which omits
+                    // the key rather than inventing one.
+                    const universal = effortConfig && meta
+                        ? installEffortResolver.resolveInstallTimeEffort(effortConfig, meta.agentName)
+                        : null;
+                    const variant = universal ? modelCatalog.clampEffortForHost('opencode', universal) : null;
+                    return rawConverter(content, { isAgent: true, modelOverride, variant });
                 };
             }
             else {