@opengsd/gsd-core 1.18.0 → 1.20.0

package/gsd-core/bin/lib/capability-state.cjs

@@ -233,14 +233,17 @@ function _resolveCommandsGsdDir() {
  * Only directories whose names start with gsd- are included so user-created
  * skills (without the gsd- prefix) are not accidentally pulled in.
  *
- * The requires: field is parsed via the shared parseRequires helper (the same
- * parser loadSkillsManifest uses), so the two paths cannot drift.
+ * Dependencies use the same parseRequires, parseCallsAgents, and
+ * workflowAgentRefs helpers as loadSkillsManifest. Workflow references resolve
+ * against this runtime's own gsd-core/workflows tree, including its fragments,
+ * so a custom config directory never borrows another installation's agents.
  *
  * Returns an empty Map when the skills dir does not exist.
  */
 function _loadInstalledSkillsManifest(configDir) {
     const manifest = new Map();
     const skillsDir = node_path_1.default.join(configDir, 'skills');
+    const workflowsDir = node_path_1.default.join(configDir, 'gsd-core', 'workflows');
     if (!node_fs_1.default.existsSync(skillsDir))
         return manifest;
     let entries;
@@ -282,12 +285,15 @@ function _loadInstalledSkillsManifest(configDir) {
         // installed-runtime dependency resolution can never silently diverge from
         // the source-tree path (single source of truth — no duplicated regex).
         manifest.set(stem, content ? parseRequires(content) : []);
-        // Mirror loadSkillsManifest's Map shape: it always sets a companion
-        // `_calls_agents_<stem>` key. Installed SKILL.md bodies carry no
-        // recoverable agent-call refs, so [] (the no-agents case) keeps the two
-        // manifest shapes identical and prevents undefined-vs-[] drift for any
-        // consumer that reads the agent-refs companion key.
-        manifest.set(`_calls_agents_${stem}`, []);
+        // Installed skills delegate to workflows just as source commands do.
+        // Preserve their agent closure so surface materialization only prunes
+        // agents no retained skill requires (#5356).
+        manifest.set(`_calls_agents_${stem}`, [
+            ...new Set([
+                ...parseCallsAgents(content),
+                ...workflowAgentRefs(content, workflowsDir),
+            ]),
+        ]);
     }
     return manifest;
 }

package/gsd-core/bin/lib/capability-validator.cjs

@@ -856,6 +856,7 @@ const VALID_CONVERTER_NAMES = new Set([
   'convertClaudeCommandToKimiSkill',
   'convertClaudeCommandToKimiCodeSkill',
   'convertClaudeCommandToOpencodeSkill',
+  'convertClaudeCommandToPiSkill',
   'convertClaudeCommandToTraeSkill',
   'convertClaudeCommandToWindsurfSkill',
   'convertClaudeCommandToWindsurfWorkflow',
@@ -879,6 +880,8 @@ const VALID_CONVERTER_NAMES = new Set([
   // and the kilo/opencode agent converters (shared with those runtimes'
   // commands-kind entries, options-bag signature `(content, {isAgent, modelOverride})`).
   'convertClaudeAgentToHermesAgent',
+  // #5569 (ADR-5559 §3) — the role file Pi's gsd_dispatch loads.
+  'convertClaudeAgentToPiAgent',
   'convertClaudeToKiloFrontmatter',
   'convertClaudeToOpencodeFrontmatter',
 ]);
@@ -1236,6 +1239,20 @@ function validateArtifactKindEntry(capId, entry, prefix) {
     }
   }
 
+  // excludeSuffixes — optional; filename suffixes the agents staging skips (#5569: Pi omits .compact.md)
+  if (entry.excludeSuffixes !== undefined) {
+    if (!Array.isArray(entry.excludeSuffixes)) {
+      errors.push(ctx + '.excludeSuffixes must be an array of non-empty strings if present');
+    } else {
+      for (let i = 0; i < entry.excludeSuffixes.length; i++) {
+        const s = entry.excludeSuffixes[i];
+        if (typeof s !== 'string' || s.length === 0 || s.includes('/') || s.includes('\\')) {
+          errors.push(ctx + '.excludeSuffixes[' + i + '] must be a non-empty string without path separators');
+        }
+      }
+    }
+  }
+
   // converter — required; must be a string or null (closed ConverterName enum — now enforced in phase 5e)
   if (!Object.prototype.hasOwnProperty.call(entry, 'converter')) {
     errors.push(ctx + '.converter is required (must be a string or null)');
@@ -1857,6 +1874,11 @@ const KNOWN_REVIEWER_FIELDS = new Set([
   // effort", which emits no effort argument at all.
   'effortConfigKey',
   'defaultEffort',
+  // `contextWindowTokens` / `contextWindowConfigKey` added by #4559, same optional/backward-compatible
+  // shape as `promptBudgetKey`: a manifest authored before they existed keeps validating, and an
+  // absent or non-positive window resolves to "no derived prompt cap" at the invocation boundary.
+  'contextWindowTokens',
+  'contextWindowConfigKey',
   'handler',
 ]);
 
@@ -2488,6 +2510,16 @@ function validateReviewerBodyFields(cap) {
     );
   }
 
+  // #4559: optional. Absent or null is "no declared window"; a present key must be a dotted
+  // config key string. The window's VALUE is narrowed (never rejected) by `resolveLaneCap`.
+  if (r.contextWindowConfigKey !== undefined && r.contextWindowConfigKey !== null
+      && (typeof r.contextWindowConfigKey !== 'string' || r.contextWindowConfigKey.length === 0)) {
+    errors.push(
+      ctx + ' reviewer.contextWindowConfigKey must be a dotted config key or null ' +
+      '(got: ' + describeValue(r.contextWindowConfigKey) + ')',
+    );
+  }
+
   // ── handler (D6) — closed first-party enum; null is the default ────────────
   if (r.handler !== null && !VALID_LANE_HANDLERS.has(r.handler)) {
     errors.push(

package/gsd-core/bin/lib/commands.cjs

@@ -31,13 +31,13 @@ const coreUtilsMod = require("./core-utils.cjs");
 const { toPosixPath, generateSlugInternal, extractOneLinerFromBody } = coreUtilsMod;
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const phaseIdMod = require("./phase-id.cjs");
-const { normalizePhaseName, comparePhaseNum, extractPhaseToken, PHASE_NUMBER_TOKEN_SOURCE, isSentinelPhaseId, renderPhaseBranchName, parsePhaseId, renderPhaseId, phaseHeadingPrefixSrcFor, PHASE_HEADING_BASELINE, } = phaseIdMod;
+const { customPhaseQuery, customDirectoryOwner, isCustomPhaseId, normalizePhaseName, comparePhaseNum, extractPhaseToken, PHASE_NUMBER_TOKEN_SOURCE, isSentinelPhaseId, renderPhaseBranchName, parsePhaseId, renderPhaseId, phaseHeadingPrefixSrcFor, PHASE_HEADING_BASELINE, } = phaseIdMod;
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const phaseIdDisplayMod = require("./phase-id-display.cjs");
 const { renderBracketMilestoneDisplay } = phaseIdDisplayMod;
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const phaseLocatorMod = require("./phase-locator.cjs");
-const { getArchivedPhaseDirs, findPhaseInternal, listMilestonePhaseDirs } = phaseLocatorMod;
+const { phaseDirectoryOptions, getArchivedPhaseDirs, findPhaseInternal, listMilestonePhaseDirs } = phaseLocatorMod;
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const roadmapParserMod = require("./roadmap-parser.cjs");
 const { extractCurrentMilestone, stripShippedMilestones: _stripShippedMilestones, getMilestoneInfo, getRoadmapPhaseInternal } = roadmapParserMod;
@@ -1822,7 +1822,7 @@ function cmdCommit(cwd, message, files, raw, amend, noVerify, filesRemoved) {
             // phase — the phase arm must never branch-mutate for it (isSentinelPhaseId
             // is the invariant's single owner, src/phase-id.cts).
             if (phaseNum && !isSentinelPhaseId(phaseNum)) {
-                const phaseInfo = findPhaseInternal(cwd, phaseNum);
+                const phaseInfo = findPhaseInternal(cwd, phaseNum, undefined, phaseDirectoryOptions(cwd, config));
                 if (phaseInfo) {
                     // #4126: shared with init.cts's cmdInitExecutePhase branch_name field
                     // via the one canonical renderer (src/phase-id.cts) so an undeliverable
@@ -3053,6 +3053,7 @@ function cmdProgressRender(cwd, format, raw) {
         ? renderBracketMilestoneDisplay(milestone?.version, loadConfig(cwd).project_code)
         : null;
     const milestoneVersion = milestoneDisplay ?? milestone?.version ?? null;
+    const directoryContext = phaseDirectoryOptions(cwd);
     const phases = [];
     let totalPlans = 0;
     let totalSummaries = 0;
@@ -3091,9 +3092,11 @@ function cmdProgressRender(cwd, format, raw) {
                 }
             }
             else {
+                const custom = customPhaseQuery(dir, directoryContext);
+                const owner = custom && customDirectoryOwner(dir, custom);
                 const dm = dir.match(/^(\d+(?:\.\d+)*)-?(.*)/);
-                phaseNum = dm ? dm[1] : dir;
-                phaseName = dm && dm[2] ? dm[2].replace(/-/g, ' ') : '';
+                phaseNum = owner ? owner.id : dm ? dm[1] : dir;
+                phaseName = owner ? owner.slug.replace(/-/g, ' ') : dm && dm[2] ? dm[2].replace(/-/g, ' ') : '';
             }
             // #3183/#5060: canonical plan/summary counts and lifecycle status
             // (root+nested, superseded-excluded, canonical pairing) from the
@@ -3212,7 +3215,7 @@ function cmdTodoMatchPhase(cwd, phase, raw) {
         .map(w => w.replace(/[^a-z0-9]/g, ''))
         .filter(w => w.length > 2 && !stopWords.has(w)));
     // Find phase directory to get expected file paths
-    const phaseInfoDisk = findPhaseInternal(cwd, phase);
+    const phaseInfoDisk = findPhaseInternal(cwd, phase, undefined, phaseDirectoryOptions(cwd));
     const phasePlans = [];
     if (phaseInfoDisk && phaseInfoDisk['found']) {
         try {
@@ -3394,7 +3397,7 @@ function cmdScaffold(cwd, type, options, raw) {
     const padded = phase ? normalizePhaseName(phase) : '00';
     const today = clock_cjs_1.realClock.localToday();
     // Find phase directory
-    const phaseInfo = phase ? findPhaseInternal(cwd, phase) : null;
+    const phaseInfo = phase && type !== 'phase-dir' ? findPhaseInternal(cwd, phase, undefined, phaseDirectoryOptions(cwd)) : null;
     const phaseDir = phaseInfo ? node_path_1.default.join(cwd, phaseInfo['directory']) : null;
     if (phase && !phaseDir && type !== 'phase-dir') {
         error(`Phase ${phase} directory not found`);
@@ -3422,14 +3425,14 @@ function cmdScaffold(cwd, type, options, raw) {
             }
             const slug = generateSlugInternal(name);
             // #3287: apply project_code prefix to stay consistent with phase.add/phase.insert
-            const scaffoldConfig = loadConfig(cwd);
-            const scaffoldProjectCode = scaffoldConfig['project_code'] || '';
-            const scaffoldPrefix = scaffoldProjectCode ? `${scaffoldProjectCode}-` : '';
-            const dirName = `${scaffoldPrefix}${padded}-${slug}`;
-            const phasesParent = planningPaths(cwd).phases;
-            (0, shell_command_projection_cjs_1.platformEnsureDir)(phasesParent);
-            const dirPath = node_path_1.default.join(phasesParent, dirName);
-            (0, shell_command_projection_cjs_1.platformEnsureDir)(dirPath);
+            const scaffoldConfig = phaseDirectoryOptions(cwd, undefined, '');
+            const roadmapPath = node_path_1.default.join(planningDir(cwd), 'ROADMAP.md');
+            const roadmap = scaffoldConfig.phaseNaming === 'custom' && node_fs_1.default.existsSync(roadmapPath)
+                ? node_fs_1.default.readFileSync(roadmapPath, 'utf8') : '';
+            const [{ dirPath }] = phaseLocatorMod.createPhaseDirectories(cwd, [{
+                    id: phase, slug: slug || '',
+                    directoryId: scaffoldConfig.phaseNaming === 'custom' && isCustomPhaseId(phase) ? phase : padded,
+                }], { ...scaffoldConfig, roadmap }, false);
             output({ created: true, directory: toPosixPath(node_path_1.default.relative(cwd, dirPath)), path: dirPath }, raw, dirPath);
             return;
         }
@@ -3728,12 +3731,19 @@ function cmdStats(cwd, format, raw) {
  */
 function cmdCheckCommit(cwd, raw) {
     const config = loadConfig(cwd);
-    const stagedResult = (0, shell_command_projection_cjs_1.execGit)(['diff', '--cached', '--name-only', '-z'], { cwd });
+    // #5548: execGit scrubs the repo-location vars, but inside the pre-commit hook git sets them
+    // (GIT_DIR/GIT_WORK_TREE of an explicit --git-dir commit, GIT_INDEX_FILE of a `-a` / `<path>`
+    // commit) to name the repo being committed: hand them back or the guard finds no repo and allows.
+    const hookEnv = {};
+    for (const k of shell_command_projection_cjs_1.GIT_LOCATION_ENV_VARS)
+        if (process.env[k] !== undefined)
+            hookEnv[k] = process.env[k];
+    const stagedResult = (0, shell_command_projection_cjs_1.execGit)(['diff', '--cached', '--name-only', '-z'], { cwd, env: hookEnv });
     if (stagedResult.exitCode === 0) {
         const files = stagedResult.stdout.split('\0').filter(Boolean);
         const planningFiles = files.filter(f => f.startsWith('.planning/'));
         if (planningFiles.length > 0) {
-            const policy = resolveCommitDocsPolicy(config, detectPhaseNumberFromFiles(planningFiles), () => isGitIgnored(cwd, '.planning'));
+            const policy = resolveCommitDocsPolicy(config, detectPhaseNumberFromFiles(planningFiles), () => isGitIgnored(cwd, '.planning', hookEnv));
             if (!policy.resolved) {
                 error(`commit_docs is false but ${planningFiles.length} .planning/ file(s) are staged:\n` +
                     planningFiles.map(f => `  ${f}`).join('\n') +

package/gsd-core/bin/lib/config-loader.cjs

@@ -156,6 +156,15 @@ const CONFIG_DEFAULTS = {
     planner_stall_detection_enabled: _getNestedConfigDefault('planner', 'stall_detection_enabled'),
     max_prompt_tokens: _getNestedConfigDefault('review', 'max_prompt_tokens'),
 };
+/**
+ * Resolve `git.repo_tagging` (#5706) from hand-edited configuration. Only the
+ * two documented enum members are honored; any other stored value (a number,
+ * null, an unknown string, a wrong-case spelling) reads as the default `single`
+ * and never throws, so a bad hand edit cannot enable per-repository tagging.
+ */
+function resolveRepoTagging(value) {
+    return value === 'per_repo' ? 'per_repo' : 'single';
+}
 /**
  * Resolve the planner watchdog policy from hand-edited configuration.
  * Only a real JSON boolean may override the default; strings/numbers/null
@@ -204,16 +213,16 @@ function _deepMergeConfig(base, overlay) {
 const _warnedUnknownConfigKeys = new Set();
 // ─── Git utilities ────────────────────────────────────────────────────────────
 const _gitIgnoredCache = new Map();
-function isGitIgnored(cwd, targetPath) {
+function isGitIgnored(cwd, targetPath, env) {
     // #2206: strip trailing slashes — `git check-ignore` has a quirk where a
     // CRLF .gitignore with blank lines falsely reports a trailing-slash path
     // (e.g. `.planning/`) as ignored. Normalizing here protects every call site.
     const normalized = targetPath.replace(/\/+$/, '');
-    const key = cwd + '::' + normalized;
+    const key = cwd + '::' + normalized + (env ? '::env:' + JSON.stringify(Object.entries(env).sort()) : '');
     if (_gitIgnoredCache.has(key))
         return _gitIgnoredCache.get(key);
     // --no-index checks .gitignore rules regardless of whether the file is tracked.
-    const result = (0, shell_command_projection_cjs_1.execGit)(['check-ignore', '-q', '--no-index', '--', normalized], { cwd });
+    const result = (0, shell_command_projection_cjs_1.execGit)(['check-ignore', '-q', '--no-index', '--', normalized], { cwd, env });
     const ignored = result.exitCode === 0;
     _gitIgnoredCache.set(key, ignored);
     return ignored;
@@ -849,6 +858,7 @@ function loadConfigResolvedInternal(cwd, options = {}) {
             base_branch: get('base_branch', { section: 'git', field: 'base_branch' }),
             protected_branches: getNested('git', 'protected_branches'),
             allow_default_branch_commits: getNested('git', 'allow_default_branch_commits'),
+            repo_tagging: resolveRepoTagging(getNested('git', 'repo_tagging')),
             phase_branch_template: get('phase_branch_template', { section: 'git', field: 'phase_branch_template' }) ?? defaults.phase_branch_template,
             milestone_branch_template: get('milestone_branch_template', { section: 'git', field: 'milestone_branch_template' }) ?? defaults.milestone_branch_template,
             quick_branch_template: get('quick_branch_template', { section: 'git', field: 'quick_branch_template' }) ?? defaults.quick_branch_template,