@exellix/ai-skills 6.14.0 → 6.16.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +41 -5
- package/dist/catalox/ai-skills-catalog.d.ts +2 -0
- package/dist/catalox/ai-skills-catalog.d.ts.map +1 -1
- package/dist/catalox/ai-skills-catalog.js +1 -0
- package/dist/catalox/ai-skills-catalog.js.map +1 -1
- package/dist/catalox/catalog-normalization.d.ts +2 -0
- package/dist/catalox/catalog-normalization.d.ts.map +1 -1
- package/dist/catalox/catalog-normalization.js +2 -0
- package/dist/catalox/catalog-normalization.js.map +1 -1
- package/dist/catalox/skill-runtime-catalog.d.ts +8 -0
- package/dist/catalox/skill-runtime-catalog.d.ts.map +1 -0
- package/dist/catalox/skill-runtime-catalog.js +39 -0
- package/dist/catalox/skill-runtime-catalog.js.map +1 -0
- package/dist/catalox/skill-templates.d.ts +3 -0
- package/dist/catalox/skill-templates.d.ts.map +1 -1
- package/dist/catalox/skill-templates.js +1 -0
- package/dist/catalox/skill-templates.js.map +1 -1
- package/dist/client/skill-executor.d.ts +3 -0
- package/dist/client/skill-executor.d.ts.map +1 -1
- package/dist/client/skill-executor.js +102 -9
- package/dist/client/skill-executor.js.map +1 -1
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +2 -0
- package/dist/client.js.map +1 -1
- package/dist/diagnostics/map-gateway-trace.d.ts.map +1 -1
- package/dist/diagnostics/map-gateway-trace.js +9 -0
- package/dist/diagnostics/map-gateway-trace.js.map +1 -1
- package/dist/index.d.ts +5 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -0
- package/dist/index.js.map +1 -1
- package/dist/invocation/append-server-tool-instructions.d.ts +7 -0
- package/dist/invocation/append-server-tool-instructions.d.ts.map +1 -0
- package/dist/invocation/append-server-tool-instructions.js +61 -0
- package/dist/invocation/append-server-tool-instructions.js.map +1 -0
- package/dist/invocation/build-gateway-config-for-skill-run.d.ts +22 -0
- package/dist/invocation/build-gateway-config-for-skill-run.d.ts.map +1 -0
- package/dist/invocation/build-gateway-config-for-skill-run.js +33 -0
- package/dist/invocation/build-gateway-config-for-skill-run.js.map +1 -0
- package/dist/invocation/merge-gateway-tool-config.d.ts +8 -0
- package/dist/invocation/merge-gateway-tool-config.d.ts.map +1 -0
- package/dist/invocation/merge-gateway-tool-config.js +86 -0
- package/dist/invocation/merge-gateway-tool-config.js.map +1 -0
- package/dist/invocation/validate-server-tools.d.ts +8 -0
- package/dist/invocation/validate-server-tools.d.ts.map +1 -0
- package/dist/invocation/validate-server-tools.js +143 -0
- package/dist/invocation/validate-server-tools.js.map +1 -0
- package/dist/types/server-tools.d.ts +126 -0
- package/dist/types/server-tools.d.ts.map +1 -0
- package/dist/types/server-tools.js +2 -0
- package/dist/types/server-tools.js.map +1 -0
- package/dist/types.d.ts +57 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/normalize-server-tool-metadata.d.ts +12 -0
- package/dist/utils/normalize-server-tool-metadata.d.ts.map +1 -0
- package/dist/utils/normalize-server-tool-metadata.js +61 -0
- package/dist/utils/normalize-server-tool-metadata.js.map +1 -0
- package/dist/utils/patch-activix-activity-after-skill.d.ts +2 -0
- package/dist/utils/patch-activix-activity-after-skill.d.ts.map +1 -1
- package/dist/utils/patch-activix-activity-after-skill.js +56 -6
- package/dist/utils/patch-activix-activity-after-skill.js.map +1 -1
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -22,6 +22,7 @@ Foundational skill execution layer for the exellix ecosystem: templates live in
|
|
|
22
22
|
| Graph execution context (`graphId`, `nodeId`, identity mapping) | **[docs/GRAPH_EXECUTION_SUPPORT.md](docs/GRAPH_EXECUTION_SUPPORT.md)** |
|
|
23
23
|
| Skills manager: preflight, FuncX, authoring (not in this package) | **[docs/SKILLS_MANAGER_CLIENT_GUIDE.md](docs/SKILLS_MANAGER_CLIENT_GUIDE.md)** |
|
|
24
24
|
| External follow-ups (Activix persistence vs gateway envelope) | **[docs/AI_GATEWAY_FEATURE_REQUESTS.md](docs/AI_GATEWAY_FEATURE_REQUESTS.md)** |
|
|
25
|
+
| Gateway server tools (OpenRouter pass-through) | **[docs/GATEWAY_SERVER_TOOLS.md](docs/GATEWAY_SERVER_TOOLS.md)** · [OPENROUTER_SERVER_TOOLS_WITH_AI_SKILLS.md](docs/OPENROUTER_SERVER_TOOLS_WITH_AI_SKILLS.md) · [upstream CR for gateway](docs/AI_GATEWAY_SERVER_TOOLS_CR.md) |
|
|
25
26
|
|
|
26
27
|
## Features
|
|
27
28
|
|
|
@@ -46,7 +47,7 @@ npm install @exellix/ai-skills
|
|
|
46
47
|
|
|
47
48
|
This package depends on **`@x12i/ai-gateway`**, **`@x12i/catalox`**, **`@x12i/logxer`**, **`@x12i/env`**, **`@x12i/rendrix`**, and **`firebase-admin`** (for Firestore-backed Catalox). **`@x12i/catalox` ≥ 4.0** expects **Node 20+**. Align **`firebase-admin`** / **`@x12i/catalox`** versions with your app if you share a Firebase app instance.
|
|
48
49
|
|
|
49
|
-
**`@x12i/ai-gateway` ≥ 10.1.
|
|
50
|
+
**`@x12i/ai-gateway` ≥ 10.4.1** (recommend **≥ 10.4.3** for citation-required policy via openrouter-runtime 1.0.3) (see `package.json`) with **`@x12i/activix` ^8.6** and **`@x12i/ai-profiles` ^3.0.0** is required: every invoke needs an explicit wire **`model`** and **`maxTokens`** (this package supplies **`maxTokens`** via **`@x12i/optimixer`** before `gateway.invoke()`). Invoke **`metadata`** includes routing fields (≥9.1.1), rejection **`metadata`** on failures (≥9.1.2), normalized billing (**`costUsd`**, **`cost`**, **`costStatus: priced | unpriced`**, optional **`costBreakdown`**) on success (≥9.3; ai-tools catalog pricing in gateway ≥10.1), and optional **OpenRouter server-tool metadata** (≥10.4.1). **This package does not use `@x12i/ai-tools` directly** — cost is resolved by the gateway. See **`docs/UPGRADING_AI_GATEWAY_10.md`** and **`docs/AI_GATEWAY_INVOKE_EXECUTION_METADATA.md`**. Every **`runSkill`** call must include **`agentId`**, **`jobTypeId`**, and **`taskTypeId`** (Activix linkage — no package defaults).
|
|
50
51
|
|
|
51
52
|
**CI:** `npm run test:ci` runs **`npm run build`** and **`npm run test:unit`** (no live Firestore or real LLM). Full **`npm test`** still runs **`test:integration`**, which may append live catalog tests when env enables them.
|
|
52
53
|
|
|
@@ -154,8 +155,9 @@ Applies to **`@exellix/ai-tasks` 8.4+** and other graph orchestrators calling **
|
|
|
154
155
|
| Send | Do not send |
|
|
155
156
|
|------|-------------|
|
|
156
157
|
| Wire **`model`** / **`modelId`** (required) | **`maxTokens`**, **`max_completion_tokens`**, **`max_output_tokens`** on `modelConfig` |
|
|
157
|
-
| Optional **`temperature`**, **`topP`**, **`reasoningEffort`**, **`frequencyPenalty`**, **`presencePenalty`**, **`retry`** | Profile / plan model names — resolve in `@exellix/ai-tasks` only |
|
|
158
|
-
| Optional **`
|
|
158
|
+
| Optional **`temperature`**, **`topP`**, **`reasoningEffort`**, **`frequencyPenalty`**, **`presencePenalty`**, **`retry`**, **`timeoutMs`** | Profile / plan model names — resolve in `@exellix/ai-tasks` only |
|
|
159
|
+
| Optional **`serverTools`**, **`openrouter.apiMode`** (top-level or on `modelConfig`) | Raw OpenRouter tool payloads, provider secrets |
|
|
160
|
+
| Optional **`provider`** | Expectation that ai-skills picks a default model |
|
|
159
161
|
|
|
160
162
|
**Token budget:** owned by **`@x12i/optimixer`** from Catalox catalog + prompts. After invoke, read **`metadata.usage.maxTokensRequested`** (and trace **`usage.maxTokensRequested`** when trace mode is on).
|
|
161
163
|
|
|
@@ -216,7 +218,41 @@ console.log(res.identity?.aiSkillsLlm);
|
|
|
216
218
|
|
|
217
219
|
**Max-token retry (MAIN hop):** When the provider returns a limit **`finishReason`** (e.g. `length`) and Optimixer **`completeAiMaxTokensPrediction`** returns **`retryPrediction`**, this package **re-invokes the gateway once** with Optimixer’s bumped **`recommendedMaxTokens`** (caller ceilings still apply via existing merge). Up to **one** retry; observability includes **`metadata.optimixerRetryCount`** and log code **`OPTIMIXER_MAX_TOKENS_RETRY`**. No local token multipliers or re-predict bypass.
|
|
218
220
|
|
|
219
|
-
**Other `modelConfig` fields** (`temperature`, `topP`, `reasoningEffort`, `provider`, …) are forwarded when set.
|
|
221
|
+
**Other `modelConfig` fields** (`temperature`, `topP`, `reasoningEffort`, `provider`, `serverTools`, `openrouter`, …) are forwarded when set.
|
|
222
|
+
|
|
223
|
+
### 3b) Gateway server tools (OpenRouter pass-through)
|
|
224
|
+
|
|
225
|
+
`@exellix/ai-skills` forwards OpenRouter **server-tool intent** to **`@x12i/ai-gateway` (≥ 10.4.1; recommend ≥ 10.4.3)**. This package does **not** execute OpenRouter tools locally and does **not** depend on `@x12i/openrouter-runtime`.
|
|
226
|
+
|
|
227
|
+
- Set **`serverTools`** on the request, on **`modelConfig`**, in Catalox **`data.runtime.serverTools`**, or via client **`defaultServerTools`** (merge order: client → catalog → request → modelConfig).
|
|
228
|
+
- Tool usage, citations, generated images, and patch proposals appear on **`RunSkillResponse.metadata`** (not in FlexMD unless the skill template asks for them).
|
|
229
|
+
- No tools are enabled by default; existing skills behave unchanged unless you opt in.
|
|
230
|
+
|
|
231
|
+
See **[docs/GATEWAY_SERVER_TOOLS.md](docs/GATEWAY_SERVER_TOOLS.md)** · **[docs/OPENROUTER_SERVER_TOOLS_WITH_AI_SKILLS.md](docs/OPENROUTER_SERVER_TOOLS_WITH_AI_SKILLS.md)**.
|
|
232
|
+
|
|
233
|
+
```typescript
|
|
234
|
+
const res = await skills.runSkill({
|
|
235
|
+
skillKey: "skills/professional-answer",
|
|
236
|
+
input: "What changed in the vendor docs?",
|
|
237
|
+
jobId: "job-1",
|
|
238
|
+
taskId: "task-1",
|
|
239
|
+
agentId: "agent-1",
|
|
240
|
+
jobTypeId: "research",
|
|
241
|
+
taskTypeId: "answer",
|
|
242
|
+
modelConfig: {
|
|
243
|
+
provider: "openrouter",
|
|
244
|
+
model: "openai/gpt-5.2",
|
|
245
|
+
serverTools: {
|
|
246
|
+
webSearch: { mode: "required", engine: "auto", maxResults: 5 },
|
|
247
|
+
webFetch: { mode: "allowed", maxContentTokens: 50000 },
|
|
248
|
+
},
|
|
249
|
+
},
|
|
250
|
+
});
|
|
251
|
+
|
|
252
|
+
console.log(res.flexMd.payloads);
|
|
253
|
+
console.log(res.metadata.citations);
|
|
254
|
+
console.log(res.metadata.serverTools);
|
|
255
|
+
```
|
|
220
256
|
|
|
221
257
|
| What you need | Where it appears |
|
|
222
258
|
|---------------|------------------|
|
|
@@ -673,7 +709,7 @@ Details and caveats: **[docs/FLEX_MD_AND_TESTING.md](docs/FLEX_MD_AND_TESTING.md
|
|
|
673
709
|
|
|
674
710
|
- **Node.js 20+** (see `package.json` **`engines`**; aligns with **`@x12i/catalox`**)
|
|
675
711
|
- **`@x12i/catalox`** **≥ 4** and **Firebase** access for the **`ai-skills`** native catalog (see **`createCataloxFromEnv`** and [Environment (Firebase & Catalox v4)](#environment-firebase--catalox-v4))
|
|
676
|
-
- **`@x12i/ai-gateway`** **^10.1
|
|
712
|
+
- **`@x12i/ai-gateway`** **^10.4.1** (see `package.json`; shares **`@x12i/activix` ^8.6** with this package)
|
|
677
713
|
- **`@x12i/ai-profiles`** **^3.0.0** (profile/choice → wire model resolution)
|
|
678
714
|
- **`@x12i/activix`** **^8.6.0** (direct dependency for activity-row enrichment types/patches)
|
|
679
715
|
- At least one LLM provider key when using the default constructed gateway
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { CatalogDescriptor } from "@x12i/catalox";
|
|
2
2
|
import type { SkillOptimixerCatalogSpec } from "./skill-optimixer-catalog.js";
|
|
3
|
+
import type { AiSkillCatalogRuntimeMeta } from "../types/server-tools.js";
|
|
3
4
|
/** Catalox `catalogId` and default `appId` for published skill discovery. */
|
|
4
5
|
export declare const AI_SKILLS_CATALOG_ID: "ai-skills";
|
|
5
6
|
export declare const AI_SKILLS_APP_ID: "ai-skills";
|
|
@@ -17,6 +18,7 @@ export type AiSkillsCatalogItemSpec = {
|
|
|
17
18
|
isLocal: boolean;
|
|
18
19
|
optimixer: SkillOptimixerCatalogSpec;
|
|
19
20
|
catalogReleaseStatus?: CatalogReleaseStatus;
|
|
21
|
+
runtime?: AiSkillCatalogRuntimeMeta;
|
|
20
22
|
};
|
|
21
23
|
/**
|
|
22
24
|
* Authoritative in-repo list for Catalox provisioning and package docs.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ai-skills-catalog.d.ts","sourceRoot":"","sources":["../../src/catalox/ai-skills-catalog.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"ai-skills-catalog.d.ts","sourceRoot":"","sources":["../../src/catalox/ai-skills-catalog.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AAC9E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAG1E,6EAA6E;AAC7E,eAAO,MAAM,oBAAoB,EAAG,WAAoB,CAAC;AACzD,eAAO,MAAM,gBAAgB,EAAG,WAAoB,CAAC;AAErD,iFAAiF;AACjF,eAAO,MAAM,4BAA4B,EAAG,GAAY,CAAC;AAEzD,MAAM,MAAM,oBAAoB,GAAG,OAAO,GAAG,WAAW,CAAC;AAEzD;;GAEG;AACH,MAAM,MAAM,uBAAuB,GAAG;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,sHAAsH;IACtH,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,yBAAyB,CAAC;IACrC,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,OAAO,CAAC,EAAE,yBAAyB,CAAC;CACvC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,EAAE,SAAS,uBAAuB,EAiB5D,CAAC;AAEX,wGAAwG;AACxG,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEvE,CAAC;AAEF,2HAA2H;AAC3H,wBAAgB,+BAA+B,CAC3C,GAAG,EAAE,uBAAuB,EAC5B,MAAM,EAAE;IACJ,MAAM,EAAE,SAAS,GAAG,OAAO,GAAG,WAAW,CAAC;IAC1C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,qBAAqB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnD,GACF,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAYzB;AAED,wBAAgB,8BAA8B,IAAI,iBAAiB,CAoIlE;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACjC,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,oBAAoB,EAAE,oBAAoB,GAAG,SAAS,GACvD,SAAS,GAAG,OAAO,GAAG,WAAW,CAMnC;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAElE"}
|
|
@@ -38,6 +38,7 @@ export function aiSkillsCatalogItemToNativeData(row, bodies) {
|
|
|
38
38
|
...(bodies.promptText !== undefined ? { promptText: bodies.promptText } : {}),
|
|
39
39
|
...(bodies.supportTemplates !== undefined ? { supportTemplates: bodies.supportTemplates } : {}),
|
|
40
40
|
...(bodies.supportedCapabilities !== undefined ? { supportedCapabilities: bodies.supportedCapabilities } : {}),
|
|
41
|
+
...(row.runtime !== undefined ? { runtime: row.runtime } : {}),
|
|
41
42
|
_provisionStatus: bodies.status,
|
|
42
43
|
};
|
|
43
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ai-skills-catalog.js","sourceRoot":"","sources":["../../src/catalox/ai-skills-catalog.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ai-skills-catalog.js","sourceRoot":"","sources":["../../src/catalox/ai-skills-catalog.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AAEzE,6EAA6E;AAC7E,MAAM,CAAC,MAAM,oBAAoB,GAAG,WAAoB,CAAC;AACzD,MAAM,CAAC,MAAM,gBAAgB,GAAG,WAAoB,CAAC;AAErD,iFAAiF;AACjF,MAAM,CAAC,MAAM,4BAA4B,GAAG,GAAY,CAAC;AAkBzD;;;;GAIG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAuC;IACvE;QACI,QAAQ,EAAE,qBAAqB;QAC/B,KAAK,EAAE,qBAAqB;QAC5B,WAAW,EACP,yEAAyE;YACzE,qFAAqF;QACzF,OAAO,EAAE,KAAK;QACd,oBAAoB,EAAE,WAAW;QACjC,SAAS,EAAE;YACP,eAAe,EAAE,KAAK;YACtB,YAAY,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,qBAAqB,EAAE,IAAI,EAAE,kBAAkB,EAAE,IAAI,EAAE;YACzF,cAAc,EAAE,QAAQ;YACxB,QAAQ,EAAE,IAAI;YACd,UAAU,EAAE,UAAU;SACzB;KACJ;CACK,CAAC;AAEX,wGAAwG;AACxG,MAAM,CAAC,MAAM,yBAAyB,GAAsC,MAAM,CAAC,WAAW,CAC1F,uBAAuB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CACpE,CAAC;AAEF,2HAA2H;AAC3H,MAAM,UAAU,+BAA+B,CAC3C,GAA4B,EAC5B,MAMC;IAED,OAAO;QACH,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,SAAS,EAAE,yBAAyB,CAAC,GAAG,CAAC,SAAS,CAAC;QACnD,GAAG,CAAC,MAAM,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/F,GAAG,CAAC,MAAM,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7E,GAAG,CAAC,MAAM,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/F,GAAG,CAAC,MAAM,CAAC,qBAAqB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,qBAAqB,EAAE,MAAM,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9G,GAAG,CAAC,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,gBAAgB,EAAE,MAAM,CAAC,MAAM;KAClC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,8BAA8B;IAC1C,OAAO;QACH,SAAS,EAAE,oBAAoB;QAC/B,KAAK,EAAE,WAAW;QAClB,WAAW,EAAE,6EAA6E;QAC1F,SAAS,EAAE,OAAO;QAClB,UAAU,EAAE,QAAQ;QACpB,MAAM,EAAE,QAAQ;QAChB,UAAU,EAAE,SAAS;QACrB,WAAW,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE;QACpD,YAAY,EAAE;YACV,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,IAAI;YACf,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,IAAI;YACf,SAAS,EAAE,IAAI;YACf,SAAS,EAAE,IAAI;YACf,WAAW,EAAE,IAAI;YACjB,iBAAiB,EAAE,IAAI;SAC1B;QACD,eAAe,EAAE;YACb;gBACI,GAAG,EAAE,UAAU;gBACf,KAAK,EAAE,WAAW;gBAClB,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,IAAI;gBAChB,QAAQ,EAAE,IAAI;gBACd,WAAW,EAAE,IAAI;gBACjB,aAAa,EAAE,IAAI;gBACnB,QAAQ,EAAE,IAAI;aACjB;YACD;gBACI,GAAG,EAAE,OAAO;gBACZ,KAAK,EAAE,OAAO;gBACd,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,KAAK;gBACd,UAAU,EAAE,KAAK;gBACjB,QAAQ,EAAE,IAAI;gBACd,WAAW,EAAE,IAAI;gBACjB,aAAa,EAAE,IAAI;gBACnB,QAAQ,EAAE,IAAI;aACjB;YACD;gBACI,GAAG,EAAE,aAAa;gBAClB,KAAK,EAAE,aAAa;gBACpB,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,KAAK;gBACd,UAAU,EAAE,KAAK;gBACjB,QAAQ,EAAE,KAAK;gBACf,WAAW,EAAE,IAAI;gBACjB,aAAa,EAAE,IAAI;gBACnB,QAAQ,EAAE,IAAI;aACjB;YACD;gBACI,GAAG,EAAE,WAAW;gBAChB,KAAK,EAAE,WAAW;gBAClB,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,KAAK;gBACd,UAAU,EAAE,KAAK;gBACjB,QAAQ,EAAE,KAAK;gBACf,WAAW,EAAE,KAAK;gBAClB,aAAa,EAAE,IAAI;gBACnB,QAAQ,EAAE,IAAI;aACjB;YACD;gBACI,GAAG,EAAE,kBAAkB;gBACvB,KAAK,EAAE,cAAc;gBACrB,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,kBAAkB;gBACxB,WAAW,EAAE,KAAK;gBAClB,aAAa,EAAE,IAAI;gBACnB,QAAQ,EAAE,KAAK;aAClB;YACD;gBACI,GAAG,EAAE,YAAY;gBACjB,KAAK,EAAE,QAAQ;gBACf,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,YAAY;gBAClB,WAAW,EAAE,KAAK;gBAClB,aAAa,EAAE,IAAI;gBACnB,QAAQ,EAAE,KAAK;aAClB;YACD;gBACI,GAAG,EAAE,uBAAuB;gBAC5B,KAAK,EAAE,oBAAoB;gBAC3B,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,uBAAuB;gBAC7B,WAAW,EAAE,KAAK;gBAClB,aAAa,EAAE,IAAI;gBACnB,QAAQ,EAAE,KAAK;aAClB;YACD;gBACI,GAAG,EAAE,iBAAiB;gBACtB,KAAK,EAAE,cAAc;gBACrB,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,iBAAiB;gBACvB,WAAW,EAAE,KAAK;gBAClB,aAAa,EAAE,IAAI;gBACnB,QAAQ,EAAE,KAAK;aAClB;YACD;gBACI,GAAG,EAAE,kBAAkB;gBACvB,KAAK,EAAE,mBAAmB;gBAC1B,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,kBAAkB;gBACxB,WAAW,EAAE,KAAK;gBAClB,aAAa,EAAE,IAAI;gBACnB,QAAQ,EAAE,KAAK;aAClB;YACD;gBACI,GAAG,EAAE,uBAAuB;gBAC5B,KAAK,EAAE,wBAAwB;gBAC/B,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,uBAAuB;gBAC7B,WAAW,EAAE,KAAK;gBAClB,aAAa,EAAE,IAAI;gBACnB,QAAQ,EAAE,KAAK;aAClB;SACJ;QACD,QAAQ,EAAE;YACN,cAAc,EAAE,SAAS;YACzB,WAAW,EAAE,UAAU;YACvB,UAAU,EAAE,OAAO;YACnB,WAAW,EAAE,QAAQ;SACxB;KACJ,CAAC;AACN,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,qBAAqB,CACjC,gBAAoC,EACpC,UAA8B,EAC9B,oBAAsD;IAEtD,MAAM,GAAG,GAAG,gBAAgB,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC3C,MAAM,EAAE,GAAG,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACpC,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE;QAAE,OAAO,SAAS,CAAC;IAClC,IAAI,oBAAoB,KAAK,WAAW;QAAE,OAAO,WAAW,CAAC;IAC7D,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,QAAgB;IACrD,OAAO,yBAAyB,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC;AACxD,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { NativeCatalogItemRecord } from "@x12i/catalox";
|
|
2
2
|
import type { SkillOptimixerCatalogSpec } from "./skill-optimixer-catalog.js";
|
|
3
|
+
import { type AiSkillCatalogRuntimeMeta } from "./skill-runtime-catalog.js";
|
|
3
4
|
import { type PersistedSkillVariableMetadata } from "./skill-template-variables.js";
|
|
4
5
|
import type { SkillCatalogStatus } from "./skill-templates.js";
|
|
5
6
|
import { type SkillSupportTemplates, type SkillSupportedCapabilities } from "./skill-support-templates.js";
|
|
@@ -24,6 +25,7 @@ export type ResolvedBaseSkillData = {
|
|
|
24
25
|
supportedCapabilities?: SkillSupportedCapabilities;
|
|
25
26
|
optimixer: SkillOptimixerCatalogSpec;
|
|
26
27
|
templateVariableMetadata?: PersistedSkillVariableMetadata;
|
|
28
|
+
runtime?: AiSkillCatalogRuntimeMeta;
|
|
27
29
|
};
|
|
28
30
|
export type ResolvedSubSkillData = {
|
|
29
31
|
subSkillKey: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog-normalization.d.ts","sourceRoot":"","sources":["../../src/catalox/catalog-normalization.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAE7D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AAE9E,OAAO,EAEH,KAAK,8BAA8B,EACtC,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAGH,KAAK,qBAAqB,EAC1B,KAAK,0BAA0B,EAClC,MAAM,8BAA8B,CAAC;AAEtC,+EAA+E;AAC/E,eAAO,MAAM,yBAAyB,mLAU5B,CAAC;AAEX,MAAM,MAAM,qBAAqB,GAAG,CAAC,OAAO,yBAAyB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE/E,MAAM,MAAM,iBAAiB,GAAG,OAAO,CACnC,MAAM,CACF,OAAO,CAAC,qBAAqB,EAAE,WAAW,GAAG,0BAA0B,GAAG,uBAAuB,CAAC,EAClG,MAAM,CACT,GAAG;IACA,SAAS,CAAC,EAAE,yBAAyB,CAAC;IACtC,wBAAwB,CAAC,EAAE,8BAA8B,CAAC;IAC1D,qBAAqB,CAAC,EAAE,0BAA0B,CAAC;CACtD,CACJ,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,qBAAqB,CAAC;IACzC,qBAAqB,CAAC,EAAE,0BAA0B,CAAC;IACnD,SAAS,EAAE,yBAAyB,CAAC;IACrC,wBAAwB,CAAC,EAAE,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"catalog-normalization.d.ts","sourceRoot":"","sources":["../../src/catalox/catalog-normalization.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { DEPRECATED_FLAT_OPTIMIXER_DATA_KEYS } from "./catalog-guards.js";
|
|
2
2
|
import { optimixerSpecToNestedData, parseOptimixerFromRecordData } from "./skill-optimixer-catalog.js";
|
|
3
|
+
import { parseSkillRuntimeFromRecordData } from "./skill-runtime-catalog.js";
|
|
3
4
|
import { parsePersistedSkillVariableMetadata, } from "./skill-template-variables.js";
|
|
4
5
|
import { parseSupportTemplatesFromData, parseSupportedCapabilitiesFromData, } from "./skill-support-templates.js";
|
|
5
6
|
/** Fields compared when computing sub-skill overrides against a parent row. */
|
|
@@ -134,6 +135,7 @@ function partialBaseSkillFromRecord(record, skillKeyForErrors) {
|
|
|
134
135
|
supportedCapabilities: parseSupportedCapabilitiesFromData(data),
|
|
135
136
|
optimixer,
|
|
136
137
|
templateVariableMetadata: parsePersistedSkillVariableMetadata(data.templateVariableMetadata),
|
|
138
|
+
runtime: parseSkillRuntimeFromRecordData(data),
|
|
137
139
|
};
|
|
138
140
|
}
|
|
139
141
|
/** Resolve a normalized ai-skills base row into runtime skill data. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog-normalization.js","sourceRoot":"","sources":["../../src/catalox/catalog-normalization.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"catalog-normalization.js","sourceRoot":"","sources":["../../src/catalox/catalog-normalization.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { AiSkillCatalogRuntimeMeta } from "../types/server-tools.js";
|
|
2
|
+
export type { AiSkillCatalogRuntimeMeta } from "../types/server-tools.js";
|
|
3
|
+
/**
|
|
4
|
+
* Parse optional Catalox `data.runtime` execution metadata.
|
|
5
|
+
*/
|
|
6
|
+
export declare function parseSkillRuntimeFromRecordData(data: Record<string, unknown>): AiSkillCatalogRuntimeMeta | undefined;
|
|
7
|
+
export declare function validateSkillRuntimeMeta(scope: string, runtime: AiSkillCatalogRuntimeMeta): string[];
|
|
8
|
+
//# sourceMappingURL=skill-runtime-catalog.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"skill-runtime-catalog.d.ts","sourceRoot":"","sources":["../../src/catalox/skill-runtime-catalog.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,yBAAyB,EAI5B,MAAM,0BAA0B,CAAC;AAElC,YAAY,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAW1E;;GAEG;AACH,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,yBAAyB,GAAG,SAAS,CAkBpH;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,yBAAyB,GAAG,MAAM,EAAE,CAOpG"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
function isPlainObject(v) {
|
|
2
|
+
return typeof v === "object" && v !== null && !Array.isArray(v);
|
|
3
|
+
}
|
|
4
|
+
function readInstructionMode(value) {
|
|
5
|
+
if (value === "none" || value === "minimal" || value === "strict")
|
|
6
|
+
return value;
|
|
7
|
+
return undefined;
|
|
8
|
+
}
|
|
9
|
+
/**
|
|
10
|
+
* Parse optional Catalox `data.runtime` execution metadata.
|
|
11
|
+
*/
|
|
12
|
+
export function parseSkillRuntimeFromRecordData(data) {
|
|
13
|
+
const runtime = data.runtime;
|
|
14
|
+
if (!isPlainObject(runtime))
|
|
15
|
+
return undefined;
|
|
16
|
+
const out = {};
|
|
17
|
+
if (isPlainObject(runtime.serverTools)) {
|
|
18
|
+
out.serverTools = runtime.serverTools;
|
|
19
|
+
}
|
|
20
|
+
if (isPlainObject(runtime.openrouter)) {
|
|
21
|
+
out.openrouter = runtime.openrouter;
|
|
22
|
+
}
|
|
23
|
+
const instructionMode = readInstructionMode(runtime.serverToolInstructionMode);
|
|
24
|
+
if (instructionMode !== undefined) {
|
|
25
|
+
out.serverToolInstructionMode = instructionMode;
|
|
26
|
+
}
|
|
27
|
+
if (Object.keys(out).length === 0)
|
|
28
|
+
return undefined;
|
|
29
|
+
return out;
|
|
30
|
+
}
|
|
31
|
+
export function validateSkillRuntimeMeta(scope, runtime) {
|
|
32
|
+
const issues = [];
|
|
33
|
+
const mode = runtime.serverToolInstructionMode;
|
|
34
|
+
if (mode !== undefined && mode !== "none" && mode !== "minimal" && mode !== "strict") {
|
|
35
|
+
issues.push(`${scope}: data.runtime.serverToolInstructionMode must be none | minimal | strict`);
|
|
36
|
+
}
|
|
37
|
+
return issues;
|
|
38
|
+
}
|
|
39
|
+
//# sourceMappingURL=skill-runtime-catalog.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"skill-runtime-catalog.js","sourceRoot":"","sources":["../../src/catalox/skill-runtime-catalog.ts"],"names":[],"mappings":"AASA,SAAS,aAAa,CAAC,CAAU;IAC7B,OAAO,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AACpE,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAc;IACvC,IAAI,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAChF,OAAO,SAAS,CAAC;AACrB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,+BAA+B,CAAC,IAA6B;IACzE,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAC7B,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC;QAAE,OAAO,SAAS,CAAC;IAE9C,MAAM,GAAG,GAA8B,EAAE,CAAC;IAC1C,IAAI,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QACrC,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC,WAAwC,CAAC;IACvE,CAAC;IACD,IAAI,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QACpC,GAAG,CAAC,UAAU,GAAG,OAAO,CAAC,UAAsC,CAAC;IACpE,CAAC;IACD,MAAM,eAAe,GAAG,mBAAmB,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAC/E,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;QAChC,GAAG,CAAC,yBAAyB,GAAG,eAAe,CAAC;IACpD,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACpD,OAAO,GAAG,CAAC;AACf,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,KAAa,EAAE,OAAkC;IACtF,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,IAAI,GAAG,OAAO,CAAC,yBAAyB,CAAC;IAC/C,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACnF,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,0EAA0E,CAAC,CAAC;IACpG,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC"}
|
|
@@ -2,6 +2,7 @@ import type { Catalox, CataloxContext, UnifiedCatalogItem } from "@x12i/catalox"
|
|
|
2
2
|
import { type CataloxCatalogAccess } from "./catalox-native-io.js";
|
|
3
3
|
import { type ResolvedRuntimeSkillData } from "./catalog-normalization.js";
|
|
4
4
|
import type { SkillOptimixerCatalogSpec } from "./skill-optimixer-catalog.js";
|
|
5
|
+
import type { AiSkillCatalogRuntimeMeta } from "./skill-runtime-catalog.js";
|
|
5
6
|
import type { SkillSupportTemplates, SkillSupportedCapabilities } from "./skill-support-templates.js";
|
|
6
7
|
export type SkillCatalogStatus = "planned" | "draft" | "published";
|
|
7
8
|
export type { CataloxCatalogAccess } from "./catalox-native-io.js";
|
|
@@ -20,6 +21,7 @@ export type AiSkillsCatalogItemDataFields = {
|
|
|
20
21
|
supportedCapabilities?: SkillSupportedCapabilities;
|
|
21
22
|
optimixer?: Record<string, unknown>;
|
|
22
23
|
overrides?: Record<string, unknown>;
|
|
24
|
+
runtime?: Record<string, unknown>;
|
|
23
25
|
};
|
|
24
26
|
export declare function catalogItemIdFromSkillKey(skillKey: string): string;
|
|
25
27
|
export type RunnableTemplateBodiesFromCatalogData = {
|
|
@@ -63,6 +65,7 @@ export declare function fetchSkillTemplatesFromCatalox(catalox: Catalox, context
|
|
|
63
65
|
promptPayload: string;
|
|
64
66
|
status: SkillCatalogStatus;
|
|
65
67
|
optimixer: SkillOptimixerCatalogSpec;
|
|
68
|
+
runtime?: AiSkillCatalogRuntimeMeta;
|
|
66
69
|
}>;
|
|
67
70
|
export declare function defaultAiSkillsCataloxContext(overrides?: Partial<CataloxContext>): CataloxContext;
|
|
68
71
|
export declare function readSkillKeyFromCatalogItem(item: UnifiedCatalogItem): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skill-templates.d.ts","sourceRoot":"","sources":["../../src/catalox/skill-templates.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAKjF,OAAO,EAAmC,KAAK,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AACpG,OAAO,EAKH,KAAK,wBAAwB,EAChC,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AAC9E,OAAO,KAAK,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAEtG,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,OAAO,GAAG,WAAW,CAAC;AAEnE,YAAY,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAEnE,MAAM,MAAM,uBAAuB,GAAG,SAAS,GAAG,OAAO,CAAC;AAE1D;;GAEG;AACH,MAAM,MAAM,6BAA6B,GAAG;IACxC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,qBAAqB,CAAC;IACzC,qBAAqB,CAAC,EAAE,0BAA0B,CAAC;IACnD,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"skill-templates.d.ts","sourceRoot":"","sources":["../../src/catalox/skill-templates.ts"],"names":[],"mappings":"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"}
|
|
@@ -96,6 +96,7 @@ export async function fetchSkillTemplatesFromCatalox(catalox, context, skillKey,
|
|
|
96
96
|
promptPayload: ensureGatewayTreatsAsTemplateText(extracted.promptRaw),
|
|
97
97
|
status: extracted.status,
|
|
98
98
|
optimixer: resolved.optimixer,
|
|
99
|
+
runtime: resolved.runtime,
|
|
99
100
|
};
|
|
100
101
|
}
|
|
101
102
|
export function defaultAiSkillsCataloxContext(overrides) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skill-templates.js","sourceRoot":"","sources":["../../src/catalox/skill-templates.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,iCAAiC,EAAE,MAAM,mCAAmC,CAAC;AACzG,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,yBAAyB,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AACpG,OAAO,EAAiB,gBAAgB,EAA6B,MAAM,wBAAwB,CAAC;AACpG,OAAO,EACH,uBAAuB,EACvB,0BAA0B,EAC1B,yBAAyB,EACzB,mBAAmB,GAEtB,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"skill-templates.js","sourceRoot":"","sources":["../../src/catalox/skill-templates.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { BaseClient } from "./base-client.js";
|
|
|
4
4
|
import { RunSkillRequest, RunSkillResponse } from "../types.js";
|
|
5
5
|
import type { Catalox } from "@x12i/catalox";
|
|
6
6
|
import { OPTIMIXER_MAX_TOKEN_RETRY_MAX_ATTEMPTS, resetSkillsOptimixerForTests, setSkillsOptimixerForTests } from "../optimixer/skills-optimixer.js";
|
|
7
|
+
import type { AiSkillsOpenRouterConfig, AiSkillsServerToolsConfig } from "../types/server-tools.js";
|
|
7
8
|
export { resetSkillsOptimixerForTests, setSkillsOptimixerForTests, OPTIMIXER_MAX_TOKEN_RETRY_MAX_ATTEMPTS, };
|
|
8
9
|
/**
|
|
9
10
|
* SkillExecutor
|
|
@@ -18,6 +19,8 @@ export { resetSkillsOptimixerForTests, setSkillsOptimixerForTests, OPTIMIXER_MAX
|
|
|
18
19
|
export type SkillExecutorContentOptions = {
|
|
19
20
|
catalox: Catalox;
|
|
20
21
|
cataloxAppId?: string;
|
|
22
|
+
defaultServerTools?: AiSkillsServerToolsConfig;
|
|
23
|
+
defaultOpenRouter?: AiSkillsOpenRouterConfig;
|
|
21
24
|
};
|
|
22
25
|
export declare class SkillExecutor extends BaseClient {
|
|
23
26
|
private readonly contentOptions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skill-executor.d.ts","sourceRoot":"","sources":["../../src/client/skill-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAKH,KAAK,MAAM,EACd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAehE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAuB7C,OAAO,EAKH,sCAAsC,EAEtC,4BAA4B,EAC5B,0BAA0B,EAC7B,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"skill-executor.d.ts","sourceRoot":"","sources":["../../src/client/skill-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAKH,KAAK,MAAM,EACd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAehE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAuB7C,OAAO,EAKH,sCAAsC,EAEtC,4BAA4B,EAC5B,0BAA0B,EAC7B,MAAM,kCAAkC,CAAC;AAa1C,OAAO,KAAK,EAAE,wBAAwB,EAAE,yBAAyB,EAA0B,MAAM,0BAA0B,CAAC;AAE5H,OAAO,EACH,4BAA4B,EAC5B,0BAA0B,EAC1B,sCAAsC,GACzC,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,MAAM,2BAA2B,GAAG;IACtC,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,yBAAyB,CAAC;IAC/C,iBAAiB,CAAC,EAAE,wBAAwB,CAAC;CAChD,CAAC;AAqBF,qBAAa,aAAc,SAAQ,UAAU;IAIrC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAHxB,OAAO,EAAE,SAAS,EAClB,MAAM,EAAE,MAAM,EACG,cAAc,EAAE,2BAA2B,EAC3C,OAAO,GAAE,OAAe;IAO7C;;;;;;;;;OASG;IACG,OAAO,CAAC,OAAO,GAAG,GAAG,EACvB,YAAY,EAAE,eAAe,EAC7B,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GACjD,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;CAqoBxC"}
|
|
@@ -23,6 +23,11 @@ import { SkillExecutionTraceError } from "../skill-execution-trace-error.js";
|
|
|
23
23
|
import { effectiveModelConfigFromGatewayMetadata, gatewayExecutionSummaryFromInvokeResponse, } from "../utils/gateway-execution-summary.js";
|
|
24
24
|
import { resolveAiEngineIdForRunSkill } from "../utils/resolve-run-skill-ai-engine.js";
|
|
25
25
|
import { buildAiMaxTokensPredictionInput, getOrCreateSkillsOptimixer, mergeOptimixerPredictionIntoModelConfig, mergeRetryPredictionIntoModelConfig, OPTIMIXER_MAX_TOKEN_RETRY_MAX_ATTEMPTS, predictMaxTokensForSkill, resetSkillsOptimixerForTests, setSkillsOptimixerForTests, } from "../optimixer/skills-optimixer.js";
|
|
26
|
+
import { buildGatewayConfigForSkillRun, stripToolConfigFromModelConfig } from "../invocation/build-gateway-config-for-skill-run.js";
|
|
27
|
+
import { appendServerToolInstructions } from "../invocation/append-server-tool-instructions.js";
|
|
28
|
+
import { hasAnyActiveServerTool, mergeServerToolInstructionMode, } from "../invocation/merge-gateway-tool-config.js";
|
|
29
|
+
import { AiSkillsServerToolsValidationError } from "../invocation/validate-server-tools.js";
|
|
30
|
+
import { compactServerToolsSummary, normalizeServerToolMetadataFromGateway, } from "../utils/normalize-server-tool-metadata.js";
|
|
26
31
|
export { resetSkillsOptimixerForTests, setSkillsOptimixerForTests, OPTIMIXER_MAX_TOKEN_RETRY_MAX_ATTEMPTS, };
|
|
27
32
|
function callerSuppliedMaxTokens(modelConfig) {
|
|
28
33
|
if (!modelConfig || typeof modelConfig !== "object")
|
|
@@ -153,13 +158,17 @@ export class SkillExecutor extends BaseClient {
|
|
|
153
158
|
const cxCtx = defaultAiSkillsCataloxContext({
|
|
154
159
|
appId: this.contentOptions.cataloxAppId,
|
|
155
160
|
});
|
|
156
|
-
const { instructionsPayload, promptPayload, optimixer: optimixerCatalog } = await fetchSkillTemplatesFromCatalox(this.contentOptions.catalox, cxCtx, skillRequest.skillKey, { audit: false });
|
|
161
|
+
const { instructionsPayload: rawInstructionsPayload, promptPayload, optimixer: optimixerCatalog, runtime: catalogRuntime } = await fetchSkillTemplatesFromCatalox(this.contentOptions.catalox, cxCtx, skillRequest.skillKey, { audit: false });
|
|
162
|
+
const strippedModelConfig = stripToolConfigFromModelConfig(skillRequestForInvoke.modelConfig);
|
|
157
163
|
const workingMemoryPreview = buildWorkingMemory(skillRequest);
|
|
158
164
|
const invokeIdentityPreview = buildInvokeIdentity(skillRequest, jobId, taskId);
|
|
159
165
|
optimixerPredictionContext = buildAiMaxTokensPredictionInput({
|
|
160
|
-
skillRequest:
|
|
166
|
+
skillRequest: {
|
|
167
|
+
...skillRequestForInvoke,
|
|
168
|
+
modelConfig: strippedModelConfig.baseModelConfig,
|
|
169
|
+
},
|
|
161
170
|
optimixerCatalog,
|
|
162
|
-
instructionsText:
|
|
171
|
+
instructionsText: rawInstructionsPayload,
|
|
163
172
|
promptText: promptPayload,
|
|
164
173
|
workingMemory: workingMemoryPreview,
|
|
165
174
|
runContext: invokeIdentityPreview,
|
|
@@ -167,9 +176,47 @@ export class SkillExecutor extends BaseClient {
|
|
|
167
176
|
});
|
|
168
177
|
const optimixer = await getOrCreateSkillsOptimixer(this.gateway);
|
|
169
178
|
optimixerPrediction = await predictMaxTokensForSkill(optimixer, optimixerPredictionContext);
|
|
170
|
-
|
|
171
|
-
|
|
179
|
+
let optimixerMerged = mergeOptimixerPredictionIntoModelConfig(strippedModelConfig.baseModelConfig, optimixerPrediction, optimixerCatalog);
|
|
180
|
+
optimixerMerged =
|
|
181
|
+
normalizeModelConfigForGatewayInvoke(optimixerMerged) ?? optimixerMerged;
|
|
182
|
+
const { baseModelConfig: optimixerBaseModelConfig } = stripToolConfigFromModelConfig(optimixerMerged);
|
|
183
|
+
invokeModelConfig = buildGatewayConfigForSkillRun({
|
|
184
|
+
request: skillRequestForInvoke,
|
|
185
|
+
catalogRuntime,
|
|
186
|
+
optimixerMaxTokens: optimixerMerged.maxTokens,
|
|
187
|
+
baseModelConfig: optimixerBaseModelConfig,
|
|
188
|
+
clientDefaults: {
|
|
189
|
+
defaultServerTools: this.contentOptions.defaultServerTools,
|
|
190
|
+
defaultOpenRouter: this.contentOptions.defaultOpenRouter,
|
|
191
|
+
},
|
|
192
|
+
logger: this.logger,
|
|
193
|
+
});
|
|
172
194
|
validateModelConfigForInvoke(invokeModelConfig);
|
|
195
|
+
const instructionMode = mergeServerToolInstructionMode(catalogRuntime, skillRequestForInvoke);
|
|
196
|
+
const instructionsPayload = appendServerToolInstructions({
|
|
197
|
+
instructionsText: rawInstructionsPayload,
|
|
198
|
+
instructionMode,
|
|
199
|
+
serverTools: invokeModelConfig.serverTools,
|
|
200
|
+
});
|
|
201
|
+
if (hasAnyActiveServerTool(invokeModelConfig.serverTools)) {
|
|
202
|
+
this.logger.debug("[AI-SKILLS] AI_SKILLS_SERVER_TOOLS_MERGED", {
|
|
203
|
+
skillKey: skillRequest.skillKey,
|
|
204
|
+
jobId,
|
|
205
|
+
taskId,
|
|
206
|
+
serverTools: invokeModelConfig.serverTools,
|
|
207
|
+
openrouter: invokeModelConfig.openrouter,
|
|
208
|
+
instructionMode,
|
|
209
|
+
identity: "execute invoke",
|
|
210
|
+
debugKind: DebugLogAbstract.INTENT,
|
|
211
|
+
});
|
|
212
|
+
this.logger.info("[AI-SKILLS] AI_SKILLS_SERVER_TOOLS_FORWARDED_TO_GATEWAY", {
|
|
213
|
+
skillKey: skillRequest.skillKey,
|
|
214
|
+
jobId,
|
|
215
|
+
taskId,
|
|
216
|
+
identity: "execute invoke",
|
|
217
|
+
debugKind: DebugLogAbstract.EVENT,
|
|
218
|
+
});
|
|
219
|
+
}
|
|
173
220
|
let invokeSkillRequest = {
|
|
174
221
|
...skillRequestForInvoke,
|
|
175
222
|
modelConfig: invokeModelConfig,
|
|
@@ -285,9 +332,21 @@ export class SkillExecutor extends BaseClient {
|
|
|
285
332
|
retryPrediction.recommendedMaxTokens >
|
|
286
333
|
(invokeModelConfig?.maxTokens ?? 0)) {
|
|
287
334
|
optimixerRetryCount++;
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
335
|
+
const retryMerged = mergeRetryPredictionIntoModelConfig(strippedModelConfig.baseModelConfig, optimixerPrediction.requestId, retryPrediction, optimixerCatalog);
|
|
336
|
+
const retryNormalized = normalizeModelConfigForGatewayInvoke(retryMerged) ??
|
|
337
|
+
retryMerged;
|
|
338
|
+
const { baseModelConfig: retryOptimixerBase } = stripToolConfigFromModelConfig(retryNormalized);
|
|
339
|
+
invokeModelConfig = buildGatewayConfigForSkillRun({
|
|
340
|
+
request: skillRequestForInvoke,
|
|
341
|
+
catalogRuntime,
|
|
342
|
+
optimixerMaxTokens: retryNormalized.maxTokens ?? retryPrediction.recommendedMaxTokens,
|
|
343
|
+
baseModelConfig: retryOptimixerBase,
|
|
344
|
+
clientDefaults: {
|
|
345
|
+
defaultServerTools: this.contentOptions.defaultServerTools,
|
|
346
|
+
defaultOpenRouter: this.contentOptions.defaultOpenRouter,
|
|
347
|
+
},
|
|
348
|
+
logger: this.logger,
|
|
349
|
+
});
|
|
291
350
|
invokeSkillRequest = {
|
|
292
351
|
...skillRequestForInvoke,
|
|
293
352
|
modelConfig: invokeModelConfig,
|
|
@@ -324,6 +383,9 @@ export class SkillExecutor extends BaseClient {
|
|
|
324
383
|
}
|
|
325
384
|
catch (invokeError) {
|
|
326
385
|
gwEnd = Date.now();
|
|
386
|
+
if (invokeError instanceof AiSkillsServerToolsValidationError) {
|
|
387
|
+
throw invokeError;
|
|
388
|
+
}
|
|
327
389
|
if (isSkillModelResolutionError(invokeError)) {
|
|
328
390
|
throw invokeError;
|
|
329
391
|
}
|
|
@@ -435,6 +497,19 @@ export class SkillExecutor extends BaseClient {
|
|
|
435
497
|
});
|
|
436
498
|
const md = response.metadata;
|
|
437
499
|
const billing = billingSnapshotFromGatewayMetadata(md);
|
|
500
|
+
const toolMetadata = normalizeServerToolMetadataFromGateway(md);
|
|
501
|
+
if (Object.keys(toolMetadata).length > 0) {
|
|
502
|
+
this.logger.debug("[AI-SKILLS] AI_SKILLS_TOOL_METADATA_NORMALIZED", {
|
|
503
|
+
skillKey: skillRequest.skillKey,
|
|
504
|
+
jobId,
|
|
505
|
+
taskId,
|
|
506
|
+
citationCount: toolMetadata.citations?.length ?? 0,
|
|
507
|
+
generatedImageCount: toolMetadata.generatedImages?.length ?? 0,
|
|
508
|
+
patchProposalCount: toolMetadata.patchProposals?.length ?? 0,
|
|
509
|
+
identity: "execute metadata",
|
|
510
|
+
debugKind: DebugLogAbstract.EVENT,
|
|
511
|
+
});
|
|
512
|
+
}
|
|
438
513
|
const execSummary = gatewayExecutionSummaryFromInvokeResponse(response);
|
|
439
514
|
const effectiveCfg = effectiveModelConfigFromGatewayMetadata(md);
|
|
440
515
|
const predictedMaxTokens = invokeModelConfig?.maxTokens ?? optimixerPrediction?.recommendedMaxTokens;
|
|
@@ -446,6 +521,12 @@ export class SkillExecutor extends BaseClient {
|
|
|
446
521
|
else if (predictedMaxTokens !== undefined && billing.usage.maxTokensRequested === undefined) {
|
|
447
522
|
billing.usage.maxTokensRequested = predictedMaxTokens;
|
|
448
523
|
}
|
|
524
|
+
if (toolMetadata.serverTools !== undefined) {
|
|
525
|
+
billing.usage.serverTools = toolMetadata.serverTools;
|
|
526
|
+
}
|
|
527
|
+
if (toolMetadata.citations !== undefined) {
|
|
528
|
+
billing.usage.citations = toolMetadata.citations;
|
|
529
|
+
}
|
|
449
530
|
const billingFields = billingMetadataFields(billing);
|
|
450
531
|
const returnValue = {
|
|
451
532
|
skillKey: skillRequest.skillKey,
|
|
@@ -465,10 +546,19 @@ export class SkillExecutor extends BaseClient {
|
|
|
465
546
|
...(execSummary.provider !== undefined ? { provider: execSummary.provider } : {}),
|
|
466
547
|
...(execSummary.effectiveMaxTokens !== undefined ? { effectiveMaxTokens: execSummary.effectiveMaxTokens } : {}),
|
|
467
548
|
...(execSummary.region !== undefined ? { region: execSummary.region } : {}),
|
|
468
|
-
...(invokeModelConfig !== undefined
|
|
549
|
+
...(invokeModelConfig !== undefined
|
|
550
|
+
? { requestedModelConfig: invokeModelConfig }
|
|
551
|
+
: {}),
|
|
469
552
|
...(effectiveCfg !== undefined ? { effectiveModelConfig: effectiveCfg } : {}),
|
|
470
553
|
...(optimixerRetryCount > 0 ? { optimixerRetryCount } : {}),
|
|
471
554
|
...(skillRequest.timeoutMs !== undefined ? { invokeExec: { timeoutMs: skillRequest.timeoutMs } } : {}),
|
|
555
|
+
...(toolMetadata.serverTools !== undefined ? { serverTools: toolMetadata.serverTools } : {}),
|
|
556
|
+
...(toolMetadata.citations !== undefined ? { citations: toolMetadata.citations } : {}),
|
|
557
|
+
...(toolMetadata.generatedImages !== undefined ? { generatedImages: toolMetadata.generatedImages } : {}),
|
|
558
|
+
...(toolMetadata.patchProposals !== undefined ? { patchProposals: toolMetadata.patchProposals } : {}),
|
|
559
|
+
...(toolMetadata.openrouterRuntime !== undefined
|
|
560
|
+
? { openrouterRuntime: toolMetadata.openrouterRuntime }
|
|
561
|
+
: {}),
|
|
472
562
|
},
|
|
473
563
|
};
|
|
474
564
|
const downstreamIdentity = resolveIdentityFromGatewayResponse(response);
|
|
@@ -497,6 +587,8 @@ export class SkillExecutor extends BaseClient {
|
|
|
497
587
|
usage: billing.usage,
|
|
498
588
|
...billingFields,
|
|
499
589
|
frame: flexMd.frame,
|
|
590
|
+
serverTools: compactServerToolsSummary(toolMetadata.serverTools),
|
|
591
|
+
citationCount: toolMetadata.citations?.length ?? 0,
|
|
500
592
|
identity: "execute exit",
|
|
501
593
|
debugKind: DebugLogAbstract.EVENT,
|
|
502
594
|
});
|
|
@@ -515,6 +607,7 @@ export class SkillExecutor extends BaseClient {
|
|
|
515
607
|
...(execSummary.region !== undefined ? { region: execSummary.region } : {}),
|
|
516
608
|
...(effectiveCfg !== undefined ? { effectiveModelConfig: effectiveCfg } : {}),
|
|
517
609
|
},
|
|
610
|
+
toolMetadata,
|
|
518
611
|
});
|
|
519
612
|
}
|
|
520
613
|
if (traceMode) {
|