mirror of
https://github.com/garrytan/gstack.git
synced 2026-06-17 15:20:11 +02:00
feat(resolvers): T2 — ResolverEntry + appliesTo gate infrastructure
Adds the conditional-resolver-injection plumbing from the v2_PLAN A.1
step. Resolvers can now be either a bare ResolverFn (always fires, current
behavior) or a ResolverEntry { resolve, appliesTo? } (gated; appliesTo
returning false skips the resolver, substitutes empty string).
Why infrastructure-only: the audit during T0a confirmed most resolvers
don't need gating. The {{NAME}} placeholder system is already conditional
at the template level — a resolver only fires for skills that reference it.
The gate is for future use when a placeholder's audience needs a structural
guardrail beyond social convention, or when a sub-resolver inside a larger
composed resolver (e.g. preamble) needs per-skill skip.
scripts/gen-skill-docs.ts:444 now uses unwrapResolver() to handle both
shapes. RESOLVERS map signature widens from Record<string, ResolverFn>
to Record<string, ResolverValue>. All existing resolvers stay bare
functions and work unchanged.
Test plan:
- bun test test/resolver-entry.test.ts: 6 pass (gate plumbing + registry)
- bun test test/gen-skill-docs.test.ts: 389 pass (no regression)
- bun run gen:skill-docs --dry-run: all SKILL.md files FRESH (no diff)
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -16,7 +16,7 @@ import { writeLlmsTxt } from './gen-llms-txt';
|
||||
import * as fs from 'fs';
|
||||
import * as path from 'path';
|
||||
import type { Host, TemplateContext } from './resolvers/types';
|
||||
import { HOST_PATHS } from './resolvers/types';
|
||||
import { HOST_PATHS, unwrapResolver } from './resolvers/types';
|
||||
import { RESOLVERS } from './resolvers/index';
|
||||
import { externalSkillName, extractHookSafetyProse as _extractHookSafetyProse, extractNameAndDescription as _extractNameAndDescription, condenseOpenAIShortDescription as _condenseOpenAIShortDescription, generateOpenAIYaml as _generateOpenAIYaml } from './resolvers/codex-helpers';
|
||||
import { generatePlanCompletionAuditShip, generatePlanCompletionAuditReview, generatePlanVerificationExec } from './resolvers/review';
|
||||
@@ -441,9 +441,11 @@ function processTemplate(tmplPath: string, host: Host = 'claude'): { outputPath:
|
||||
const resolverName = parts[0];
|
||||
const args = parts.slice(1);
|
||||
if (suppressed.has(resolverName)) return '';
|
||||
const resolver = RESOLVERS[resolverName];
|
||||
if (!resolver) throw new Error(`Unknown placeholder {{${resolverName}}} in ${relTmplPath}`);
|
||||
return args.length > 0 ? resolver(ctx, args) : resolver(ctx);
|
||||
const entry = RESOLVERS[resolverName];
|
||||
if (!entry) throw new Error(`Unknown placeholder {{${resolverName}}} in ${relTmplPath}`);
|
||||
const { resolve, appliesTo } = unwrapResolver(entry);
|
||||
if (appliesTo && !appliesTo(ctx)) return '';
|
||||
return args.length > 0 ? resolve(ctx, args) : resolve(ctx);
|
||||
});
|
||||
|
||||
// Check for any remaining unresolved placeholders
|
||||
|
||||
@@ -1,9 +1,20 @@
|
||||
/**
|
||||
* RESOLVERS record — maps {{PLACEHOLDER}} names to generator functions.
|
||||
* RESOLVERS record — maps {{PLACEHOLDER}} names to generator functions
|
||||
* or gated entries.
|
||||
*
|
||||
* Each resolver takes a TemplateContext and returns the replacement string.
|
||||
* Resolvers may be either a bare function (always fires) or a gated entry
|
||||
* ({ resolve, appliesTo }) where appliesTo can return false to skip the
|
||||
* resolver for a given skill. See ./types.ts: ResolverEntry.
|
||||
*
|
||||
* Most resolvers don't need a gate — the {{NAME}} placeholder system is
|
||||
* already conditional at the template level (the resolver only fires for
|
||||
* skills that reference it). Use a gate when you want a structural
|
||||
* guardrail that says "this placeholder is meaningful only in skills X, Y, Z"
|
||||
* even if someone later adds {{NAME}} to skill W.
|
||||
*/
|
||||
|
||||
import type { TemplateContext, ResolverFn } from './types';
|
||||
import type { TemplateContext, ResolverFn, ResolverValue } from './types';
|
||||
|
||||
// Domain modules
|
||||
import { generatePreamble } from './preamble';
|
||||
@@ -24,7 +35,7 @@ import { generateQuestionPreferenceCheck, generateQuestionLog, generateInlineTun
|
||||
import { generateMakePdfSetup } from './make-pdf';
|
||||
import { generateTasksSectionEmit, generateTasksSectionAggregate } from './tasks-section';
|
||||
|
||||
export const RESOLVERS: Record<string, ResolverFn> = {
|
||||
export const RESOLVERS: Record<string, ResolverValue> = {
|
||||
SLUG_EVAL: generateSlugEval,
|
||||
SLUG_SETUP: generateSlugSetup,
|
||||
COMMAND_REFERENCE: generateCommandReference,
|
||||
|
||||
@@ -66,3 +66,36 @@ export interface TemplateContext {
|
||||
|
||||
/** Resolver function signature. args is populated for parameterized placeholders like {{INVOKE_SKILL:name}}. */
|
||||
export type ResolverFn = (ctx: TemplateContext, args?: string[]) => string;
|
||||
|
||||
/**
|
||||
* Optional gated resolver. When the gate returns false, the resolver is
|
||||
* skipped (substituted with empty string) — same effect as the placeholder
|
||||
* not being referenced. Use when a resolver's output is only meaningful for
|
||||
* a known subset of skills, so future template authors get a structural
|
||||
* guardrail instead of relying on social knowledge.
|
||||
*
|
||||
* Most resolvers don't need this — the {{NAME}} placeholder system is
|
||||
* already conditional at the template level. Use only when a resolver
|
||||
* lives inside another resolver (e.g. via preamble composition) AND must
|
||||
* be conditionalized, or when a top-level resolver has a small, well-defined
|
||||
* audience.
|
||||
*/
|
||||
export interface ResolverEntry {
|
||||
resolve: ResolverFn;
|
||||
appliesTo?: (ctx: TemplateContext) => boolean;
|
||||
}
|
||||
|
||||
/** Anything the RESOLVERS map accepts — either a bare function or a gated entry. */
|
||||
export type ResolverValue = ResolverFn | ResolverEntry;
|
||||
|
||||
/**
|
||||
* Type-narrowing helper for the gen-skill-docs lookup.
|
||||
* Returns (resolverFn, gate) so callers can do gate?.(ctx) before invoking.
|
||||
*/
|
||||
export function unwrapResolver(entry: ResolverValue): {
|
||||
resolve: ResolverFn;
|
||||
appliesTo?: (ctx: TemplateContext) => boolean;
|
||||
} {
|
||||
if (typeof entry === 'function') return { resolve: entry };
|
||||
return { resolve: entry.resolve, appliesTo: entry.appliesTo };
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user