@oscharko-dev/keiko 1.1.4 → 1.1.6
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/dist/ui/csp-hashes.json +7 -7
- package/dist/ui/static/404.html +1 -1
- package/dist/ui/static/__next.__PAGE__.txt +10 -10
- package/dist/ui/static/__next._full.txt +12 -12
- package/dist/ui/static/__next._tree.txt +1 -1
- package/dist/ui/static/_next/static/chunks/{0xqxs7rppw_o5.css → 0xxx56s32tn9r.css} +1 -1
- package/dist/ui/static/_next/static/chunks/{3pfnjbbr6jydb.js → 182b4sf3i-krz.js} +1 -1
- package/dist/ui/static/_next/static/chunks/1k6f6m-u2q69-.js +1 -0
- package/dist/ui/static/_next/static/chunks/28mbnwl9g65al.js +1 -0
- package/dist/ui/static/_next/static/chunks/{1r6n6x3-e27ud.js → 2t2wftn5liinr.js} +1 -1
- package/dist/ui/static/_next/static/chunks/{2onl4czrdod2d.js → 3-5_wuwrev-8c.js} +1 -1
- package/dist/ui/static/_next/static/chunks/3doin5vaz4zjs.js +1 -0
- package/dist/ui/static/_not-found/__next._full.txt +9 -9
- package/dist/ui/static/_not-found/__next._not-found.__PAGE__.txt +8 -8
- package/dist/ui/static/_not-found/__next._tree.txt +1 -1
- package/dist/ui/static/_not-found.html +1 -1
- package/dist/ui/static/_not-found.txt +9 -9
- package/dist/ui/static/atlassian-connectors/__next._full.txt +11 -11
- package/dist/ui/static/atlassian-connectors/__next._tree.txt +1 -1
- package/dist/ui/static/atlassian-connectors/__next.atlassian-connectors.__PAGE__.txt +10 -10
- package/dist/ui/static/atlassian-connectors.html +1 -1
- package/dist/ui/static/atlassian-connectors.txt +11 -11
- package/dist/ui/static/index.html +1 -1
- package/dist/ui/static/index.txt +12 -12
- package/dist/ui/static/launch/__next._full.txt +12 -12
- package/dist/ui/static/launch/__next._tree.txt +1 -1
- package/dist/ui/static/launch/__next.launch.__PAGE__.txt +10 -10
- package/dist/ui/static/launch.html +1 -1
- package/dist/ui/static/launch.txt +12 -12
- package/dist/ui/static/local-knowledge/__next._full.txt +12 -12
- package/dist/ui/static/local-knowledge/__next._tree.txt +1 -1
- package/dist/ui/static/local-knowledge/__next.local-knowledge.__PAGE__.txt +10 -10
- package/dist/ui/static/local-knowledge/capsule/__next._full.txt +11 -11
- package/dist/ui/static/local-knowledge/capsule/__next._tree.txt +1 -1
- package/dist/ui/static/local-knowledge/capsule/__next.local-knowledge.capsule.__PAGE__.txt +10 -10
- package/dist/ui/static/local-knowledge/capsule.html +1 -1
- package/dist/ui/static/local-knowledge/capsule.txt +11 -11
- package/dist/ui/static/local-knowledge.html +1 -1
- package/dist/ui/static/local-knowledge.txt +12 -12
- package/node_modules/@oscharko-dev/keiko-cli/dist/support-analyze.d.ts.map +1 -1
- package/node_modules/@oscharko-dev/keiko-cli/dist/support-analyze.js +52 -11
- package/node_modules/@oscharko-dev/keiko-cli/package.json +14 -14
- package/node_modules/@oscharko-dev/keiko-connectors/dist/version.d.ts +1 -1
- package/node_modules/@oscharko-dev/keiko-connectors/dist/version.js +1 -1
- package/node_modules/@oscharko-dev/keiko-connectors/package.json +3 -3
- package/node_modules/@oscharko-dev/keiko-contracts/dist/activity-log-failure-class-contracts.d.ts +29 -9
- package/node_modules/@oscharko-dev/keiko-contracts/dist/activity-log-failure-class-contracts.d.ts.map +1 -1
- package/node_modules/@oscharko-dev/keiko-contracts/dist/activity-log-failure-class-contracts.js +54 -9
- package/node_modules/@oscharko-dev/keiko-contracts/dist/activity-log-registry.generated.d.ts +459 -9
- package/node_modules/@oscharko-dev/keiko-contracts/dist/activity-log-registry.generated.d.ts.map +1 -1
- package/node_modules/@oscharko-dev/keiko-contracts/dist/activity-log-registry.generated.js +551 -9
- package/node_modules/@oscharko-dev/keiko-contracts/dist/coding-workbench-runtime-api-validation.d.ts.map +1 -1
- package/node_modules/@oscharko-dev/keiko-contracts/dist/coding-workbench-runtime-api-validation.js +14 -8
- package/node_modules/@oscharko-dev/keiko-contracts/dist/coding-workbench-runtime-api.d.ts +3 -1
- package/node_modules/@oscharko-dev/keiko-contracts/dist/coding-workbench-runtime-api.d.ts.map +1 -1
- package/node_modules/@oscharko-dev/keiko-contracts/dist/coding-workbench-runtime-constants.d.ts +2 -0
- package/node_modules/@oscharko-dev/keiko-contracts/dist/coding-workbench-runtime-constants.d.ts.map +1 -1
- package/node_modules/@oscharko-dev/keiko-contracts/dist/version.d.ts +2 -2
- package/node_modules/@oscharko-dev/keiko-contracts/dist/version.js +2 -2
- package/node_modules/@oscharko-dev/keiko-contracts/package.json +1 -1
- package/node_modules/@oscharko-dev/keiko-evaluations/package.json +9 -9
- package/node_modules/@oscharko-dev/keiko-evidence/dist/version.d.ts +1 -1
- package/node_modules/@oscharko-dev/keiko-evidence/dist/version.js +1 -1
- package/node_modules/@oscharko-dev/keiko-evidence/package.json +4 -4
- package/node_modules/@oscharko-dev/keiko-git/dist/version.d.ts +1 -1
- package/node_modules/@oscharko-dev/keiko-git/dist/version.js +1 -1
- package/node_modules/@oscharko-dev/keiko-git/package.json +1 -1
- package/node_modules/@oscharko-dev/keiko-harness/dist/version.d.ts +1 -1
- package/node_modules/@oscharko-dev/keiko-harness/dist/version.js +1 -1
- package/node_modules/@oscharko-dev/keiko-harness/package.json +7 -7
- package/node_modules/@oscharko-dev/keiko-local-knowledge/dist/version.d.ts +1 -1
- package/node_modules/@oscharko-dev/keiko-local-knowledge/dist/version.js +1 -1
- package/node_modules/@oscharko-dev/keiko-local-knowledge/package.json +5 -5
- package/node_modules/@oscharko-dev/keiko-memory-capture/dist/version.d.ts +1 -1
- package/node_modules/@oscharko-dev/keiko-memory-capture/dist/version.js +1 -1
- package/node_modules/@oscharko-dev/keiko-memory-capture/package.json +3 -3
- package/node_modules/@oscharko-dev/keiko-memory-consolidation/dist/version.d.ts +1 -1
- package/node_modules/@oscharko-dev/keiko-memory-consolidation/dist/version.js +1 -1
- package/node_modules/@oscharko-dev/keiko-memory-consolidation/package.json +3 -3
- package/node_modules/@oscharko-dev/keiko-memory-governance/dist/version.d.ts +1 -1
- package/node_modules/@oscharko-dev/keiko-memory-governance/dist/version.js +1 -1
- package/node_modules/@oscharko-dev/keiko-memory-governance/package.json +3 -3
- package/node_modules/@oscharko-dev/keiko-memory-retrieval/dist/version.d.ts +1 -1
- package/node_modules/@oscharko-dev/keiko-memory-retrieval/dist/version.js +1 -1
- package/node_modules/@oscharko-dev/keiko-memory-retrieval/package.json +3 -3
- package/node_modules/@oscharko-dev/keiko-memory-vault/dist/version.d.ts +1 -1
- package/node_modules/@oscharko-dev/keiko-memory-vault/dist/version.js +1 -1
- package/node_modules/@oscharko-dev/keiko-memory-vault/package.json +3 -3
- package/node_modules/@oscharko-dev/keiko-model-gateway/dist/gateway.d.ts +3 -0
- package/node_modules/@oscharko-dev/keiko-model-gateway/dist/gateway.d.ts.map +1 -1
- package/node_modules/@oscharko-dev/keiko-model-gateway/dist/gateway.js +21 -8
- package/node_modules/@oscharko-dev/keiko-model-gateway/dist/http.d.ts +1 -1
- package/node_modules/@oscharko-dev/keiko-model-gateway/dist/http.d.ts.map +1 -1
- package/node_modules/@oscharko-dev/keiko-model-gateway/dist/http.js +7 -6
- package/node_modules/@oscharko-dev/keiko-model-gateway/dist/observability.d.ts.map +1 -1
- package/node_modules/@oscharko-dev/keiko-model-gateway/dist/observability.js +1 -0
- package/node_modules/@oscharko-dev/keiko-model-gateway/dist/openai-adapter.d.ts +7 -0
- package/node_modules/@oscharko-dev/keiko-model-gateway/dist/openai-adapter.d.ts.map +1 -1
- package/node_modules/@oscharko-dev/keiko-model-gateway/dist/openai-adapter.js +253 -18
- package/node_modules/@oscharko-dev/keiko-model-gateway/dist/resilience.d.ts +2 -0
- package/node_modules/@oscharko-dev/keiko-model-gateway/dist/resilience.d.ts.map +1 -1
- package/node_modules/@oscharko-dev/keiko-model-gateway/dist/resilience.js +4 -0
- package/node_modules/@oscharko-dev/keiko-model-gateway/dist/version.d.ts +1 -1
- package/node_modules/@oscharko-dev/keiko-model-gateway/dist/version.js +1 -1
- package/node_modules/@oscharko-dev/keiko-model-gateway/package.json +4 -4
- package/node_modules/@oscharko-dev/keiko-quality-intelligence/package.json +3 -3
- package/node_modules/@oscharko-dev/keiko-sandbox/dist/darwin-git.d.ts +3 -0
- package/node_modules/@oscharko-dev/keiko-sandbox/dist/darwin-git.d.ts.map +1 -1
- package/node_modules/@oscharko-dev/keiko-sandbox/dist/darwin-git.js +30 -6
- package/node_modules/@oscharko-dev/keiko-sandbox/package.json +2 -2
- package/node_modules/@oscharko-dev/keiko-sdk/package.json +9 -9
- package/node_modules/@oscharko-dev/keiko-security/dist/version.d.ts +1 -1
- package/node_modules/@oscharko-dev/keiko-security/dist/version.js +1 -1
- package/node_modules/@oscharko-dev/keiko-security/package.json +2 -2
- package/node_modules/@oscharko-dev/keiko-server/dist/coding-runtime/codingRuntimeActivityOperations.d.ts +24 -0
- package/node_modules/@oscharko-dev/keiko-server/dist/coding-runtime/codingRuntimeActivityOperations.d.ts.map +1 -1
- package/node_modules/@oscharko-dev/keiko-server/dist/coding-runtime/codingRuntimeActivityOperations.js +22 -0
- package/node_modules/@oscharko-dev/keiko-server/dist/coding-runtime/codingRuntimeEventHub.d.ts +8 -1
- package/node_modules/@oscharko-dev/keiko-server/dist/coding-runtime/codingRuntimeEventHub.d.ts.map +1 -1
- package/node_modules/@oscharko-dev/keiko-server/dist/coding-runtime/codingRuntimeEventHub.js +28 -1
- package/node_modules/@oscharko-dev/keiko-server/dist/coding-runtime/codingRuntimeStartConfirmation.d.ts +1 -1
- package/node_modules/@oscharko-dev/keiko-server/dist/coding-runtime/codingRuntimeStartConfirmation.d.ts.map +1 -1
- package/node_modules/@oscharko-dev/keiko-server/dist/coding-runtime/devLaneRuntimeProcessBackend.d.ts.map +1 -1
- package/node_modules/@oscharko-dev/keiko-server/dist/coding-runtime/devLaneRuntimeProcessBackend.js +39 -13
- package/node_modules/@oscharko-dev/keiko-server/dist/coding-runtime/opencodeFunctionalHarness/_governedTools.d.ts +1 -0
- package/node_modules/@oscharko-dev/keiko-server/dist/coding-runtime/opencodeFunctionalHarness/_governedTools.d.ts.map +1 -1
- package/node_modules/@oscharko-dev/keiko-server/dist/coding-runtime/opencodeFunctionalHarness/_governedTools.js +59 -8
- package/node_modules/@oscharko-dev/keiko-server/dist/coding-runtime/runtimeAuthorityService.d.ts +1 -1
- package/node_modules/@oscharko-dev/keiko-server/dist/coding-runtime/runtimeAuthorityService.d.ts.map +1 -1
- package/node_modules/@oscharko-dev/keiko-server/dist/coding-sidecar-gateway.d.ts.map +1 -1
- package/node_modules/@oscharko-dev/keiko-server/dist/coding-sidecar-gateway.js +324 -46
- package/node_modules/@oscharko-dev/keiko-server/dist/gitDelivery/verifiedRepositoryIdentity.d.ts +8 -0
- package/node_modules/@oscharko-dev/keiko-server/dist/gitDelivery/verifiedRepositoryIdentity.d.ts.map +1 -1
- package/node_modules/@oscharko-dev/keiko-server/dist/gitDelivery/verifiedRepositoryIdentity.js +46 -4
- package/node_modules/@oscharko-dev/keiko-server/package.json +22 -22
- package/node_modules/@oscharko-dev/keiko-tool-catalog/package.json +3 -3
- package/node_modules/@oscharko-dev/keiko-tools/dist/version.d.ts +1 -1
- package/node_modules/@oscharko-dev/keiko-tools/dist/version.js +1 -1
- package/node_modules/@oscharko-dev/keiko-tools/package.json +7 -7
- package/node_modules/@oscharko-dev/keiko-verification/package.json +5 -5
- package/node_modules/@oscharko-dev/keiko-workflows/package.json +10 -10
- package/node_modules/@oscharko-dev/keiko-workspace/dist/version.d.ts +1 -1
- package/node_modules/@oscharko-dev/keiko-workspace/dist/version.js +1 -1
- package/node_modules/@oscharko-dev/keiko-workspace/package.json +3 -3
- package/package.json +27 -26
- package/release-impact.catalog.json +103 -0
- package/vendor/oscharko-dev-keiko-cli-1.1.6.tgz +0 -0
- package/vendor/{oscharko-dev-keiko-connectors-1.1.4.tgz → oscharko-dev-keiko-connectors-1.1.6.tgz} +0 -0
- package/vendor/oscharko-dev-keiko-contracts-1.1.6.tgz +0 -0
- package/vendor/{oscharko-dev-keiko-evaluations-1.1.4.tgz → oscharko-dev-keiko-evaluations-1.1.6.tgz} +0 -0
- package/vendor/{oscharko-dev-keiko-evidence-1.1.4.tgz → oscharko-dev-keiko-evidence-1.1.6.tgz} +0 -0
- package/vendor/oscharko-dev-keiko-git-1.1.6.tgz +0 -0
- package/vendor/{oscharko-dev-keiko-harness-1.1.4.tgz → oscharko-dev-keiko-harness-1.1.6.tgz} +0 -0
- package/vendor/{oscharko-dev-keiko-local-knowledge-1.1.4.tgz → oscharko-dev-keiko-local-knowledge-1.1.6.tgz} +0 -0
- package/vendor/{oscharko-dev-keiko-memory-capture-1.1.4.tgz → oscharko-dev-keiko-memory-capture-1.1.6.tgz} +0 -0
- package/vendor/{oscharko-dev-keiko-memory-consolidation-1.1.4.tgz → oscharko-dev-keiko-memory-consolidation-1.1.6.tgz} +0 -0
- package/vendor/{oscharko-dev-keiko-memory-governance-1.1.4.tgz → oscharko-dev-keiko-memory-governance-1.1.6.tgz} +0 -0
- package/vendor/{oscharko-dev-keiko-memory-retrieval-1.1.4.tgz → oscharko-dev-keiko-memory-retrieval-1.1.6.tgz} +0 -0
- package/vendor/oscharko-dev-keiko-memory-vault-1.1.6.tgz +0 -0
- package/vendor/oscharko-dev-keiko-model-gateway-1.1.6.tgz +0 -0
- package/vendor/{oscharko-dev-keiko-quality-intelligence-1.1.4.tgz → oscharko-dev-keiko-quality-intelligence-1.1.6.tgz} +0 -0
- package/vendor/oscharko-dev-keiko-sandbox-1.1.6.tgz +0 -0
- package/vendor/{oscharko-dev-keiko-sdk-1.1.4.tgz → oscharko-dev-keiko-sdk-1.1.6.tgz} +0 -0
- package/vendor/{oscharko-dev-keiko-security-1.1.4.tgz → oscharko-dev-keiko-security-1.1.6.tgz} +0 -0
- package/vendor/oscharko-dev-keiko-server-1.1.6.tgz +0 -0
- package/vendor/{oscharko-dev-keiko-tool-catalog-1.1.4.tgz → oscharko-dev-keiko-tool-catalog-1.1.6.tgz} +0 -0
- package/vendor/{oscharko-dev-keiko-tools-1.1.4.tgz → oscharko-dev-keiko-tools-1.1.6.tgz} +0 -0
- package/vendor/{oscharko-dev-keiko-verification-1.1.4.tgz → oscharko-dev-keiko-verification-1.1.6.tgz} +0 -0
- package/vendor/{oscharko-dev-keiko-workflows-1.1.4.tgz → oscharko-dev-keiko-workflows-1.1.6.tgz} +0 -0
- package/vendor/{oscharko-dev-keiko-workspace-1.1.4.tgz → oscharko-dev-keiko-workspace-1.1.6.tgz} +0 -0
- package/dist/ui/static/_next/static/chunks/0fbt5i1tfqbr3.js +0 -1
- package/dist/ui/static/_next/static/chunks/0nmcnzva3p40l.js +0 -1
- package/dist/ui/static/_next/static/chunks/2thq7sr8sysu-.js +0 -1
- package/vendor/oscharko-dev-keiko-cli-1.1.4.tgz +0 -0
- package/vendor/oscharko-dev-keiko-contracts-1.1.4.tgz +0 -0
- package/vendor/oscharko-dev-keiko-git-1.1.4.tgz +0 -0
- package/vendor/oscharko-dev-keiko-memory-vault-1.1.4.tgz +0 -0
- package/vendor/oscharko-dev-keiko-model-gateway-1.1.4.tgz +0 -0
- package/vendor/oscharko-dev-keiko-sandbox-1.1.4.tgz +0 -0
- package/vendor/oscharko-dev-keiko-server-1.1.4.tgz +0 -0
- /package/dist/ui/static/_next/static/{UOajW4uJ4X2FnrX3ZV7Ic → ytpWXc-OicMB-rH2zX5b3}/_buildManifest.js +0 -0
- /package/dist/ui/static/_next/static/{UOajW4uJ4X2FnrX3ZV7Ic → ytpWXc-OicMB-rH2zX5b3}/_clientMiddlewareManifest.js +0 -0
- /package/dist/ui/static/_next/static/{UOajW4uJ4X2FnrX3ZV7Ic → ytpWXc-OicMB-rH2zX5b3}/_ssgManifest.js +0 -0
|
@@ -1500,11 +1500,12 @@ async function nextRead(reader, idleTimeoutMs, deadline, signal) {
|
|
|
1500
1500
|
throw read === ABORTED_MARKER ? abortReason(signal) : new SseIdleTimeoutError(idleTimeoutMs ?? 0);
|
|
1501
1501
|
}
|
|
1502
1502
|
// The data payloads of complete SSE lines, up to `data: [DONE]`, which sets `ended.done`.
|
|
1503
|
-
function* dataPayloads(lines, ended) {
|
|
1503
|
+
function* dataPayloads(lines, ended, onDone) {
|
|
1504
1504
|
for (const line of lines) {
|
|
1505
1505
|
const result = parseSseLine(line);
|
|
1506
1506
|
if (result.kind === "done") {
|
|
1507
1507
|
ended.done = true;
|
|
1508
|
+
onDone?.();
|
|
1508
1509
|
return;
|
|
1509
1510
|
}
|
|
1510
1511
|
if (result.kind === "value")
|
|
@@ -1517,7 +1518,7 @@ function dataDeadlineFor(idleTimeoutMs) {
|
|
|
1517
1518
|
// The payloads of one SSE read, up to `data: [DONE]` or the end of the body. Incomplete lines are
|
|
1518
1519
|
// buffered across reads, cumulative bytes are capped exactly like readJsonCapped, and the wait for
|
|
1519
1520
|
// each data event is bounded. readSseStream owns the reader and releases it.
|
|
1520
|
-
async function* ssePayloads(reader, maxBytes, idleTimeoutMs, signal) {
|
|
1521
|
+
async function* ssePayloads(reader, maxBytes, idleTimeoutMs, signal, onDone) {
|
|
1521
1522
|
const decoder = new TextDecoder();
|
|
1522
1523
|
const deadline = dataDeadlineFor(idleTimeoutMs);
|
|
1523
1524
|
const ended = { done: false };
|
|
@@ -1539,26 +1540,26 @@ async function* ssePayloads(reader, maxBytes, idleTimeoutMs, signal) {
|
|
|
1539
1540
|
buffer += decoder.decode(value, { stream: true });
|
|
1540
1541
|
const { lines, rest } = splitSseBuffer(buffer);
|
|
1541
1542
|
buffer = rest;
|
|
1542
|
-
for (const payload of dataPayloads(lines, ended)) {
|
|
1543
|
+
for (const payload of dataPayloads(lines, ended, onDone)) {
|
|
1543
1544
|
yield payload;
|
|
1544
1545
|
deadline?.restart();
|
|
1545
1546
|
}
|
|
1546
1547
|
if (ended.done)
|
|
1547
1548
|
return;
|
|
1548
1549
|
}
|
|
1549
|
-
yield* dataPayloads([buffer + decoder.decode()], ended);
|
|
1550
|
+
yield* dataPayloads([buffer + decoder.decode()], ended, onDone);
|
|
1550
1551
|
}
|
|
1551
1552
|
// Reads a Server-Sent-Events response as a stream of parsed JSON `data:` payloads. Incomplete lines
|
|
1552
1553
|
// are buffered across reads; `data: [DONE]` terminates; cumulative bytes are capped exactly like
|
|
1553
1554
|
// readJsonCapped. A null body yields nothing. `idleTimeoutMs` bounds the wait for each data event;
|
|
1554
1555
|
// `signal` ends the read the moment it aborts, with its reason.
|
|
1555
|
-
export async function* readSseStream(response, maxBytes = MAX_RESPONSE_BYTES, idleTimeoutMs, signal) {
|
|
1556
|
+
export async function* readSseStream(response, maxBytes = MAX_RESPONSE_BYTES, idleTimeoutMs, signal, onDone) {
|
|
1556
1557
|
if (response.body === null) {
|
|
1557
1558
|
return;
|
|
1558
1559
|
}
|
|
1559
1560
|
const reader = response.body.getReader();
|
|
1560
1561
|
try {
|
|
1561
|
-
yield* ssePayloads(reader, maxBytes, idleTimeoutMs, signal);
|
|
1562
|
+
yield* ssePayloads(reader, maxBytes, idleTimeoutMs, signal, onDone);
|
|
1562
1563
|
}
|
|
1563
1564
|
finally {
|
|
1564
1565
|
// Every exit releases the body: the end of the stream, a failure, and a consumer that stops
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"observability.d.ts","sourceRoot":"","sources":["../src/observability.ts"],"names":[],"mappings":"AAwBA,OAAO,EAML,KAAK,oBAAoB,EAC1B,MAAM,qDAAqD,CAAC;AAG7D,MAAM,MAAM,oBAAoB,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAIvE,MAAM,MAAM,uBAAuB,GAAG,SAAS,GAAG,WAAW,GAAG,MAAM,CAAC;AAEvE,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,KAAK,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAClD,QAAQ,CAAC,QAAQ,EAAE,uBAAuB,CAAC;IAC3C,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5C,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;CAChE;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,CAAC;IACtD,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAgB5C,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,oBAAoB,KAAK,OAAO,CAAC,GAAG,SAAS,CAAC;CAC3E;AAKD,wBAAgB,eAAe,CAAC,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAE/F;AAKD,eAAO,MAAM,uBAAuB,EAAE,mBAQpC,CAAC;AASH,wBAAgB,cAAc,CAAC,IAAI,EAAE,mBAAmB,GAAG,SAAS,GAAG,mBAAmB,CAEzF;AA0GD,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7C;AAiBD,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,mBAAmB,EACzB,aAAa,EAAE,MAAM,GAAG,SAAS,GAChC,mBAAmB,CAarB;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,mBAAmB,GAAG,MAAM,GAAG,SAAS,CAE9E;AAUD,wBAAgB,QAAQ,IAAI,MAAM,MAAM,CAGvC;AA8BD,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAKnD;
|
|
1
|
+
{"version":3,"file":"observability.d.ts","sourceRoot":"","sources":["../src/observability.ts"],"names":[],"mappings":"AAwBA,OAAO,EAML,KAAK,oBAAoB,EAC1B,MAAM,qDAAqD,CAAC;AAG7D,MAAM,MAAM,oBAAoB,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAIvE,MAAM,MAAM,uBAAuB,GAAG,SAAS,GAAG,WAAW,GAAG,MAAM,CAAC;AAEvE,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,KAAK,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAClD,QAAQ,CAAC,QAAQ,EAAE,uBAAuB,CAAC;IAC3C,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5C,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;CAChE;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,CAAC;IACtD,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAgB5C,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,oBAAoB,KAAK,OAAO,CAAC,GAAG,SAAS,CAAC;CAC3E;AAKD,wBAAgB,eAAe,CAAC,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAE/F;AAKD,eAAO,MAAM,uBAAuB,EAAE,mBAQpC,CAAC;AASH,wBAAgB,cAAc,CAAC,IAAI,EAAE,mBAAmB,GAAG,SAAS,GAAG,mBAAmB,CAEzF;AA0GD,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7C;AAiBD,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,mBAAmB,EACzB,aAAa,EAAE,MAAM,GAAG,SAAS,GAChC,mBAAmB,CAarB;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,mBAAmB,GAAG,MAAM,GAAG,SAAS,CAE9E;AAUD,wBAAgB,QAAQ,IAAI,MAAM,MAAM,CAGvC;AA8BD,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAKnD;AAoBD,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,oBAAoB,CAIzE;AAOD,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAElD;AAKD,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAUjF"}
|
|
@@ -216,6 +216,7 @@ const ACTIVITY_LOG_ERROR_KIND_RULES = [
|
|
|
216
216
|
{ pattern: /cancel|abort/u, result: "cancelled" },
|
|
217
217
|
{ pattern: /rate|^429$/u, result: "rate-limited" },
|
|
218
218
|
{ pattern: /valid|schema/u, result: "validation-failed" },
|
|
219
|
+
{ pattern: /model[_-]?refusal|content[_-]?filter/u, result: "permission-denied" },
|
|
219
220
|
{
|
|
220
221
|
pattern: /(?:^|[._-])auth(?:entication)?(?:[._-]|$)|permission|forbidden|blocked/u,
|
|
221
222
|
result: "permission-denied",
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
import { MalformedToolCallError } from "@oscharko-dev/keiko-security/errors/gateway";
|
|
2
2
|
import { type ModelGatewayLogContext, type ModelGatewayLogSink } from "./observability.js";
|
|
3
3
|
import type { CostClass, GatewayRequest, GatewayStreamChunk, ModelProviderConfig, NormalizedResponse, ProviderAdapter, StreamReadBounds } from "./types.js";
|
|
4
|
+
export declare function resetChatCompatibilityMemoForTests(): void;
|
|
4
5
|
export interface AdapterDeps {
|
|
5
6
|
readonly fetchImpl?: typeof fetch | undefined;
|
|
6
7
|
readonly requestId: string;
|
|
7
8
|
readonly costClass: CostClass;
|
|
9
|
+
/** Stable, credential-scoped provider identity before per-call timeout copies are made. */
|
|
10
|
+
readonly compatibilityMemoScope?: object | undefined;
|
|
8
11
|
readonly now?: (() => number) | undefined;
|
|
9
12
|
readonly log?: ModelGatewayLogSink | undefined;
|
|
10
13
|
readonly logContext?: ModelGatewayLogContext | undefined;
|
|
@@ -28,6 +31,10 @@ export declare class OpenAiAdapter implements ProviderAdapter {
|
|
|
28
31
|
private withPartialUsage;
|
|
29
32
|
private mapStreamError;
|
|
30
33
|
private dispatch;
|
|
34
|
+
private dispatchCompatibleStream;
|
|
35
|
+
private retryWithoutUsage;
|
|
36
|
+
private retryWithoutStreamingIfNamed;
|
|
37
|
+
private logChatCompatibilityRetry;
|
|
31
38
|
private mapDispatchError;
|
|
32
39
|
private readBody;
|
|
33
40
|
private readErrorBody;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-adapter.d.ts","sourceRoot":"","sources":["../src/openai-adapter.ts"],"names":[],"mappings":"AAUA,OAAO,EAOL,sBAAsB,EAOvB,MAAM,6CAA6C,CAAC;AA6BrD,OAAO,EASL,KAAK,sBAAsB,EAC3B,KAAK,mBAAmB,EACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EACV,SAAS,EAET,cAAc,EACd,kBAAkB,EAClB,mBAAmB,EACnB,kBAAkB,EAElB,eAAe,EACf,gBAAgB,EAEjB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"openai-adapter.d.ts","sourceRoot":"","sources":["../src/openai-adapter.ts"],"names":[],"mappings":"AAUA,OAAO,EAOL,sBAAsB,EAOvB,MAAM,6CAA6C,CAAC;AA6BrD,OAAO,EASL,KAAK,sBAAsB,EAC3B,KAAK,mBAAmB,EACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EACV,SAAS,EAET,cAAc,EACd,kBAAkB,EAClB,mBAAmB,EACnB,kBAAkB,EAElB,eAAe,EACf,gBAAgB,EAEjB,MAAM,YAAY,CAAC;AA4GpB,wBAAgB,kCAAkC,IAAI,IAAI,CAEzD;AA+CD,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,KAAK,GAAG,SAAS,CAAC;IAC9C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,2FAA2F;IAC3F,QAAQ,CAAC,sBAAsB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACrD,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,MAAM,CAAC,GAAG,SAAS,CAAC;IAE1C,QAAQ,CAAC,GAAG,CAAC,EAAE,mBAAmB,GAAG,SAAS,CAAC;IAI/C,QAAQ,CAAC,UAAU,CAAC,EAAE,sBAAsB,GAAG,SAAS,CAAC;CAC1D;AA4QD,eAAO,MAAM,sBAAsB,QAAS,CAAC;AAmK7C,qBAAa,sBAAuB,SAAQ,sBAAsB;CAAG;AAwfrE,qBAAa,aAAc,YAAW,eAAe;IAIvC,OAAO,CAAC,QAAQ,CAAC,IAAI;IAHjC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAsB;IAE1C,YAA6B,IAAI,EAAE,WAAW,EAM7C;IAED,IAAI,YACO,cAAc,UACf,mBAAmB,KAC1B,OAAO,CAAC,kBAAkB,CAAC,CA4B5B;IASF,UAAU,SACF,aAAa,WACV,cAAc,UACf,mBAAmB,WAClB,gBAAgB,KACxB,cAAc,CAAC,kBAAkB,CAAC,CAuCnC;YAOa,YAAY;YAuCZ,cAAc;YAkBd,eAAe;IAoB9B,OAAO,CAAC,aAAa;IA0BrB,OAAO,CAAC,gBAAgB;IAyBxB,OAAO,CAAC,aAAa;IA6BrB,OAAO,CAAC,gBAAgB;IAkBxB,OAAO,CAAC,cAAc;YA2BR,QAAQ;YAwCR,wBAAwB;YAgCxB,iBAAiB;YA0BjB,4BAA4B;IAgC1C,OAAO,CAAC,yBAAyB;IAmBjC,OAAO,CAAC,gBAAgB;YAmBV,QAAQ;YAgBR,aAAa;CAe5B"}
|
|
@@ -33,6 +33,13 @@ const CHAT_REQUEST_DISPATCH_OPERATION = defineActivityLogOperation({
|
|
|
33
33
|
dataClass: "closed-enum",
|
|
34
34
|
required: true,
|
|
35
35
|
},
|
|
36
|
+
streamUsageRequested: {
|
|
37
|
+
type: "boolean",
|
|
38
|
+
dataClass: "closed-enum",
|
|
39
|
+
required: false,
|
|
40
|
+
},
|
|
41
|
+
// Historical chat.request.dispatch lines predate this diagnostic; old bundles remain readable.
|
|
42
|
+
toolCount: { type: "integer", dataClass: "count", required: false },
|
|
36
43
|
readBudgetMs: { type: "number", dataClass: "duration", required: false },
|
|
37
44
|
},
|
|
38
45
|
causal: "correlation",
|
|
@@ -42,6 +49,61 @@ const CHAT_REQUEST_DISPATCH_OPERATION = defineActivityLogOperation({
|
|
|
42
49
|
proofIds: ["chat.request.dispatch.emitted-line"],
|
|
43
50
|
releaseImpact: "patch",
|
|
44
51
|
});
|
|
52
|
+
const CHAT_REQUEST_COMPATIBILITY_RETRY_OPERATION = defineActivityLogOperation({
|
|
53
|
+
contractKind: "activity-log-operation",
|
|
54
|
+
schemaVersion: 1,
|
|
55
|
+
op: "chat.request.compatibility-retry",
|
|
56
|
+
category: "gateway",
|
|
57
|
+
owner: "keiko-model-gateway",
|
|
58
|
+
emitter: "openai-adapter.dispatchCompatibleStream",
|
|
59
|
+
fields: {
|
|
60
|
+
endpointDigest: { type: "string", dataClass: "digest", required: true, maxLength: 64 },
|
|
61
|
+
modelId: { type: "string", dataClass: "opaque-id", required: true, maxLength: 256 },
|
|
62
|
+
omittedField: {
|
|
63
|
+
type: "string",
|
|
64
|
+
dataClass: "closed-enum",
|
|
65
|
+
required: true,
|
|
66
|
+
values: ["stream_options", "stream"],
|
|
67
|
+
},
|
|
68
|
+
},
|
|
69
|
+
causal: "correlation",
|
|
70
|
+
lifecycle: "state",
|
|
71
|
+
analyzerProjection: "timeline",
|
|
72
|
+
failureClasses: ["gateway-chat-provider-call"],
|
|
73
|
+
proofIds: ["chat.request.compatibility-retry.emitted-line"],
|
|
74
|
+
releaseImpact: "patch",
|
|
75
|
+
});
|
|
76
|
+
let chatCompatibilityEndpoints = new WeakMap();
|
|
77
|
+
const MAX_STRICT_STREAM_OPTIONS_ENDPOINTS = 256;
|
|
78
|
+
const STRICT_STREAM_OPTIONS_REPROBE_MS = 15 * 60_000;
|
|
79
|
+
function chatCompatibilityMode(scope, url, now) {
|
|
80
|
+
const endpoints = chatCompatibilityEndpoints.get(scope);
|
|
81
|
+
const memo = endpoints?.get(url);
|
|
82
|
+
if (memo === undefined)
|
|
83
|
+
return undefined;
|
|
84
|
+
if (memo.expiresAt > now())
|
|
85
|
+
return memo.mode;
|
|
86
|
+
endpoints?.delete(url);
|
|
87
|
+
return undefined;
|
|
88
|
+
}
|
|
89
|
+
function rememberChatCompatibility(scope, url, mode, now) {
|
|
90
|
+
let endpoints = chatCompatibilityEndpoints.get(scope);
|
|
91
|
+
if (endpoints === undefined) {
|
|
92
|
+
endpoints = new Map();
|
|
93
|
+
chatCompatibilityEndpoints.set(scope, endpoints);
|
|
94
|
+
}
|
|
95
|
+
if (endpoints.has(url))
|
|
96
|
+
endpoints.delete(url);
|
|
97
|
+
if (endpoints.size >= MAX_STRICT_STREAM_OPTIONS_ENDPOINTS) {
|
|
98
|
+
const oldest = endpoints.keys().next().value;
|
|
99
|
+
if (oldest !== undefined)
|
|
100
|
+
endpoints.delete(oldest);
|
|
101
|
+
}
|
|
102
|
+
endpoints.set(url, { mode, expiresAt: now + STRICT_STREAM_OPTIONS_REPROBE_MS });
|
|
103
|
+
}
|
|
104
|
+
export function resetChatCompatibilityMemoForTests() {
|
|
105
|
+
chatCompatibilityEndpoints = new WeakMap();
|
|
106
|
+
}
|
|
45
107
|
const CHAT_RESPONSE_STREAMED_OPERATION = defineActivityLogOperation({
|
|
46
108
|
contractKind: "activity-log-operation",
|
|
47
109
|
schemaVersion: 1,
|
|
@@ -99,6 +161,19 @@ function logChatDispatch(log, fields) {
|
|
|
99
161
|
const correlationId = logCorrelationId(log);
|
|
100
162
|
log.write(activityLogEvent(CHAT_REQUEST_DISPATCH_OPERATION, { level: "info", ...(correlationId === undefined ? {} : { correlationId }) }, fields));
|
|
101
163
|
}
|
|
164
|
+
function chatDispatchFields(url, request, config, body, stream, includeUsage, bounds) {
|
|
165
|
+
return {
|
|
166
|
+
endpointDigest: sha256Hex(logEndpointHost(url) ?? "invalid-endpoint"),
|
|
167
|
+
modelId: logModelId(config.modelId),
|
|
168
|
+
messageCount: request.messages.length,
|
|
169
|
+
bodyBytes: Buffer.byteLength(body, "utf8"),
|
|
170
|
+
timeoutMs: bounds?.silenceMs ?? config.timeoutMs,
|
|
171
|
+
stream,
|
|
172
|
+
...(stream ? { streamUsageRequested: includeUsage } : {}),
|
|
173
|
+
toolCount: request.tools?.length ?? 0,
|
|
174
|
+
...(bounds === undefined ? {} : { readBudgetMs: bounds.budgetMs }),
|
|
175
|
+
};
|
|
176
|
+
}
|
|
102
177
|
function cancellationWasDeadline(signal) {
|
|
103
178
|
return (signal?.aborted === true &&
|
|
104
179
|
signal.reason instanceof DOMException &&
|
|
@@ -127,6 +202,15 @@ function timedAbort(ms, message) {
|
|
|
127
202
|
},
|
|
128
203
|
};
|
|
129
204
|
}
|
|
205
|
+
// The bounds one dispatched request runs under. A buffered (`stream: false`) answer sends nothing,
|
|
206
|
+
// headers included, until its generation ends, so only the read budget bounds when it starts; the
|
|
207
|
+
// silence bound belongs to a streamed read, whose provider proves it is alive as it goes (PR #3600
|
|
208
|
+
// review).
|
|
209
|
+
function dispatchedReadBounds(stream, bounds) {
|
|
210
|
+
return stream || bounds === undefined
|
|
211
|
+
? bounds
|
|
212
|
+
: { silenceMs: bounds.budgetMs, budgetMs: bounds.budgetMs };
|
|
213
|
+
}
|
|
130
214
|
function requestDeadline(timeoutMs, bounds, cancel) {
|
|
131
215
|
const withCancel = (signals) => AbortSignal.any(cancel === undefined ? [...signals] : [...signals, cancel]);
|
|
132
216
|
if (bounds === undefined) {
|
|
@@ -209,11 +293,11 @@ function buildBody(request, config) {
|
|
|
209
293
|
// uses its own silence bound instead (ADR-0003). Exported for tests.
|
|
210
294
|
export const STREAM_IDLE_TIMEOUT_MS = 60_000;
|
|
211
295
|
// `include_usage` requests a final usage-only chunk so token accounting survives.
|
|
212
|
-
function buildStreamBody(request, config) {
|
|
296
|
+
function buildStreamBody(request, config, includeUsage) {
|
|
213
297
|
return {
|
|
214
298
|
...buildBody(request, config),
|
|
215
299
|
stream: true,
|
|
216
|
-
stream_options: { include_usage: true },
|
|
300
|
+
...(includeUsage ? { stream_options: { include_usage: true } } : {}),
|
|
217
301
|
};
|
|
218
302
|
}
|
|
219
303
|
const FINISH_REASONS = new Set([
|
|
@@ -437,8 +521,80 @@ function isContextOverflow(status, payload) {
|
|
|
437
521
|
}
|
|
438
522
|
return CONTEXT_OVERFLOW_SIGNAL.test(errorSignal(payload));
|
|
439
523
|
}
|
|
524
|
+
const MODEL_REFUSAL_SIGNAL = /content[_ -]?filter|refus|safety|policy/;
|
|
440
525
|
function isModelRefusal(payload) {
|
|
441
|
-
return
|
|
526
|
+
return MODEL_REFUSAL_SIGNAL.test(errorSignal(payload));
|
|
527
|
+
}
|
|
528
|
+
function isOptionalStreamFieldRejection(payload) {
|
|
529
|
+
const error = isRecord(payload) && isRecord(payload.error) ? payload.error : payload;
|
|
530
|
+
if (!isRecord(error))
|
|
531
|
+
return false;
|
|
532
|
+
const field = /stream[_ -]?options|include[_ -]?usage/;
|
|
533
|
+
if (typeof error.param === "string" && field.test(error.param.toLowerCase()))
|
|
534
|
+
return true;
|
|
535
|
+
if (error.code === "unsupported_parameter" || error.type === "unsupported_parameter")
|
|
536
|
+
return true;
|
|
537
|
+
const message = typeof error.message === "string" ? error.message.toLowerCase() : "";
|
|
538
|
+
return (/(?:stream[_ -]?options|include[_ -]?usage).{0,48}(?:disabled|unsupported|not supported|not allowed|not permitted|unrecognized|unknown|invalid|prohibited|rejected)/.test(message) ||
|
|
539
|
+
/(?:unsupported|unknown|unrecognized|invalid|prohibited|rejected).{0,48}(?:stream[_ -]?options|include[_ -]?usage)/.test(message));
|
|
540
|
+
}
|
|
541
|
+
function isNamedStreamFieldRejection(payload) {
|
|
542
|
+
const error = isRecord(payload) && isRecord(payload.error) ? payload.error : payload;
|
|
543
|
+
if (!isRecord(error) || !isOptionalStreamFieldRejection(payload))
|
|
544
|
+
return false;
|
|
545
|
+
const field = /stream[_ -]?options|include[_ -]?usage/;
|
|
546
|
+
return ((typeof error.param === "string" && field.test(error.param.toLowerCase())) ||
|
|
547
|
+
(typeof error.message === "string" && field.test(error.message.toLowerCase())));
|
|
548
|
+
}
|
|
549
|
+
function hasNonStreamErrorParameter(payload) {
|
|
550
|
+
const error = isRecord(payload) && isRecord(payload.error) ? payload.error : payload;
|
|
551
|
+
if (!isRecord(error))
|
|
552
|
+
return false;
|
|
553
|
+
if (typeof error.param === "string" && isNonStreamField(error.param))
|
|
554
|
+
return true;
|
|
555
|
+
return typeof error.message === "string" && namesDifferentUnsupportedField(error.message);
|
|
556
|
+
}
|
|
557
|
+
function isNonStreamField(field) {
|
|
558
|
+
const normalized = field.trim().toLowerCase();
|
|
559
|
+
return (normalized.length > 0 &&
|
|
560
|
+
!/^(?:stream[_ -]?options(?:\.[a-z][a-z0-9_]*)*|include[_ -]?usage)$/.test(normalized));
|
|
561
|
+
}
|
|
562
|
+
function namesDifferentUnsupportedField(message) {
|
|
563
|
+
const patterns = [
|
|
564
|
+
/\b([a-z][a-z0-9_]*)\s+(?:parameter|field)\s+(?:is\s+)?(?:unsupported|not supported|invalid|rejected)\b/g,
|
|
565
|
+
/\b(?:unsupported|unknown|unrecognized|invalid|rejected)\s+(?:parameter|field)\s*:\s*[`"']?([a-z][a-z0-9_]*)/g,
|
|
566
|
+
/\b(?:parameter|field)\s+[`"']([a-z][a-z0-9_]*)[`"']\s+(?:is\s+)?(?:unsupported|not supported|invalid|rejected)\b/g,
|
|
567
|
+
];
|
|
568
|
+
return patterns.some((pattern) => [...message.toLowerCase().matchAll(pattern)].some((match) => match[1] !== undefined && isNonStreamField(match[1])));
|
|
569
|
+
}
|
|
570
|
+
function isStructuredModelRefusal(payload) {
|
|
571
|
+
const error = isRecord(payload) && isRecord(payload.error) ? payload.error : payload;
|
|
572
|
+
if (!isRecord(error))
|
|
573
|
+
return false;
|
|
574
|
+
return [error.code, error.type].some((value) => typeof value === "string" && MODEL_REFUSAL_SIGNAL.test(value.toLowerCase()));
|
|
575
|
+
}
|
|
576
|
+
function isContentRefusalMessage(payload) {
|
|
577
|
+
const error = isRecord(payload) && isRecord(payload.error) ? payload.error : payload;
|
|
578
|
+
if (!isRecord(error) || typeof error.message !== "string")
|
|
579
|
+
return false;
|
|
580
|
+
// A refusal can quote the request field without rejecting that field's shape.
|
|
581
|
+
return /\bprompt\b|content[_ -]?filter|\bsafety\b|\brefus(?:al|ed|es|ing)\b/.test(error.message.toLowerCase());
|
|
582
|
+
}
|
|
583
|
+
function isStrictChatShapeRejection(status) {
|
|
584
|
+
return status === 400 || status === 422;
|
|
585
|
+
}
|
|
586
|
+
function shouldPreserveProviderRejection(status, payload) {
|
|
587
|
+
return (isContextOverflow(status, payload) ||
|
|
588
|
+
hasNonStreamErrorParameter(payload) ||
|
|
589
|
+
(isModelRefusal(payload) &&
|
|
590
|
+
(isStructuredModelRefusal(payload) || isContentRefusalMessage(payload))) ||
|
|
591
|
+
!isOptionalStreamFieldRejection(payload));
|
|
592
|
+
}
|
|
593
|
+
function remainingCompatibilityBudgetMs(bounds, startedAt, now, config, secrets) {
|
|
594
|
+
const budgetMs = (bounds?.budgetMs ?? config.timeoutMs) - Math.max(0, now() - startedAt);
|
|
595
|
+
if (budgetMs <= 0)
|
|
596
|
+
throw new TimeoutError(`provider retry budget expired for '${config.modelId}'`, secrets);
|
|
597
|
+
return budgetMs;
|
|
442
598
|
}
|
|
443
599
|
function mapHttpError(response, modelId, secrets, payload) {
|
|
444
600
|
mapProviderFailure(response.status, retryAfterMs(response), modelId, secrets, payload, false);
|
|
@@ -522,6 +678,7 @@ function newStreamAccumulator() {
|
|
|
522
678
|
content: "",
|
|
523
679
|
refusal: "",
|
|
524
680
|
finishReason: "stop",
|
|
681
|
+
sawFinishReason: false,
|
|
525
682
|
prompt: 0,
|
|
526
683
|
completion: 0,
|
|
527
684
|
usage: undefined,
|
|
@@ -582,8 +739,10 @@ function streamReadFields(read, report, outcome) {
|
|
|
582
739
|
// in-flight response accumulator, when present.
|
|
583
740
|
function applyChunkMetadata(chunk, acc) {
|
|
584
741
|
const finish = finishReasonFromChunk(chunk);
|
|
585
|
-
if (finish !== undefined)
|
|
742
|
+
if (finish !== undefined) {
|
|
586
743
|
acc.finishReason = finish;
|
|
744
|
+
acc.sawFinishReason = true;
|
|
745
|
+
}
|
|
587
746
|
const usage = usageFromChunk(chunk);
|
|
588
747
|
if (usage !== undefined && isRecord(chunk) && isRecord(chunk.usage)) {
|
|
589
748
|
acc.prompt = usage.prompt;
|
|
@@ -645,7 +804,7 @@ export class OpenAiAdapter {
|
|
|
645
804
|
}
|
|
646
805
|
const start = this.now();
|
|
647
806
|
const catalog = createGatewayToolCatalogBridge(request, this.now, this.log);
|
|
648
|
-
const dispatched = await this.
|
|
807
|
+
const dispatched = await this.dispatchCompatibleStream({ ...request, tools: catalog.tools.length === 0 ? undefined : catalog.tools }, config, secrets, bounds);
|
|
649
808
|
try {
|
|
650
809
|
const { response } = dispatched;
|
|
651
810
|
if (!response.ok) {
|
|
@@ -678,8 +837,11 @@ export class OpenAiAdapter {
|
|
|
678
837
|
const buffer = { pending: "" };
|
|
679
838
|
const activeSecrets = configuredSecrets(read.secrets);
|
|
680
839
|
const silenceMs = read.bounds?.silenceMs ?? STREAM_IDLE_TIMEOUT_MS;
|
|
840
|
+
const completion = { sawDone: false };
|
|
681
841
|
try {
|
|
682
|
-
for await (const chunk of readSseStream(response, undefined, silenceMs, read.signal)
|
|
842
|
+
for await (const chunk of readSseStream(response, undefined, silenceMs, read.signal, () => {
|
|
843
|
+
completion.sawDone = true;
|
|
844
|
+
})) {
|
|
683
845
|
recordDataEvent(report);
|
|
684
846
|
throwOnStreamedFailure(chunk, read.config.modelId, read.secrets);
|
|
685
847
|
const content = deltaFromChunk(chunk);
|
|
@@ -688,6 +850,10 @@ export class OpenAiAdapter {
|
|
|
688
850
|
}
|
|
689
851
|
applyChunkMetadata(chunk, acc);
|
|
690
852
|
}
|
|
853
|
+
// An explicit provider refusal must retain its refusal class even if the stream then closes.
|
|
854
|
+
if (!completion.sawDone && !acc.sawFinishReason && acc.refusal.length === 0) {
|
|
855
|
+
throw new ProviderError("provider stream ended without a terminal frame", PROVIDER_EMPTY_ASSISTANT_STATUS, read.secrets);
|
|
856
|
+
}
|
|
691
857
|
yield* flushPendingBuffer(buffer, read.secrets);
|
|
692
858
|
}
|
|
693
859
|
catch (error) {
|
|
@@ -801,23 +967,16 @@ export class OpenAiAdapter {
|
|
|
801
967
|
}
|
|
802
968
|
return new TransportError(`stream read failed for '${config.modelId}'`, secrets);
|
|
803
969
|
}
|
|
804
|
-
async dispatch(request, config, secrets, stream = false, bounds) {
|
|
970
|
+
async dispatch(request, config, secrets, stream = false, bounds, includeUsage = true) {
|
|
805
971
|
const url = chatCompletionsUrl(config);
|
|
806
|
-
const body = JSON.stringify(stream ? buildStreamBody(request, config) : buildBody(request, config));
|
|
972
|
+
const body = JSON.stringify(stream ? buildStreamBody(request, config, includeUsage) : buildBody(request, config));
|
|
807
973
|
const headers = {
|
|
808
974
|
"content-type": "application/json",
|
|
809
975
|
...apiKeyHeaders(config),
|
|
810
976
|
};
|
|
811
|
-
|
|
812
|
-
|
|
813
|
-
|
|
814
|
-
messageCount: request.messages.length,
|
|
815
|
-
bodyBytes: Buffer.byteLength(body, "utf8"),
|
|
816
|
-
timeoutMs: bounds?.silenceMs ?? config.timeoutMs,
|
|
817
|
-
stream,
|
|
818
|
-
...(bounds === undefined ? {} : { readBudgetMs: bounds.budgetMs }),
|
|
819
|
-
});
|
|
820
|
-
const deadline = requestDeadline(config.timeoutMs, bounds, request.cancellationSignal);
|
|
977
|
+
const readBounds = dispatchedReadBounds(stream, bounds);
|
|
978
|
+
logChatDispatch(this.log, chatDispatchFields(url, request, config, body, stream, includeUsage, readBounds));
|
|
979
|
+
const deadline = requestDeadline(config.timeoutMs, readBounds, request.cancellationSignal);
|
|
821
980
|
try {
|
|
822
981
|
const response = await gatewayFetch(url, {
|
|
823
982
|
method: "POST",
|
|
@@ -836,6 +995,82 @@ export class OpenAiAdapter {
|
|
|
836
995
|
throw this.mapDispatchError(error, config, deadline.signal, secrets);
|
|
837
996
|
}
|
|
838
997
|
}
|
|
998
|
+
async dispatchCompatibleStream(request, config, secrets, bounds) {
|
|
999
|
+
const url = chatCompletionsUrl(config);
|
|
1000
|
+
const startedAt = Date.now();
|
|
1001
|
+
const memoScope = this.deps.compatibilityMemoScope ?? config;
|
|
1002
|
+
const context = {
|
|
1003
|
+
request,
|
|
1004
|
+
config,
|
|
1005
|
+
secrets,
|
|
1006
|
+
bounds,
|
|
1007
|
+
startedAt,
|
|
1008
|
+
memoScope,
|
|
1009
|
+
url,
|
|
1010
|
+
};
|
|
1011
|
+
const mode = chatCompatibilityMode(memoScope, url, this.now);
|
|
1012
|
+
if (mode === "whole-body")
|
|
1013
|
+
return this.dispatch(request, config, secrets, false, bounds);
|
|
1014
|
+
const includeUsage = mode !== "omit-usage";
|
|
1015
|
+
const first = await this.dispatch(request, config, secrets, true, bounds, includeUsage);
|
|
1016
|
+
if (first.response.ok || !isStrictChatShapeRejection(first.response.status))
|
|
1017
|
+
return first;
|
|
1018
|
+
if (!includeUsage)
|
|
1019
|
+
return this.retryWithoutStreamingIfNamed(first, context);
|
|
1020
|
+
const retry = await this.retryWithoutUsage(first, context);
|
|
1021
|
+
if (retry.response.ok) {
|
|
1022
|
+
rememberChatCompatibility(memoScope, url, "omit-usage", this.now());
|
|
1023
|
+
return retry;
|
|
1024
|
+
}
|
|
1025
|
+
return this.retryWithoutStreamingIfNamed(retry, context);
|
|
1026
|
+
}
|
|
1027
|
+
async retryWithoutUsage(failed, context) {
|
|
1028
|
+
const { request, config, secrets, bounds, startedAt, url } = context;
|
|
1029
|
+
try {
|
|
1030
|
+
const payload = await this.readErrorBody(failed.response, config, secrets, failed.signal);
|
|
1031
|
+
if (shouldPreserveProviderRejection(failed.response.status, payload)) {
|
|
1032
|
+
mapHttpError(failed.response, config.modelId, secrets, payload);
|
|
1033
|
+
}
|
|
1034
|
+
}
|
|
1035
|
+
finally {
|
|
1036
|
+
failed.dispose();
|
|
1037
|
+
}
|
|
1038
|
+
const remainingMs = remainingCompatibilityBudgetMs(bounds, startedAt, Date.now, config, secrets);
|
|
1039
|
+
const retryBounds = bounds === undefined ? undefined : { ...bounds, budgetMs: remainingMs };
|
|
1040
|
+
const retryConfig = bounds === undefined ? { ...config, timeoutMs: remainingMs } : config;
|
|
1041
|
+
this.logChatCompatibilityRetry(url, config, failed.response.status, "stream_options");
|
|
1042
|
+
return this.dispatch(request, retryConfig, secrets, true, retryBounds, false);
|
|
1043
|
+
}
|
|
1044
|
+
async retryWithoutStreamingIfNamed(failed, context) {
|
|
1045
|
+
const { request, config, secrets, bounds, startedAt, memoScope, url } = context;
|
|
1046
|
+
if (!isStrictChatShapeRejection(failed.response.status))
|
|
1047
|
+
return failed;
|
|
1048
|
+
try {
|
|
1049
|
+
const payload = await this.readErrorBody(failed.response, config, secrets, failed.signal);
|
|
1050
|
+
if (shouldPreserveProviderRejection(failed.response.status, payload) ||
|
|
1051
|
+
!isNamedStreamFieldRejection(payload)) {
|
|
1052
|
+
mapHttpError(failed.response, config.modelId, secrets, payload);
|
|
1053
|
+
}
|
|
1054
|
+
}
|
|
1055
|
+
finally {
|
|
1056
|
+
failed.dispose();
|
|
1057
|
+
}
|
|
1058
|
+
const remainingMs = remainingCompatibilityBudgetMs(bounds, startedAt, Date.now, config, secrets);
|
|
1059
|
+
const retryBounds = bounds === undefined ? undefined : { ...bounds, budgetMs: remainingMs };
|
|
1060
|
+
const retryConfig = bounds === undefined ? { ...config, timeoutMs: remainingMs } : config;
|
|
1061
|
+
this.logChatCompatibilityRetry(url, config, failed.response.status, "stream");
|
|
1062
|
+
const retry = await this.dispatch(request, retryConfig, secrets, false, retryBounds);
|
|
1063
|
+
if (retry.response.ok)
|
|
1064
|
+
rememberChatCompatibility(memoScope, url, "whole-body", this.now());
|
|
1065
|
+
return retry;
|
|
1066
|
+
}
|
|
1067
|
+
logChatCompatibilityRetry(url, config, status, omittedField) {
|
|
1068
|
+
this.log.write(activityLogEvent(CHAT_REQUEST_COMPATIBILITY_RETRY_OPERATION, { level: "warn", status, correlationId: logCorrelationId(this.log) }, {
|
|
1069
|
+
endpointDigest: sha256Hex(logEndpointHost(url) ?? "invalid-endpoint"),
|
|
1070
|
+
modelId: logModelId(config.modelId),
|
|
1071
|
+
omittedField,
|
|
1072
|
+
}));
|
|
1073
|
+
}
|
|
839
1074
|
mapDispatchError(error, config, signal, secrets) {
|
|
840
1075
|
if (signal.aborted) {
|
|
841
1076
|
return requestAbortError(signal, config.modelId, secrets);
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { type ModelGatewayLogSink } from "./observability.js";
|
|
2
2
|
import type { CircuitBreakerConfig, CircuitBreakerStatus, Clock, ModelProviderConfig } from "./types.js";
|
|
3
|
+
export declare const CODING_WORKBENCH_PROVIDER_TIMEOUT_FLOOR_MS = 90000;
|
|
4
|
+
export declare function codingWorkbenchProviderTimeoutMs(timeoutMs: number): number;
|
|
3
5
|
export declare const systemClock: Clock;
|
|
4
6
|
export interface RetryConfig {
|
|
5
7
|
readonly maxRetries: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resilience.d.ts","sourceRoot":"","sources":["../src/resilience.ts"],"names":[],"mappings":"AAgBA,OAAO,EAOL,KAAK,mBAAmB,EACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EACV,oBAAoB,EACpB,oBAAoB,EAEpB,KAAK,EACL,mBAAmB,EACpB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"resilience.d.ts","sourceRoot":"","sources":["../src/resilience.ts"],"names":[],"mappings":"AAgBA,OAAO,EAOL,KAAK,mBAAmB,EACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EACV,oBAAoB,EACpB,oBAAoB,EAEpB,KAAK,EACL,mBAAmB,EACpB,MAAM,YAAY,CAAC;AAGpB,eAAO,MAAM,0CAA0C,QAAS,CAAC;AAEjE,wBAAgB,gCAAgC,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAE1E;AAyLD,eAAO,MAAM,WAAW,EAAE,KAkBzB,CAAC;AAEF,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAElC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAIxC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAChD;AA8GD,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,IAAI,CAAC,EAAE,mBAAmB,GAAG,SAAS,CAAC;IAChD,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7C;AAiBD,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,mBAAmB,CAQvE;AAuGD,wBAAsB,gBAAgB,CAAC,CAAC,EAGtC,SAAS,EAAE,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,EAChF,MAAM,EAAE,WAAW,EACnB,KAAK,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,WAAW,EACpB,MAAM,GAAE,MAAM,MAAoB,EAClC,UAAU,GAAE,eAAoB,GAC/B,OAAO,CAAC,CAAC,CAAC,CAkCZ;AAGD,KAAK,mBAAmB,GAAG,IAAI,CAC7B,mBAAmB,EACnB,WAAW,GAAG,YAAY,GAAG,kBAAkB,CAChD,CAAC;AAUF,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,MAAM,CAM7E;AAID,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,mBAAmB,GAAG,WAAW,CAO9E;AAED,qBAAa,cAAc;IAYvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAdtB,OAAO,CAAC,KAAK,CAA0B;IACvC,OAAO,CAAC,mBAAmB,CAAK;IAChC,OAAO,CAAC,QAAQ,CAAuB;IACvC,OAAO,CAAC,eAAe,CAAK;IAE5B,OAAO,CAAC,cAAc,CAAK;IAG3B,OAAO,CAAC,uBAAuB,CAAK;IAEpC,YACmB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,KAAK,EACZ,GAAG,GAAE,mBAA6C,EACjE;IAeJ,OAAO,CAAC,aAAa;IA6BrB,OAAO,CAAC,iBAAiB;IAWzB,aAAa,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAO1C;IAED,OAAO,CAAC,qBAAqB;IAyB7B,OAAO,CAAC,kBAAkB;IAQ1B,aAAa,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAU1C;IAED,aAAa,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAU1C;IAED,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,oBAAoB,CAO5C;IAMD,OAAO,CAAC,IAAI;IAyBZ,OAAO,CAAC,KAAK;CAsBd"}
|
|
@@ -6,6 +6,10 @@ import { activityLogEvent, defineActivityLogOperation, } from "@oscharko-dev/kei
|
|
|
6
6
|
import { MAX_TIMER_DELAY_MS } from "./config.js";
|
|
7
7
|
import { activityLogErrorKind, logLevelEnabled, logModelId, logTimer, nullModelGatewayLogSink, resolveLogSink, } from "./observability.js";
|
|
8
8
|
const MAX_BACKOFF_MS = 30_000;
|
|
9
|
+
export const CODING_WORKBENCH_PROVIDER_TIMEOUT_FLOOR_MS = 90_000;
|
|
10
|
+
export function codingWorkbenchProviderTimeoutMs(timeoutMs) {
|
|
11
|
+
return Math.max(timeoutMs, CODING_WORKBENCH_PROVIDER_TIMEOUT_FLOOR_MS);
|
|
12
|
+
}
|
|
9
13
|
const GATEWAY_RETRY_BUDGET_EXHAUSTED_OPERATION = defineActivityLogOperation({
|
|
10
14
|
contractKind: "activity-log-operation",
|
|
11
15
|
schemaVersion: 1,
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const KEIKO_MODEL_GATEWAY_VERSION: "1.1.
|
|
1
|
+
export declare const KEIKO_MODEL_GATEWAY_VERSION: "1.1.6";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
// Package version constant. Pinned at the workspace package's package.json version. Promoted to
|
|
2
2
|
// a `const` string-literal type so downstream tests/assertions stay byte-exact.
|
|
3
|
-
export const KEIKO_MODEL_GATEWAY_VERSION = "1.1.
|
|
3
|
+
export const KEIKO_MODEL_GATEWAY_VERSION = "1.1.6";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oscharko-dev/keiko-model-gateway",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.6",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"description": "Internal workspace package: Keiko model gateway — provider abstraction, OpenAI-compatible adapter, capability registry, routing, resilience, TLS handling. Not published independently.",
|
|
@@ -33,8 +33,8 @@
|
|
|
33
33
|
},
|
|
34
34
|
"private": true,
|
|
35
35
|
"peerDependencies": {
|
|
36
|
-
"@oscharko-dev/keiko-contracts": "1.1.
|
|
37
|
-
"@oscharko-dev/keiko-security": "1.1.
|
|
38
|
-
"@oscharko-dev/keiko-tool-catalog": "1.1.
|
|
36
|
+
"@oscharko-dev/keiko-contracts": "1.1.6",
|
|
37
|
+
"@oscharko-dev/keiko-security": "1.1.6",
|
|
38
|
+
"@oscharko-dev/keiko-tool-catalog": "1.1.6"
|
|
39
39
|
}
|
|
40
40
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oscharko-dev/keiko-quality-intelligence",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.6",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"description": "Internal workspace package: pure-domain Keiko Quality Intelligence test-design logic. Not published independently.",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
},
|
|
22
22
|
"private": true,
|
|
23
23
|
"peerDependencies": {
|
|
24
|
-
"@oscharko-dev/keiko-contracts": "1.1.
|
|
25
|
-
"@oscharko-dev/keiko-security": "1.1.
|
|
24
|
+
"@oscharko-dev/keiko-contracts": "1.1.6",
|
|
25
|
+
"@oscharko-dev/keiko-security": "1.1.6"
|
|
26
26
|
}
|
|
27
27
|
}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
export interface AttestedDarwinGitExecutable {
|
|
2
2
|
readonly path: string;
|
|
3
3
|
readonly sha256: string;
|
|
4
|
+
readonly source?: "selected" | "command-line-tools";
|
|
4
5
|
}
|
|
5
6
|
/** Attests the exact developer-tool Git path before it enters a Seatbelt allowlist. */
|
|
6
7
|
export declare function attestDarwinGitExecutable(candidate: string): AttestedDarwinGitExecutable;
|
|
8
|
+
/** Chooses the selected Git only when trusted; the fixed Apple CLT root is the sole fallback. */
|
|
9
|
+
export declare function chooseAttestedDarwinGit(resolvePath: (developerDirectory?: string) => string, attest: (path: string) => AttestedDarwinGitExecutable): AttestedDarwinGitExecutable;
|
|
7
10
|
/** Resolves Git through Apple's protected launcher without inheriting a caller-selected toolchain. */
|
|
8
11
|
export declare function resolveDarwinGitExecutable(): AttestedDarwinGitExecutable;
|
|
9
12
|
//# sourceMappingURL=darwin-git.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"darwin-git.d.ts","sourceRoot":"","sources":["../src/darwin-git.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"darwin-git.d.ts","sourceRoot":"","sources":["../src/darwin-git.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,oBAAoB,CAAC;CACrD;AA4BD,uFAAuF;AACvF,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,2BAA2B,CA2BxF;AAmBD,iGAAiG;AACjG,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,CAAC,kBAAkB,CAAC,EAAE,MAAM,KAAK,MAAM,EACpD,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,2BAA2B,GACpD,2BAA2B,CAc7B;AAED,sGAAsG;AACtG,wBAAgB,0BAA0B,IAAI,2BAA2B,CAGxE"}
|
|
@@ -51,12 +51,13 @@ export function attestDarwinGitExecutable(candidate) {
|
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
/** Resolves Git through Apple's protected launcher without inheriting a caller-selected toolchain. */
|
|
54
|
-
|
|
55
|
-
const
|
|
56
|
-
attestDarwinGitExecutable(xcrun);
|
|
57
|
-
const resolved = spawnSync(xcrun, ["--find", "git"], {
|
|
54
|
+
function resolveGitPath(developerDirectory) {
|
|
55
|
+
const resolved = spawnSync("/usr/bin/xcrun", ["--find", "git"], {
|
|
58
56
|
encoding: "utf8",
|
|
59
|
-
env: {
|
|
57
|
+
env: {
|
|
58
|
+
PATH: "/usr/bin:/bin",
|
|
59
|
+
...(developerDirectory === undefined ? {} : { DEVELOPER_DIR: developerDirectory }),
|
|
60
|
+
},
|
|
60
61
|
shell: false,
|
|
61
62
|
timeout: 10_000,
|
|
62
63
|
});
|
|
@@ -65,5 +66,28 @@ export function resolveDarwinGitExecutable() {
|
|
|
65
66
|
const path = resolved.stdout.trim();
|
|
66
67
|
if (path.includes("\n") || path.includes("\r"))
|
|
67
68
|
return untrustedGit();
|
|
68
|
-
return
|
|
69
|
+
return path;
|
|
70
|
+
}
|
|
71
|
+
/** Chooses the selected Git only when trusted; the fixed Apple CLT root is the sole fallback. */
|
|
72
|
+
export function chooseAttestedDarwinGit(resolvePath, attest) {
|
|
73
|
+
const attestResolvedPath = (developerDirectory) => {
|
|
74
|
+
const path = resolvePath(developerDirectory);
|
|
75
|
+
if (path.trim().length === 0)
|
|
76
|
+
return untrustedGit();
|
|
77
|
+
return attest(path);
|
|
78
|
+
};
|
|
79
|
+
try {
|
|
80
|
+
return Object.freeze({ ...attestResolvedPath(), source: "selected" });
|
|
81
|
+
}
|
|
82
|
+
catch {
|
|
83
|
+
return Object.freeze({
|
|
84
|
+
...attestResolvedPath("/Library/Developer/CommandLineTools"),
|
|
85
|
+
source: "command-line-tools",
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
/** Resolves Git through Apple's protected launcher without inheriting a caller-selected toolchain. */
|
|
90
|
+
export function resolveDarwinGitExecutable() {
|
|
91
|
+
attestDarwinGitExecutable("/usr/bin/xcrun");
|
|
92
|
+
return chooseAttestedDarwinGit(resolveGitPath, attestDarwinGitExecutable);
|
|
69
93
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oscharko-dev/keiko-sandbox",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.6",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"description": "Internal sandbox package: reusable OS/container egress isolation and gateway-only Linux namespace confinement (ADR-0043). Owns backend selection, wrapper construction, attestation, availability probes, and the internal Linux namespace/descriptor-relay launcher. Not published independently.",
|
|
@@ -21,6 +21,6 @@
|
|
|
21
21
|
},
|
|
22
22
|
"private": true,
|
|
23
23
|
"peerDependencies": {
|
|
24
|
-
"@oscharko-dev/keiko-contracts": "1.1.
|
|
24
|
+
"@oscharko-dev/keiko-contracts": "1.1.6"
|
|
25
25
|
}
|
|
26
26
|
}
|