@plumbus/core 0.6.19 → 0.7.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/CHANGELOG.md +66 -0
- package/README.md +5 -0
- package/dist/.tsbuildinfo +1 -1
- package/dist/ai/__typecheck-fixtures__/legacy-cost-api.d.ts +5 -0
- package/dist/ai/__typecheck-fixtures__/legacy-cost-api.d.ts.map +1 -0
- package/dist/ai/__typecheck-fixtures__/legacy-cost-api.js +15 -0
- package/dist/ai/__typecheck-fixtures__/legacy-cost-api.js.map +1 -0
- package/dist/ai/ai/cost-tracker.d.ts +4 -3
- package/dist/ai/ai/model-pricing.d.ts +14 -5
- package/dist/ai/ai/usage-client.d.ts +2 -0
- package/dist/ai/ai/usage-validation.d.ts +3 -0
- package/dist/ai/ai-service.d.ts.map +1 -1
- package/dist/ai/ai-service.js +101 -33
- package/dist/ai/ai-service.js.map +1 -1
- package/dist/ai/cost-tracker.d.ts +4 -3
- package/dist/ai/cost-tracker.d.ts.map +1 -1
- package/dist/ai/cost-tracker.js +33 -14
- package/dist/ai/cost-tracker.js.map +1 -1
- package/dist/ai/errors/data-errors.d.ts +22 -0
- package/dist/ai/errors/index.d.ts +21 -0
- package/dist/ai/errors/plumbus-error.d.ts +12 -0
- package/dist/ai/index.d.ts +1 -1
- package/dist/ai/index.d.ts.map +1 -1
- package/dist/ai/index.js +1 -1
- package/dist/ai/index.js.map +1 -1
- package/dist/ai/model-pricing.d.ts +14 -5
- package/dist/ai/model-pricing.d.ts.map +1 -1
- package/dist/ai/model-pricing.js +88 -45
- package/dist/ai/model-pricing.js.map +1 -1
- package/dist/ai/provider.d.ts.map +1 -1
- package/dist/ai/provider.js +22 -9
- package/dist/ai/provider.js.map +1 -1
- package/dist/ai/rag/pipeline.d.ts +2 -0
- package/dist/ai/rag/pipeline.d.ts.map +1 -1
- package/dist/ai/rag/pipeline.js +6 -1
- package/dist/ai/rag/pipeline.js.map +1 -1
- package/dist/ai/security.d.ts.map +1 -1
- package/dist/ai/security.js +1 -0
- package/dist/ai/security.js.map +1 -1
- package/dist/ai/tool-loop.d.ts +1 -0
- package/dist/ai/tool-loop.d.ts.map +1 -1
- package/dist/ai/tool-loop.js +23 -4
- package/dist/ai/tool-loop.js.map +1 -1
- package/dist/ai/types/errors.d.ts +14 -0
- package/dist/ai/usage-client.d.ts +2 -0
- package/dist/ai/usage-client.d.ts.map +1 -1
- package/dist/ai/usage-client.js +2 -0
- package/dist/ai/usage-client.js.map +1 -1
- package/dist/ai/usage-validation.d.ts +4 -0
- package/dist/ai/usage-validation.d.ts.map +1 -0
- package/dist/ai/usage-validation.js +23 -0
- package/dist/ai/usage-validation.js.map +1 -0
- package/dist/ai/validation.d.ts +1 -5
- package/dist/ai/validation.d.ts.map +1 -1
- package/dist/api/cookies.d.ts.map +1 -1
- package/dist/api/cookies.js +7 -2
- package/dist/api/cookies.js.map +1 -1
- package/dist/audit/service.d.ts.map +1 -1
- package/dist/audit/service.js +21 -3
- package/dist/audit/service.js.map +1 -1
- package/dist/audit/writer.d.ts.map +1 -1
- package/dist/audit/writer.js +7 -2
- package/dist/audit/writer.js.map +1 -1
- package/dist/auth/adapter.d.ts +5 -1
- package/dist/auth/adapter.d.ts.map +1 -1
- package/dist/auth/adapter.js +36 -6
- package/dist/auth/adapter.js.map +1 -1
- package/dist/auth/index.d.ts +1 -0
- package/dist/auth/index.d.ts.map +1 -1
- package/dist/auth/index.js +1 -0
- package/dist/auth/index.js.map +1 -1
- package/dist/auth/jwt-policy.d.ts +3 -0
- package/dist/auth/jwt-policy.d.ts.map +1 -0
- package/dist/auth/jwt-policy.js +11 -0
- package/dist/auth/jwt-policy.js.map +1 -0
- package/dist/auth/oidc-adapter.d.ts.map +1 -1
- package/dist/auth/oidc-adapter.js +30 -13
- package/dist/auth/oidc-adapter.js.map +1 -1
- package/dist/auth/saml-adapter.d.ts +7 -1
- package/dist/auth/saml-adapter.d.ts.map +1 -1
- package/dist/auth/saml-adapter.js +42 -5
- package/dist/auth/saml-adapter.js.map +1 -1
- package/dist/cli/commands/create.d.ts.map +1 -1
- package/dist/cli/commands/create.js +21 -0
- package/dist/cli/commands/create.js.map +1 -1
- package/dist/cli/commands/generate.d.ts.map +1 -1
- package/dist/cli/commands/generate.js +4 -3
- package/dist/cli/commands/generate.js.map +1 -1
- package/dist/cli/commands/init.d.ts +1 -1
- package/dist/cli/commands/init.d.ts.map +1 -1
- package/dist/cli/commands/init.js +7 -1
- package/dist/cli/commands/init.js.map +1 -1
- package/dist/cli/commands/mcp.d.ts.map +1 -1
- package/dist/cli/commands/mcp.js +4 -3
- package/dist/cli/commands/mcp.js.map +1 -1
- package/dist/cli/commands/translation.d.ts.map +1 -1
- package/dist/cli/commands/translation.js +8 -4
- package/dist/cli/commands/translation.js.map +1 -1
- package/dist/cli/mcp-serve-context.d.ts.map +1 -1
- package/dist/cli/mcp-serve-context.js +25 -6
- package/dist/cli/mcp-serve-context.js.map +1 -1
- package/dist/cli/scaffold-validation.d.ts +6 -0
- package/dist/cli/scaffold-validation.d.ts.map +1 -0
- package/dist/cli/scaffold-validation.js +57 -0
- package/dist/cli/scaffold-validation.js.map +1 -0
- package/dist/cli/scaffold-write.d.ts.map +1 -1
- package/dist/cli/scaffold-write.js +13 -3
- package/dist/cli/scaffold-write.js.map +1 -1
- package/dist/cli/templates/resources.d.ts.map +1 -1
- package/dist/cli/templates/resources.js +10 -0
- package/dist/cli/templates/resources.js.map +1 -1
- package/dist/cli/utils.d.ts +1 -1
- package/dist/cli/utils.d.ts.map +1 -1
- package/dist/cli/utils.js +13 -2
- package/dist/cli/utils.js.map +1 -1
- package/dist/config/loader.d.ts.map +1 -1
- package/dist/config/loader.js +7 -4
- package/dist/config/loader.js.map +1 -1
- package/dist/errors/http.d.ts.map +1 -1
- package/dist/errors/http.js +8 -3
- package/dist/errors/http.js.map +1 -1
- package/dist/events/queue.d.ts.map +1 -1
- package/dist/events/queue.js +27 -4
- package/dist/events/queue.js.map +1 -1
- package/dist/execution/capability-executor.js +2 -1
- package/dist/execution/capability-executor.js.map +1 -1
- package/dist/execution/context-factory.d.ts.map +1 -1
- package/dist/execution/context-factory.js +6 -2
- package/dist/execution/context-factory.js.map +1 -1
- package/dist/flows/engine.d.ts.map +1 -1
- package/dist/flows/engine.js +28 -18
- package/dist/flows/engine.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/runtime/start-worker-pool.d.ts.map +1 -1
- package/dist/runtime/start-worker-pool.js +21 -9
- package/dist/runtime/start-worker-pool.js.map +1 -1
- package/dist/server/bootstrap.d.ts.map +1 -1
- package/dist/server/bootstrap.js +13 -9
- package/dist/server/bootstrap.js.map +1 -1
- package/dist/testing/e2e.js +1 -1
- package/dist/testing/e2e.js.map +1 -1
- package/dist/types/audit.d.ts +2 -0
- package/dist/types/audit.d.ts.map +1 -1
- package/dist/types/context.d.ts +11 -1
- package/dist/types/context.d.ts.map +1 -1
- package/instructions/README.md +1 -0
- package/instructions/ai.md +10 -2
- package/instructions/deployment.md +5 -2
- package/instructions/flows.md +3 -0
- package/instructions/framework.md +7 -0
- package/instructions/mcp.md +5 -2
- package/instructions/peer-dependencies.md +28 -64
- package/instructions/security.md +8 -1
- package/instructions/upgrading-0.5-capabilities.md +4 -1
- package/instructions/upgrading-security-release.md +65 -0
- package/package.json +11 -10
package/dist/ai/rag/pipeline.js
CHANGED
|
@@ -22,6 +22,7 @@ export function createRAGPipeline(config) {
|
|
|
22
22
|
model: embeddingResponse.model,
|
|
23
23
|
totalTokens: embeddingResponse.usage.totalTokens,
|
|
24
24
|
cost: embeddingResponse.cost ?? 0,
|
|
25
|
+
costAvailable: embeddingResponse.cost != null,
|
|
25
26
|
});
|
|
26
27
|
}
|
|
27
28
|
for (let j = 0; j < batch.length; j++) {
|
|
@@ -60,6 +61,7 @@ export function createRAGPipeline(config) {
|
|
|
60
61
|
model: embeddingResponse.model,
|
|
61
62
|
totalTokens: embeddingResponse.usage.totalTokens,
|
|
62
63
|
cost: embeddingResponse.cost ?? 0,
|
|
64
|
+
costAvailable: embeddingResponse.cost != null,
|
|
63
65
|
});
|
|
64
66
|
}
|
|
65
67
|
const queryEmbedding = embeddingResponse.embeddings[0];
|
|
@@ -74,6 +76,9 @@ export function createRAGPipeline(config) {
|
|
|
74
76
|
});
|
|
75
77
|
// 3. Corpus + metadata filter
|
|
76
78
|
const filtered = results.filter((r) => {
|
|
79
|
+
// Defense in depth for custom stores that omit the search predicate.
|
|
80
|
+
if ((r.tenantId ?? undefined) !== (query.tenantId ?? undefined))
|
|
81
|
+
return false;
|
|
77
82
|
if (query.corpus) {
|
|
78
83
|
const c = r.metadata?.corpus ?? r.metadata?.collection;
|
|
79
84
|
if (c !== query.corpus)
|
|
@@ -137,7 +142,7 @@ export function createInMemoryVectorStore() {
|
|
|
137
142
|
},
|
|
138
143
|
async search(embedding, options) {
|
|
139
144
|
const filtered = chunks.filter((c) => {
|
|
140
|
-
if (
|
|
145
|
+
if ((c.tenantId ?? undefined) !== (options.tenantId ?? undefined))
|
|
141
146
|
return false;
|
|
142
147
|
return true;
|
|
143
148
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../../src/ai/rag/pipeline.ts"],"names":[],"mappings":"AAAA,qBAAqB;AACrB,+CAA+C;AAI/C,OAAO,EAAE,aAAa,EAAwC,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../../src/ai/rag/pipeline.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"security.d.ts","sourceRoot":"","sources":["../../src/ai/security.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAG7D,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,eAAe,EAAE,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,oEAAoE;IACpE,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,mBAAmB,CAAC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAWD,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,QAAQ,CAAC;AAEhD,MAAM,WAAW,gBAAgB;IAC/B,uFAAuF;IACvF,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,kFAAkF;IAClF,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,mGAAmG;IACnG,eAAe,CAAC,EAAE,mBAAmB,CAAC;IACtC,mEAAmE;IACnE,QAAQ,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAC/B;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,gBAAgB,EAAE,EAC5B,SAAS,CAAC,EAAE,gBAAgB,GAC3B,gBAAgB,GAAG,SAAS,CAW9B;AA0BD;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,MAAM,CAAC,EAAE,gBAAgB,GACxB,mBAAmB,
|
|
1
|
+
{"version":3,"file":"security.d.ts","sourceRoot":"","sources":["../../src/ai/security.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAG7D,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,eAAe,EAAE,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,oEAAoE;IACpE,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,mBAAmB,CAAC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAWD,MAAM,MAAM,cAAc,GAAG,OAAO,GAAG,QAAQ,CAAC;AAEhD,MAAM,WAAW,gBAAgB;IAC/B,uFAAuF;IACvF,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,kFAAkF;IAClF,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,mGAAmG;IACnG,eAAe,CAAC,EAAE,mBAAmB,CAAC;IACtC,mEAAmE;IACnE,QAAQ,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAC/B;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,gBAAgB,EAAE,EAC5B,SAAS,CAAC,EAAE,gBAAgB,GAC3B,gBAAgB,GAAG,SAAS,CAW9B;AA0BD;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,MAAM,CAAC,EAAE,gBAAgB,GACxB,mBAAmB,CA6ErB"}
|
package/dist/ai/security.js
CHANGED
package/dist/ai/security.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"security.js","sourceRoot":"","sources":["../../src/ai/security.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"security.js","sourceRoot":"","sources":["../../src/ai/security.ts"],"names":[],"mappings":"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"}
|
package/dist/ai/tool-loop.d.ts
CHANGED
|
@@ -39,6 +39,7 @@ export interface RunToolLoopResult<T = Record<string, unknown>> {
|
|
|
39
39
|
rounds: number;
|
|
40
40
|
aggregatedUsage: AITokenUsage;
|
|
41
41
|
aggregatedCost: number;
|
|
42
|
+
aggregatedCostAvailable?: boolean;
|
|
42
43
|
}
|
|
43
44
|
/**
|
|
44
45
|
* JSON.stringify that never throws on cyclic references (replaced with the
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-loop.d.ts","sourceRoot":"","sources":["../../src/ai/tool-loop.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,MAAM,EACN,UAAU,EACV,YAAY,EACZ,sBAAsB,EACtB,WAAW,EACZ,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EACV,aAAa,EACb,qBAAqB,EACrB,SAAS,EACT,YAAY,EACb,MAAM,qBAAqB,CAAC;AAgB7B,MAAM,WAAW,iBAAiB;IAChC,oDAAoD;IACpD,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,QAAQ,CAAC,EAAE,WAAW,EAAE,CAAC;IACzB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,CAAC,EAAE,YAAY,CAAC;IAC1B,aAAa,CAAC,EAAE,sBAAsB,CAAC;IACvC,wGAAwG;IACxG,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE;QAAE,eAAe,EAAE,QAAQ,CAAA;KAAE,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACxF,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE;QACzB,IAAI,EAAE,UAAU,CAAC;QACjB,OAAO,EAAE;YAAE,EAAE,EAAE,IAAI,CAAC;YAAC,KAAK,EAAE,OAAO,CAAA;SAAE,GAAG;YAAE,EAAE,EAAE,KAAK,CAAC;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,CAAC,EAAE,OAAO,CAAA;SAAE,CAAC;KACtF,KAAK,MAAM,CAAC;IACb,0GAA0G;IAC1G,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wEAAwE;IACxE,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,WAAW,CAAC,EAAE,aAAa,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC5D;yEACqE;IACrE,KAAK,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAChC,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,YAAY,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"tool-loop.d.ts","sourceRoot":"","sources":["../../src/ai/tool-loop.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,MAAM,EACN,UAAU,EACV,YAAY,EACZ,sBAAsB,EACtB,WAAW,EACZ,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EACV,aAAa,EACb,qBAAqB,EACrB,SAAS,EACT,YAAY,EACb,MAAM,qBAAqB,CAAC;AAgB7B,MAAM,WAAW,iBAAiB;IAChC,oDAAoD;IACpD,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,QAAQ,CAAC,EAAE,WAAW,EAAE,CAAC;IACzB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,UAAU,CAAC,EAAE,YAAY,CAAC;IAC1B,aAAa,CAAC,EAAE,sBAAsB,CAAC;IACvC,wGAAwG;IACxG,OAAO,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE;QAAE,eAAe,EAAE,QAAQ,CAAA;KAAE,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACxF,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE;QACzB,IAAI,EAAE,UAAU,CAAC;QACjB,OAAO,EAAE;YAAE,EAAE,EAAE,IAAI,CAAC;YAAC,KAAK,EAAE,OAAO,CAAA;SAAE,GAAG;YAAE,EAAE,EAAE,KAAK,CAAC;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,CAAC,EAAE,OAAO,CAAA;SAAE,CAAC;KACtF,KAAK,MAAM,CAAC;IACb,0GAA0G;IAC1G,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wEAAwE;IACxE,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,WAAW,CAAC,EAAE,aAAa,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC5D;yEACqE;IACrE,KAAK,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAChC,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,YAAY,CAAC;IAC9B,cAAc,EAAE,MAAM,CAAC;IACvB,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAOD;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CA6CxD;AA4DD;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvF,EAAE,EAAE,SAAS,EACb,MAAM,EAAE,iBAAiB,GACxB,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CA8G/B"}
|
package/dist/ai/tool-loop.js
CHANGED
|
@@ -144,6 +144,7 @@ export async function runToolLoop(ai, params) {
|
|
|
144
144
|
const messages = params.messages ? [...params.messages] : [];
|
|
145
145
|
const aggregatedUsage = { inputTokens: 0, outputTokens: 0, totalTokens: 0 };
|
|
146
146
|
let aggregatedCost = 0;
|
|
147
|
+
let aggregatedCostAvailable = true;
|
|
147
148
|
for (let round = 1; round <= maxRounds; round++) {
|
|
148
149
|
const result = await ai.generateWithUsage({
|
|
149
150
|
prompt: params.prompt,
|
|
@@ -158,9 +159,18 @@ export async function runToolLoop(ai, params) {
|
|
|
158
159
|
seed: params.seed,
|
|
159
160
|
});
|
|
160
161
|
addUsage(aggregatedUsage, result.usage);
|
|
161
|
-
aggregatedCost += result.cost;
|
|
162
|
+
aggregatedCost += result.cost ?? 0;
|
|
163
|
+
aggregatedCostAvailable =
|
|
164
|
+
aggregatedCostAvailable && result.costAvailable !== false && result.cost != null;
|
|
162
165
|
if (result.finishReason !== 'tool_calls') {
|
|
163
|
-
return {
|
|
166
|
+
return {
|
|
167
|
+
final: result,
|
|
168
|
+
messages,
|
|
169
|
+
rounds: round,
|
|
170
|
+
aggregatedUsage,
|
|
171
|
+
aggregatedCost,
|
|
172
|
+
aggregatedCostAvailable,
|
|
173
|
+
};
|
|
164
174
|
}
|
|
165
175
|
// Append the assistant turn carrying the tool calls, then one tool
|
|
166
176
|
// observation per call, in provider order.
|
|
@@ -211,7 +221,16 @@ export async function runToolLoop(ai, params) {
|
|
|
211
221
|
seed: params.seed,
|
|
212
222
|
});
|
|
213
223
|
addUsage(aggregatedUsage, final.usage);
|
|
214
|
-
aggregatedCost += final.cost;
|
|
215
|
-
|
|
224
|
+
aggregatedCost += final.cost ?? 0;
|
|
225
|
+
aggregatedCostAvailable =
|
|
226
|
+
aggregatedCostAvailable && final.costAvailable !== false && final.cost != null;
|
|
227
|
+
return {
|
|
228
|
+
final,
|
|
229
|
+
messages,
|
|
230
|
+
rounds: maxRounds,
|
|
231
|
+
aggregatedUsage,
|
|
232
|
+
aggregatedCost,
|
|
233
|
+
aggregatedCostAvailable,
|
|
234
|
+
};
|
|
216
235
|
}
|
|
217
236
|
//# sourceMappingURL=tool-loop.js.map
|
package/dist/ai/tool-loop.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-loop.js","sourceRoot":"","sources":["../../src/ai/tool-loop.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,wEAAwE;AACxE,4EAA4E;AAC5E,4EAA4E;AAC5E,2EAA2E;AAC3E,6EAA6E;AAC7E,2EAA2E;AAC3E,6EAA6E;AAC7E,sCAAsC;AAgBtC,qHAAqH;AACrH,MAAM,2BAA2B,GAAG,wBAAwB,CAAC;AAC7D,qHAAqH;AACrH,MAAM,0BAA0B,GAAG,uBAAuB,CAAC;AAE3D,oEAAoE;AACpE,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAC7B,+DAA+D;AAC/D,MAAM,eAAe,GAAG,EAAE,CAAC;AAC3B,gFAAgF;AAChF,MAAM,6BAA6B,GAAG,IAAI,CAAC;AAC3C,0FAA0F;AAC1F,MAAM,yBAAyB,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"tool-loop.js","sourceRoot":"","sources":["../../src/ai/tool-loop.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import type { ErrorCode } from './enums.js';
|
|
2
|
+
export interface PlumbusErrorLike {
|
|
3
|
+
code: ErrorCode;
|
|
4
|
+
message: string;
|
|
5
|
+
metadata?: Record<string, unknown>;
|
|
6
|
+
}
|
|
7
|
+
export interface ErrorService {
|
|
8
|
+
validation(message: string, metadata?: Record<string, unknown>): PlumbusErrorLike;
|
|
9
|
+
notFound(message: string, metadata?: Record<string, unknown>): PlumbusErrorLike;
|
|
10
|
+
forbidden(message: string, metadata?: Record<string, unknown>): PlumbusErrorLike;
|
|
11
|
+
conflict(message: string, metadata?: Record<string, unknown>): PlumbusErrorLike;
|
|
12
|
+
internal(message: string, metadata?: Record<string, unknown>): PlumbusErrorLike;
|
|
13
|
+
dependencyViolation(message: string, metadata?: Record<string, unknown>): PlumbusErrorLike;
|
|
14
|
+
}
|
|
@@ -22,6 +22,8 @@ export interface UsageClientConfig {
|
|
|
22
22
|
apiKey: string;
|
|
23
23
|
baseUrl?: string;
|
|
24
24
|
organizationId?: string;
|
|
25
|
+
/** Billing endpoint timeout in milliseconds (default 10000). */
|
|
26
|
+
timeoutMs?: number;
|
|
25
27
|
}
|
|
26
28
|
export declare function createUsageAPIClient(config: UsageClientConfig): UsageAPIClient;
|
|
27
29
|
export declare class UsageAPIError extends Error {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage-client.d.ts","sourceRoot":"","sources":["../../src/ai/usage-client.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,UAAU,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,MAAM,EAAE;QAAE,SAAS,EAAE,IAAI,CAAC;QAAC,OAAO,EAAE,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;CAC5E;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,QAAQ,GAAG,WAAW,CAAC;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"usage-client.d.ts","sourceRoot":"","sources":["../../src/ai/usage-client.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,UAAU,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,MAAM,EAAE;QAAE,SAAS,EAAE,IAAI,CAAC;QAAC,OAAO,EAAE,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;CAC5E;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,QAAQ,GAAG,WAAW,CAAC;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gEAAgE;IAChE,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAoHD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,cAAc,CAY9E;AAID,qBAAa,aAAc,SAAQ,KAAK;aAEpB,QAAQ,EAAE,MAAM;gBAAhB,QAAQ,EAAE,MAAM,EAChC,OAAO,EAAE,MAAM;CAKlB"}
|
package/dist/ai/usage-client.js
CHANGED
|
@@ -16,6 +16,7 @@ function createOpenAIUsageClient(config) {
|
|
|
16
16
|
url.searchParams.set('project_ids', config.organizationId);
|
|
17
17
|
}
|
|
18
18
|
const response = await fetch(url.toString(), {
|
|
19
|
+
signal: AbortSignal.timeout(config.timeoutMs ?? 10_000),
|
|
19
20
|
headers: {
|
|
20
21
|
Authorization: `Bearer ${config.apiKey}`,
|
|
21
22
|
'Content-Type': 'application/json',
|
|
@@ -56,6 +57,7 @@ function createAnthropicUsageClient(config) {
|
|
|
56
57
|
url.searchParams.set('start_date', startDate ?? '');
|
|
57
58
|
url.searchParams.set('end_date', endDate ?? '');
|
|
58
59
|
const response = await fetch(url.toString(), {
|
|
60
|
+
signal: AbortSignal.timeout(config.timeoutMs ?? 10_000),
|
|
59
61
|
headers: {
|
|
60
62
|
'x-api-key': config.apiKey,
|
|
61
63
|
'Content-Type': 'application/json',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage-client.js","sourceRoot":"","sources":["../../src/ai/usage-client.ts"],"names":[],"mappings":"AAAA,yBAAyB;AACzB,oEAAoE;AACpE,iFAAiF;
|
|
1
|
+
{"version":3,"file":"usage-client.js","sourceRoot":"","sources":["../../src/ai/usage-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"usage-validation.d.ts","sourceRoot":"","sources":["../../src/ai/usage-validation.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAWhD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CAKhE;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAG1D"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
// Validate provider accounting before it can affect prices or budget totals.
|
|
2
|
+
import { z } from 'zod';
|
|
3
|
+
import { createErrorService } from '../errors/index.js';
|
|
4
|
+
const amount = z.number().finite().nonnegative().max(Number.MAX_SAFE_INTEGER);
|
|
5
|
+
const usageSchema = z.object({
|
|
6
|
+
inputTokens: amount,
|
|
7
|
+
outputTokens: amount,
|
|
8
|
+
totalTokens: amount,
|
|
9
|
+
cachedInputTokens: amount.optional(),
|
|
10
|
+
cacheWriteTokens: amount.optional(),
|
|
11
|
+
});
|
|
12
|
+
export function validateTokenUsage(usage) {
|
|
13
|
+
const parsed = usageSchema.safeParse(usage);
|
|
14
|
+
if (!parsed.success)
|
|
15
|
+
throw createErrorService().validation('Invalid provider token usage');
|
|
16
|
+
// Also supports the standalone declaration emitter without strictNullChecks.
|
|
17
|
+
return parsed.data;
|
|
18
|
+
}
|
|
19
|
+
export function normalizeCost(cost) {
|
|
20
|
+
const parsed = amount.safeParse(cost);
|
|
21
|
+
return parsed.success ? parsed.data : null;
|
|
22
|
+
}
|
|
23
|
+
//# sourceMappingURL=usage-validation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"usage-validation.js","sourceRoot":"","sources":["../../src/ai/usage-validation.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAGxD,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAC9E,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3B,WAAW,EAAE,MAAM;IACnB,YAAY,EAAE,MAAM;IACpB,WAAW,EAAE,MAAM;IACnB,iBAAiB,EAAE,MAAM,CAAC,QAAQ,EAAE;IACpC,gBAAgB,EAAE,MAAM,CAAC,QAAQ,EAAE;CACpC,CAAC,CAAC;AAEH,MAAM,UAAU,kBAAkB,CAAC,KAAiB;IAClD,MAAM,MAAM,GAAG,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC5C,IAAI,CAAC,MAAM,CAAC,OAAO;QAAE,MAAM,kBAAkB,EAAE,CAAC,UAAU,CAAC,8BAA8B,CAAC,CAAC;IAC3F,6EAA6E;IAC7E,OAAO,MAAM,CAAC,IAAkB,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAa;IACzC,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACtC,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7C,CAAC"}
|
package/dist/ai/validation.d.ts
CHANGED
|
@@ -7,11 +7,7 @@ export interface ValidatedResponse<T> {
|
|
|
7
7
|
data: T;
|
|
8
8
|
raw: string;
|
|
9
9
|
attempts: number;
|
|
10
|
-
usage:
|
|
11
|
-
inputTokens: number;
|
|
12
|
-
outputTokens: number;
|
|
13
|
-
totalTokens: number;
|
|
14
|
-
};
|
|
10
|
+
usage: TokenUsage;
|
|
15
11
|
/**
|
|
16
12
|
* Sum of adapter-supplied `ProviderResponse.cost` across attempts, when every
|
|
17
13
|
* successful attempt provided a cost. Otherwise omitted so callers fall back
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/ai/validation.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,KAAK,EACV,iBAAiB,EACjB,eAAe,EAEf,UAAU,EACX,MAAM,eAAe,CAAC;AAGvB,MAAM,WAAW,qBAAsB,SAAQ,mBAAmB;CAAG;AAErE,MAAM,WAAW,iBAAiB,CAAC,CAAC;IAClC,IAAI,EAAE,CAAC,CAAC;IACR,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE
|
|
1
|
+
{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/ai/validation.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,KAAK,EACV,iBAAiB,EACjB,eAAe,EAEf,UAAU,EACX,MAAM,eAAe,CAAC;AAGvB,MAAM,WAAW,qBAAsB,SAAQ,mBAAmB;CAAG;AAErE,MAAM,WAAW,iBAAiB,CAAC,CAAC;IAClC,IAAI,EAAE,CAAC,CAAC;IACR,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,UAAU,CAAC;IAClB;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1C;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,+EAA+E;IAC/E,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,kFAAkF;IAClF,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;gBAEd,KAAK,EAAE;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,SAAS,EAAE,KAAK,GAAG,IAAI,CAAC;QACxB,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB;CAYF;AAiLD,wBAAsB,sBAAsB,CAAC,CAAC,EAC5C,QAAQ,EAAE,iBAAiB,EAC3B,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EACpB,MAAM,CAAC,EAAE,qBAAqB,GAAG;IAC/B;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GACA,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAyF/B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cookies.d.ts","sourceRoot":"","sources":["../../src/api/cookies.ts"],"names":[],"mappings":"AAAA,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"cookies.d.ts","sourceRoot":"","sources":["../../src/api/cookies.ts"],"names":[],"mappings":"AAAA,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAoCpF"}
|
package/dist/api/cookies.js
CHANGED
|
@@ -2,7 +2,8 @@ export function parseCookieHeader(header) {
|
|
|
2
2
|
if (!header) {
|
|
3
3
|
return {};
|
|
4
4
|
}
|
|
5
|
-
const cookies =
|
|
5
|
+
const cookies = Object.create(null);
|
|
6
|
+
const duplicates = new Set();
|
|
6
7
|
for (const part of header.split(';')) {
|
|
7
8
|
const trimmed = part.trim();
|
|
8
9
|
const eq = trimmed.indexOf('=');
|
|
@@ -13,7 +14,11 @@ export function parseCookieHeader(header) {
|
|
|
13
14
|
if (!name) {
|
|
14
15
|
continue;
|
|
15
16
|
}
|
|
16
|
-
if (
|
|
17
|
+
if (duplicates.has(name))
|
|
18
|
+
continue;
|
|
19
|
+
if (Object.hasOwn(cookies, name)) {
|
|
20
|
+
delete cookies[name];
|
|
21
|
+
duplicates.add(name);
|
|
17
22
|
continue;
|
|
18
23
|
}
|
|
19
24
|
const rawValue = trimmed.slice(eq + 1).trim();
|
package/dist/api/cookies.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cookies.js","sourceRoot":"","sources":["../../src/api/cookies.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,iBAAiB,CAAC,MAA0B;IAC1D,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,OAAO,GAA2B,
|
|
1
|
+
{"version":3,"file":"cookies.js","sourceRoot":"","sources":["../../src/api/cookies.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,iBAAiB,CAAC,MAA0B;IAC1D,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,OAAO,GAA2B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC5D,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;IAErC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5B,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;YACX,SAAS;QACX,CAAC;QAED,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACzC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,SAAS;QACX,CAAC;QAED,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,SAAS;QACnC,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC;YACjC,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;YACrB,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACrB,SAAS;QACX,CAAC;QAED,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,IAAI,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC/C,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/audit/service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/audit/service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGxD,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,kBAAkB,CAAC;IACvB,IAAI,EAAE,WAAW,CAAC;IAClB,mEAAmE;IACnE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,kBAAkB,GAAG,YAAY,CAwC3E"}
|
package/dist/audit/service.js
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import { createErrorService } from '../errors/index.js';
|
|
1
3
|
import { createDatabaseAuditWriter } from './writer.js';
|
|
2
4
|
/**
|
|
3
5
|
* Creates a persistent AuditService that writes records to PostgreSQL.
|
|
@@ -7,13 +9,19 @@ export function createAuditService(config) {
|
|
|
7
9
|
const writer = config.writer ?? createDatabaseAuditWriter(db);
|
|
8
10
|
return {
|
|
9
11
|
async record(eventType, metadata) {
|
|
10
|
-
const
|
|
12
|
+
const parsedOutcome = z
|
|
13
|
+
.enum(['success', 'failure', 'denied'])
|
|
14
|
+
.safeParse(metadata?.outcome ?? 'success');
|
|
15
|
+
if (!parsedOutcome.success)
|
|
16
|
+
throw createErrorService().validation('Invalid audit outcome');
|
|
17
|
+
const outcome = parsedOutcome.data;
|
|
11
18
|
const maskedFields = metadata?._maskedFields ?? undefined;
|
|
12
19
|
const storedMetadata = metadata ? { ...metadata } : undefined;
|
|
13
20
|
if (storedMetadata) {
|
|
14
21
|
delete storedMetadata._maskedFields;
|
|
15
22
|
}
|
|
16
|
-
|
|
23
|
+
const event = {
|
|
24
|
+
id: crypto.randomUUID(),
|
|
17
25
|
actor: auth.userId ?? 'anonymous',
|
|
18
26
|
tenantId: auth.tenantId,
|
|
19
27
|
component,
|
|
@@ -22,7 +30,17 @@ export function createAuditService(config) {
|
|
|
22
30
|
timestamp: new Date(),
|
|
23
31
|
metadata: storedMetadata,
|
|
24
32
|
maskedFields,
|
|
25
|
-
}
|
|
33
|
+
};
|
|
34
|
+
for (let attempt = 0; attempt < 3; attempt++) {
|
|
35
|
+
try {
|
|
36
|
+
await writer.write(event);
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
catch (error) {
|
|
40
|
+
if (attempt === 2)
|
|
41
|
+
throw createErrorService().internal('Audit persistence failed', { cause: error });
|
|
42
|
+
}
|
|
43
|
+
}
|
|
26
44
|
},
|
|
27
45
|
};
|
|
28
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/audit/service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/audit/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAIxD,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAUxD;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,MAA0B;IAC3D,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,GAAG,QAAQ,EAAE,GAAG,MAAM,CAAC;IAClD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,yBAAyB,CAAC,EAAE,CAAC,CAAC;IAE9D,OAAO;QACL,KAAK,CAAC,MAAM,CAAC,SAAiB,EAAE,QAAkC;YAChE,MAAM,aAAa,GAAG,CAAC;iBACpB,IAAI,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;iBACtC,SAAS,CAAC,QAAQ,EAAE,OAAO,IAAI,SAAS,CAAC,CAAC;YAC7C,IAAI,CAAC,aAAa,CAAC,OAAO;gBAAE,MAAM,kBAAkB,EAAE,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;YAC3F,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC;YACnC,MAAM,YAAY,GAAI,QAAQ,EAAE,aAA0B,IAAI,SAAS,CAAC;YAExE,MAAM,cAAc,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YAC9D,IAAI,cAAc,EAAE,CAAC;gBACnB,OAAO,cAAc,CAAC,aAAa,CAAC;YACtC,CAAC;YAED,MAAM,KAAK,GAAG;gBACZ,EAAE,EAAE,MAAM,CAAC,UAAU,EAAE;gBACvB,KAAK,EAAE,IAAI,CAAC,MAAM,IAAI,WAAW;gBACjC,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,SAAS;gBACT,MAAM,EAAE,SAAS;gBACjB,OAAO;gBACP,SAAS,EAAE,IAAI,IAAI,EAAE;gBACrB,QAAQ,EAAE,cAAc;gBACxB,YAAY;aACb,CAAC;YACF,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC;gBAC7C,IAAI,CAAC;oBACH,MAAM,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBAC1B,OAAO;gBACT,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,IAAI,OAAO,KAAK,CAAC;wBACf,MAAM,kBAAkB,EAAE,CAAC,QAAQ,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;gBACtF,CAAC;YACH,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writer.d.ts","sourceRoot":"","sources":["../../src/audit/writer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGjE,wBAAgB,yBAAyB,CAAC,EAAE,EAAE,kBAAkB,GAAG,WAAW,
|
|
1
|
+
{"version":3,"file":"writer.d.ts","sourceRoot":"","sources":["../../src/audit/writer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGjE,wBAAgB,yBAAyB,CAAC,EAAE,EAAE,kBAAkB,GAAG,WAAW,CAmB7E"}
|
package/dist/audit/writer.js
CHANGED
|
@@ -2,7 +2,10 @@ import { auditRecords } from './schema.js';
|
|
|
2
2
|
export function createDatabaseAuditWriter(db) {
|
|
3
3
|
return {
|
|
4
4
|
async write(event) {
|
|
5
|
-
await db
|
|
5
|
+
await db
|
|
6
|
+
.insert(auditRecords)
|
|
7
|
+
.values({
|
|
8
|
+
id: event.id ?? crypto.randomUUID(),
|
|
6
9
|
actor: event.actor ?? 'anonymous',
|
|
7
10
|
tenantId: event.tenantId ?? null,
|
|
8
11
|
component: event.component,
|
|
@@ -10,7 +13,9 @@ export function createDatabaseAuditWriter(db) {
|
|
|
10
13
|
outcome: event.outcome,
|
|
11
14
|
metadata: event.metadata ?? null,
|
|
12
15
|
maskedFields: event.maskedFields ?? null,
|
|
13
|
-
|
|
16
|
+
timestamp: event.timestamp ?? new Date(),
|
|
17
|
+
})
|
|
18
|
+
.onConflictDoNothing({ target: auditRecords.id });
|
|
14
19
|
},
|
|
15
20
|
};
|
|
16
21
|
}
|
package/dist/audit/writer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writer.js","sourceRoot":"","sources":["../../src/audit/writer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,UAAU,yBAAyB,CAAC,EAAsB;IAC9D,OAAO;QACL,KAAK,CAAC,KAAK,CAAC,KAAiB;YAC3B,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"writer.js","sourceRoot":"","sources":["../../src/audit/writer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,UAAU,yBAAyB,CAAC,EAAsB;IAC9D,OAAO;QACL,KAAK,CAAC,KAAK,CAAC,KAAiB;YAC3B,MAAM,EAAE;iBACL,MAAM,CAAC,YAAY,CAAC;iBACpB,MAAM,CAAC;gBACN,EAAE,EAAE,KAAK,CAAC,EAAE,IAAI,MAAM,CAAC,UAAU,EAAE;gBACnC,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,WAAW;gBACjC,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,IAAI;gBAChC,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,IAAI;gBAChC,YAAY,EAAE,KAAK,CAAC,YAAY,IAAI,IAAI;gBACxC,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE;aACzC,CAAC;iBACD,mBAAmB,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;QACtD,CAAC;KACF,CAAC;AACJ,CAAC"}
|
package/dist/auth/adapter.d.ts
CHANGED
|
@@ -17,6 +17,8 @@ export interface JwtAdapterConfig {
|
|
|
17
17
|
issuer?: string;
|
|
18
18
|
/** Expected audience (aud claim) */
|
|
19
19
|
audience?: string;
|
|
20
|
+
/** Optional maximum accepted token lifetime in seconds; omitted preserves issuer-selected finite lifetimes. */
|
|
21
|
+
maxTokenLifetimeSeconds?: number;
|
|
20
22
|
/**
|
|
21
23
|
* Map JWT claims to AuthContext fields.
|
|
22
24
|
* Defaults: sub→userId, roles→roles, scope→scopes, tenant_id→tenantId
|
|
@@ -45,7 +47,9 @@ export interface SignJwtOptions {
|
|
|
45
47
|
expiresIn?: number;
|
|
46
48
|
/** Issuer */
|
|
47
49
|
issuer?: string;
|
|
48
|
-
/**
|
|
50
|
+
/** Expected token audience */
|
|
51
|
+
audience?: string;
|
|
52
|
+
/** Additional claims (reserved authentication claims are rejected) */
|
|
49
53
|
claims?: Record<string, unknown>;
|
|
50
54
|
}
|
|
51
55
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/auth/adapter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/auth/adapter.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,YAAY,CAAC,mBAAmB,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;CACpF;AAED,MAAM,WAAW,gBAAgB;IAC/B,gEAAgE;IAChE,MAAM,EAAE,MAAM,CAAC;IACf,kCAAkC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oCAAoC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,+GAA+G;IAC/G,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;CACzC;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAeD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,GAAG,WAAW,CAgFtE;AA6DD,MAAM,WAAW,cAAc;IAC7B,yCAAyC;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,uBAAuB;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY;IACZ,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,aAAa;IACb,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,gBAAgB;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yDAAyD;IACzD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,8BAA8B;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,sEAAsE;IACtE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED;;;GAGG;AACH,wBAAgB,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,CAsCvD"}
|
package/dist/auth/adapter.js
CHANGED
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import { createErrorService } from '../errors/index.js';
|
|
3
|
+
import { isValidJwtSecret } from './jwt-policy.js';
|
|
1
4
|
import { createHmac, timingSafeEqual } from 'node:crypto';
|
|
2
5
|
const defaultClaimMapping = {
|
|
3
6
|
userId: 'sub',
|
|
@@ -11,9 +14,12 @@ const defaultClaimMapping = {
|
|
|
11
14
|
*/
|
|
12
15
|
const MIN_JWT_SECRET_LENGTH = 32;
|
|
13
16
|
export function createJwtAdapter(config) {
|
|
14
|
-
if (config.secret
|
|
15
|
-
throw
|
|
17
|
+
if (!isValidJwtSecret(config.secret)) {
|
|
18
|
+
throw createErrorService().validation(`JWT secret must be at least ${MIN_JWT_SECRET_LENGTH} non-padding characters and must not be a development placeholder`);
|
|
16
19
|
}
|
|
20
|
+
if (config.maxTokenLifetimeSeconds != null &&
|
|
21
|
+
!z.number().finite().positive().safeParse(config.maxTokenLifetimeSeconds).success)
|
|
22
|
+
throw createErrorService().validation('Invalid JWT maximum lifetime');
|
|
17
23
|
const mapping = { ...defaultClaimMapping, ...config.claimMapping };
|
|
18
24
|
return {
|
|
19
25
|
async authenticate(authorizationHeader) {
|
|
@@ -38,11 +44,24 @@ export function createJwtAdapter(config) {
|
|
|
38
44
|
return null;
|
|
39
45
|
}
|
|
40
46
|
}
|
|
41
|
-
|
|
42
|
-
const
|
|
43
|
-
|
|
47
|
+
const now = Date.now() / 1000;
|
|
48
|
+
const times = z
|
|
49
|
+
.object({
|
|
50
|
+
exp: z.number().finite(),
|
|
51
|
+
iat: z.number().finite().optional(),
|
|
52
|
+
nbf: z.number().finite().optional(),
|
|
53
|
+
})
|
|
54
|
+
.safeParse(payload);
|
|
55
|
+
if (!times.success)
|
|
56
|
+
return null;
|
|
57
|
+
const { exp, iat, nbf } = times.data;
|
|
58
|
+
if (exp <= now || (nbf != null && nbf > now) || (iat != null && iat > now))
|
|
59
|
+
return null;
|
|
60
|
+
if (config.maxTokenLifetimeSeconds != null &&
|
|
61
|
+
exp - (iat ?? now) > config.maxTokenLifetimeSeconds)
|
|
62
|
+
return null;
|
|
63
|
+
if (!z.string().min(1).safeParse(payload[mapping.userId]).success)
|
|
44
64
|
return null;
|
|
45
|
-
}
|
|
46
65
|
// Map claims to AuthContext
|
|
47
66
|
const rawRoles = payload[mapping.roles];
|
|
48
67
|
const rawScopes = payload[mapping.scopes];
|
|
@@ -121,6 +140,15 @@ function verifyJwtHs256(token, secret) {
|
|
|
121
140
|
* Returns the signed token string (header.payload.signature).
|
|
122
141
|
*/
|
|
123
142
|
export function signJwt(options) {
|
|
143
|
+
const reserved = ['sub', 'iat', 'exp', 'nbf', 'iss', 'aud', 'roles', 'scope', 'tenant_id'];
|
|
144
|
+
if (reserved.some((claim) => Object.hasOwn(options.claims ?? {}, claim)))
|
|
145
|
+
throw createErrorService().validation('JWT additional claims must not override reserved authentication claims');
|
|
146
|
+
if (!z
|
|
147
|
+
.number()
|
|
148
|
+
.finite()
|
|
149
|
+
.positive()
|
|
150
|
+
.safeParse(options.expiresIn ?? 86400).success)
|
|
151
|
+
throw createErrorService().validation('Invalid JWT expiration');
|
|
124
152
|
const now = Math.floor(Date.now() / 1000);
|
|
125
153
|
const exp = now + (options.expiresIn ?? 86400);
|
|
126
154
|
const header = { alg: 'HS256', typ: 'JWT' };
|
|
@@ -138,6 +166,8 @@ export function signJwt(options) {
|
|
|
138
166
|
payload.tenant_id = options.tenantId;
|
|
139
167
|
if (options.issuer)
|
|
140
168
|
payload.iss = options.issuer;
|
|
169
|
+
if (options.audience)
|
|
170
|
+
payload.aud = options.audience;
|
|
141
171
|
const headerB64 = Buffer.from(JSON.stringify(header)).toString('base64url');
|
|
142
172
|
const payloadB64 = Buffer.from(JSON.stringify(payload)).toString('base64url');
|
|
143
173
|
const signature = createHmac('sha256', options.secret)
|