diff --git a/docs/config.md b/docs/config.md index 21620c1..5896309 100644 --- a/docs/config.md +++ b/docs/config.md @@ -209,7 +209,7 @@ definitions. Promptkit resolves a selected profile definition from a test or embedding consumer's explicit in-memory profile, then the configured `profile_file` or `profile_dir`, then Weatherreporter's embedded catalog, and finally Promptkit's -built-in catalog. Weatherreporter's embedded `weather-*` definitions are small +maintained catalog. Weatherreporter's embedded `weather-*` definitions are small aliases of Promptkit's maintained base profiles, so Promptkit also resolves their inherited target and settings. A configured definition with the same ID as either a selected profile or an inherited base takes precedence. A matching diff --git a/docs/integrations/promptkit.md b/docs/integrations/promptkit.md index 819d339..35a446e 100644 --- a/docs/integrations/promptkit.md +++ b/docs/integrations/promptkit.md @@ -16,9 +16,12 @@ effective execution settings resolve from Promptkit's maintained catalog: The `~` prefix is part of each OpenRouter rolling-alias model ID. The embedded profiles intentionally omit endpoints, credentials, and execution settings; -Promptkit owns inherited resolution and its provider-native defaults. -Promptkit's built-in `rakestrawhome-gemma-4-31b` is also available for ordinary -and comparison selection and reports the `rakestrawhome` backend without +Promptkit owns inherited resolution and its provider-native defaults. Promptkit +assembles its maintained catalog from independently versioned OpenRouter and +Rakestrawhome modules selected by the Promptkit release. Weatherreporter does +not import or register those catalog modules directly. The maintained +`rakestrawhome-gemma-4-31b` profile is also available for ordinary and +comparison selection and reports the `rakestrawhome` backend without Weatherreporter-specific configuration. ## Selection And Active Execution @@ -28,7 +31,7 @@ Before weather collection, Weatherreporter validates the report's exact generate 1. explicit in-memory profiles used by an embedding consumer or test; 2. the configured `profile_file` or `profile_dir`; 3. Weatherreporter's embedded fallback profiles; and -4. Promptkit's built-in catalog. +4. Promptkit's maintained catalog. A source falls through only when the selected ID is absent. Promptkit resolves a derived profile's base with the same source precedence, so a configured base diff --git a/docs/internal/promptkit-adapter.md b/docs/internal/promptkit-adapter.md index a66f78f..064e265 100644 --- a/docs/internal/promptkit-adapter.md +++ b/docs/internal/promptkit-adapter.md @@ -2,7 +2,7 @@ `internal/adapters/promptkit` maps Weatherreporter's project-owned executor contract to Promptkit. The CLI maps `promptkit` configuration to a `PromptExecutorConfig` and constructs one executor per action. Promptkit dependency types do not escape the adapter. -The adapter supplies Weatherreporter's embedded prompt, schema, and fallback profile filesystems to each engine. Promptkit resolves configured operator profile sources, embedded profile aliases and their bases, and its built-in catalog; the adapter does not parse profile YAML, resolve inheritance, merge sources, inspect optional environment credentials, or probe endpoints. +The adapter supplies Weatherreporter's embedded prompt, schema, and fallback profile filesystems to each engine. Promptkit resolves configured operator profile sources, embedded profile aliases and their bases, and its maintained catalog. Promptkit privately assembles that catalog from the independently versioned OpenRouter and Rakestrawhome catalog modules selected by its release; Weatherreporter neither imports nor registers them. The adapter does not parse profile YAML, resolve inheritance, merge sources, inspect optional environment credentials, or probe endpoints. The adapter exposes exact prompt and profile validation plus prepared execution. It maps safe prompt identity, logical profile, effective backend/model, preparation, execution, validation, and optional debug values into `promptexec`. An empty backend identity remains valid for an endpoint-only profile; a nonblank model is required. PromptKit's configured repair-call budget and the completed result's actual corrective-call count are retained, along with its cumulative provider usage and final candidate. Structured provider generation failures become project-owned redacted generation errors that retain only bounded details through explicit accessors. `Execute` passes the YAML package as an inline Promptkit input; it does not construct a filesystem URI or write a package file. diff --git a/go.mod b/go.mod index cebf912..0b09610 100644 --- a/go.mod +++ b/go.mod @@ -6,9 +6,13 @@ require gopkg.in/yaml.v3 v3.0.1 require ( gitea.maximumdirect.net/eric/distributor v0.5.0 - gitea.maximumdirect.net/eric/promptkit v0.8.0 + gitea.maximumdirect.net/eric/promptkit v0.9.0 github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 golang.org/x/sys v0.45.0 ) -require golang.org/x/text v0.14.0 // indirect +require ( + gitea.maximumdirect.net/eric/promptkit-backend-openrouter v1.0.0 // indirect + gitea.maximumdirect.net/eric/promptkit-backend-rakestrawhome v1.0.0 // indirect + golang.org/x/text v0.14.0 // indirect +) diff --git a/go.sum b/go.sum index 30081f6..1acdcfd 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,11 @@ gitea.maximumdirect.net/eric/distributor v0.5.0 h1:+al7Bw+kMv6V35a3Sm5rUtCTQhwOn5b9x3RsclPMKJk= gitea.maximumdirect.net/eric/distributor v0.5.0/go.mod h1:G03FCFZPHpsUKC6SeMgTdbfNRpPQBdyTtDUj04e1Tu8= -gitea.maximumdirect.net/eric/promptkit v0.8.0 h1:NGd9hDLu0UMxKbvittMrqM5Ua94eFb+kOE7UIir8l08= -gitea.maximumdirect.net/eric/promptkit v0.8.0/go.mod h1:R95NM6fbMDGDC0/UomgnSBP6ui2ns+8SZb8bESNvrDQ= +gitea.maximumdirect.net/eric/promptkit v0.9.0 h1:IpvDRC8L6xRxQ9hpuyKOmMc5b6MeLTKYyx+h1YAjy08= +gitea.maximumdirect.net/eric/promptkit v0.9.0/go.mod h1:oMJ/WUJImUtwJ5e+6MAGECPYAErAkOaKel0G+3T/b4E= +gitea.maximumdirect.net/eric/promptkit-backend-openrouter v1.0.0 h1:lc062euk2qseO//D762i3JaFyulDNML3eQQX7DkYTho= +gitea.maximumdirect.net/eric/promptkit-backend-openrouter v1.0.0/go.mod h1:AIa7kAu2mfrRQgcspe4L+DW51WqgnALQT60lqkEywJI= +gitea.maximumdirect.net/eric/promptkit-backend-rakestrawhome v1.0.0 h1:j9YY7wsTVjzke2kHH4YAzpU0oUpM+x+nXwl1IeS+2eg= +gitea.maximumdirect.net/eric/promptkit-backend-rakestrawhome v1.0.0/go.mod h1:4RNS+LILDg4JbS4Ts9Lwy1C92wauXJIbeQaalps4Koo= github.com/aws/aws-sdk-go-v2 v1.41.9 h1:/rYeyO2+HrMztAmxAq9++XJtFMqSIpSsNA0yDGALYq4= github.com/aws/aws-sdk-go-v2 v1.41.9/go.mod h1:+HsoOEX80qAVUitj1A2DhCNTjmb3edVyuDypb6LNEeo= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.11 h1:h5+3VT69KUBK24grGuuA5saDJTj2IIjLb9au668Fo5I=