forked from bai/curriculum-project-hub
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f3b087371a |
@@ -1,152 +0,0 @@
|
|||||||
# ADR 0027: External Capability Registry
|
|
||||||
|
|
||||||
## Status
|
|
||||||
|
|
||||||
Accepted.
|
|
||||||
|
|
||||||
## Context
|
|
||||||
|
|
||||||
ADR-0026 introduced the `UsageFact` ledger with a `kind = external_capability`
|
|
||||||
fact and a `capabilityId` field, but deferred the capability registry itself.
|
|
||||||
Two concrete needs now force the issue:
|
|
||||||
|
|
||||||
- **PDF→Markdown bundle** conversion (and, imminently, audio/video→text)
|
|
||||||
must run as a side effect of an `AgentRun`, bill in non-token units
|
|
||||||
(pages, seconds), use a different provider than the model loop, and report
|
|
||||||
cost through a different channel. It is not a sub-run (ADR-0026 rejected
|
|
||||||
that) and not a model-provider call (it does not speak the Anthropic/
|
|
||||||
OpenRouter protocol).
|
|
||||||
- The Agent already has a Bash tool. Without a first-class capability seam,
|
|
||||||
the path of least resistance is for the agent to shell out to ad-hoc
|
|
||||||
scripts that embed API keys, write to arbitrary paths, and report nothing
|
|
||||||
to the ledger. That is exactly the unattributed, uncontained external
|
|
||||||
consumption ADR-0022/0026 exist to prevent.
|
|
||||||
|
|
||||||
The model-provider connection (`OrganizationProviderConnection`, ADR-0024)
|
|
||||||
is the wrong seam for these services:
|
|
||||||
|
|
||||||
- Its payload schema (`baseUrl` + `authToken` + `anthropicApiKey`) and
|
|
||||||
readiness probe (`/v1/models?supported_parameters=tools`) are specific to
|
|
||||||
OpenRouter/Anthropic. MinerU, Whisper, and future OCR/ASR services have
|
|
||||||
different auth shapes (an API token, optionally a project id) and no
|
|
||||||
`/v1/models` endpoint.
|
|
||||||
- Its uniqueness key is `(organizationId, providerId)` where `providerId`
|
|
||||||
is an OpenRouter-style model-routing id. A capability provider id
|
|
||||||
(`mineru`) names a *service*, not a model.
|
|
||||||
- Coupling capability credentials into the model-provider table would force
|
|
||||||
every capability's auth shape through `ProviderSecretPayloadV1` and every
|
|
||||||
readiness probe through `probeOpenRouterCredential`.
|
|
||||||
|
|
||||||
The Feishu Application Connection (`OrganizationFeishuApplicationConnection`)
|
|
||||||
is the right structural precedent: it reuses the ADR-0024 envelope (KEK →
|
|
||||||
DEK → AES-256-GCM, AAD-bound to purpose/org/connection/version) but has its
|
|
||||||
own connection table, its own payload schema, its own readiness probe, and
|
|
||||||
its own per-org uniqueness. Capability connections follow the same pattern.
|
|
||||||
|
|
||||||
## Decision
|
|
||||||
|
|
||||||
### External Capability
|
|
||||||
|
|
||||||
An **External Capability** is a platform-registered, org-enabled document or
|
|
||||||
media transform service invoked as a side effect of an `AgentRun`. It is
|
|
||||||
identified by a stable `capabilityId` (e.g. `pdf_to_md_bundle`,
|
|
||||||
`audio_video_to_text`). A capability:
|
|
||||||
|
|
||||||
- Has an **input kind** (PDF, image, audio, video, …) and an **output
|
|
||||||
contract** (markdown bundle with extracted images, transcript text, …).
|
|
||||||
- Bills in **non-token units** (pages, audio-seconds) recorded on a
|
|
||||||
`UsageFact` with `kind = external_capability`, or in tokens when the
|
|
||||||
backing service reports them.
|
|
||||||
- Writes its output **into the invoking run's workspace** (ADR-0018
|
|
||||||
`AgentSurface` — no escapes).
|
|
||||||
- Is invoked through a **capability adapter** in Hub, never by the Agent
|
|
||||||
shelling out with embedded credentials.
|
|
||||||
|
|
||||||
### Capability Connection
|
|
||||||
|
|
||||||
Credentials for a capability live in an **`OrganizationCapabilityConnection`**,
|
|
||||||
structurally identical to the Feishu Application Connection:
|
|
||||||
|
|
||||||
- Belongs to exactly one Organization.
|
|
||||||
- Unique by `(organizationId, capabilityId)`.
|
|
||||||
- `DRAFT` / `ACTIVE` / `DISABLED`; resolution accepts only `ACTIVE` with a
|
|
||||||
valid active secret version.
|
|
||||||
- Secret material is an immutable, AAD-bound, KEK-wrapped envelope version
|
|
||||||
(`CapabilityCredentialVersion`), reusing the ADR-0024 encryption
|
|
||||||
machinery with `purpose = "capability"`.
|
|
||||||
- Its payload schema is capability-specific (`CapabilitySecretPayloadV1`:
|
|
||||||
`baseUrl`, `apiToken`, optional `projectId`). New capability types extend
|
|
||||||
the payload, not the connection table.
|
|
||||||
- A capability-specific **readiness probe** validates the credential before
|
|
||||||
activation (e.g. MinerU: a trivial authenticated GET). The probe is
|
|
||||||
injectable, matching the Feishu/provider pattern, so tests never hit the
|
|
||||||
network.
|
|
||||||
|
|
||||||
### Capability Adapter
|
|
||||||
|
|
||||||
The adapter is the seam between the Agent and the external service. It:
|
|
||||||
|
|
||||||
- Resolves the org's active capability connection (fail-closed, no
|
|
||||||
process-global fallback — ADR-0024).
|
|
||||||
- Accepts a workspace-relative input path and an output directory.
|
|
||||||
- Calls the backing service (MinerU, Whisper, …) via an injectable
|
|
||||||
`Client` interface so the real HTTP client is swappable and mockable.
|
|
||||||
- Writes the produced markdown + image assets into the run's workspace.
|
|
||||||
- Writes one `UsageFact` (or more, if the service reports per-stage
|
|
||||||
consumption) with `kind = external_capability`, `capabilityId`,
|
|
||||||
`provider` (the service id), `quantity + unit` (pages / seconds), and
|
|
||||||
`costUsd + costSource = provider_reported` when the service reports cost.
|
|
||||||
|
|
||||||
### Registry
|
|
||||||
|
|
||||||
The platform maintains a **registry** of known capabilities: their id,
|
|
||||||
input kind, output contract, metering unit, and adapter. This is
|
|
||||||
code-level registration (like `ToolRegistry`), not a database table — a
|
|
||||||
capability is available to an Organization only when (a) the platform
|
|
||||||
knows the adapter and (b) the Organization has an `ACTIVE` connection for
|
|
||||||
it. Both gates are required.
|
|
||||||
|
|
||||||
### What is NOT in this ADR
|
|
||||||
|
|
||||||
- The capability invocation is **not** a first-class persisted record
|
|
||||||
(`CapabilityInvocation` table) in this ADR. The `UsageFact` row with
|
|
||||||
`capabilityId` + `correlationId` is the durable trace. If we later need
|
|
||||||
a richer invocation log (retries, partial output, multi-stage status),
|
|
||||||
that is a follow-up; for now the fact is enough.
|
|
||||||
- **Pricebook** remains deferred (ADR-0026). Capability facts use
|
|
||||||
`provider_reported` when the service returns cost; otherwise `unknown`.
|
|
||||||
- **Org-scoped enable/disable policy** beyond connection status is
|
|
||||||
deferred. An org with an `ACTIVE` connection has the capability; one
|
|
||||||
without does not. A finer "enabled but no credential" toggle is not
|
|
||||||
needed yet.
|
|
||||||
- **Agent-facing tool exposure** (how the Agent discovers and calls the
|
|
||||||
capability — MCP tool, Bash wrapper, or built-in) is an implementation
|
|
||||||
detail of the adapter wiring, not a contract concern. The contract pins
|
|
||||||
that the Agent never receives the capability credential.
|
|
||||||
|
|
||||||
## Consequences
|
|
||||||
|
|
||||||
- Adding a new external capability (e.g. `image_ocr`) is: register an
|
|
||||||
adapter, add a `capabilityId` constant, optionally extend the secret
|
|
||||||
payload — no schema change to `UsageFact` or `AgentRun`.
|
|
||||||
- The model-provider connection table stays focused on model routing;
|
|
||||||
capability credentials do not pollute its payload or readiness probe.
|
|
||||||
- Three connection types now share the ADR-0024 envelope: model-provider,
|
|
||||||
Feishu application, and capability. Each has its own table, payload
|
|
||||||
schema, and probe, but the same encryption, rotation, and resolver
|
|
||||||
boundary.
|
|
||||||
- The Agent's Bash tool remains available, but the intended path for
|
|
||||||
document/media transforms is the capability adapter. Whether to narrow
|
|
||||||
Bash for capability-shaped tasks is an operational policy decision,
|
|
||||||
not a contract one.
|
|
||||||
- Tests prove: workspace containment of capability output, fail-closed
|
|
||||||
credential resolution, `UsageFact` attribution with non-token metering,
|
|
||||||
and that the Agent process never receives the capability credential.
|
|
||||||
|
|
||||||
## Deferred
|
|
||||||
|
|
||||||
- `CapabilityInvocation` as a first-class durable record (status, retries,
|
|
||||||
partial output) — currently the `UsageFact` row is the only trace.
|
|
||||||
- Pricebook derivation for capability costs (ADR-0026 deferred).
|
|
||||||
- Org-scoped capability enable/disable policy finer than connection status.
|
|
||||||
- Agent-facing tool discovery (MCP vs built-in) for capabilities.
|
|
||||||
Generated
+1
-349
@@ -8,9 +8,6 @@
|
|||||||
"name": "@paradigm/hub",
|
"name": "@paradigm/hub",
|
||||||
"version": "0.0.31",
|
"version": "0.0.31",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@alicloud/credentials": "^2.4.5",
|
|
||||||
"@alicloud/docmind-api20220711": "^1.4.15",
|
|
||||||
"@alicloud/tea-util": "^1.4.11",
|
|
||||||
"@anthropic-ai/claude-agent-sdk": "^0.3.202",
|
"@anthropic-ai/claude-agent-sdk": "^0.3.202",
|
||||||
"@fastify/cookie": "^11.0.2",
|
"@fastify/cookie": "^11.0.2",
|
||||||
"@larksuiteoapi/node-sdk": "^1.70.0",
|
"@larksuiteoapi/node-sdk": "^1.70.0",
|
||||||
@@ -77,175 +74,6 @@
|
|||||||
"zod": "^3.25.76 || ^4.1.8"
|
"zod": "^3.25.76 || ^4.1.8"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@alicloud/credentials": {
|
|
||||||
"version": "2.4.5",
|
|
||||||
"resolved": "https://registry.npmjs.org/@alicloud/credentials/-/credentials-2.4.5.tgz",
|
|
||||||
"integrity": "sha512-od1ufCxOO7cP2R4EVFliOB0kGo9lUXCibyj/mzmI6yLhxeqhqsegTzVsx5p2NJJsceKJnYcmye7FWKyLJAFBkw==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"@alicloud/tea-typescript": "^1.8.0",
|
|
||||||
"httpx": "^2.3.3",
|
|
||||||
"ini": "^1.3.5",
|
|
||||||
"kitx": "^2.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@alicloud/darabonba-array": {
|
|
||||||
"version": "0.1.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@alicloud/darabonba-array/-/darabonba-array-0.1.2.tgz",
|
|
||||||
"integrity": "sha512-ZPuQ+bJyjrd8XVVm55kl+ypk7OQoi1ZH/DiToaAEQaGvgEjrTcvQkg71//vUX/6cvbLIF5piQDvhrLb+lUEIPQ==",
|
|
||||||
"license": "ISC",
|
|
||||||
"dependencies": {
|
|
||||||
"@alicloud/tea-typescript": "^1.7.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@alicloud/darabonba-encode-util": {
|
|
||||||
"version": "0.0.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@alicloud/darabonba-encode-util/-/darabonba-encode-util-0.0.2.tgz",
|
|
||||||
"integrity": "sha512-mlsNctkeqmR0RtgE1Rngyeadi5snLOAHBCWEtYf68d7tyKskosXDTNeZ6VCD/UfrUu4N51ItO8zlpfXiOgeg3A==",
|
|
||||||
"license": "ISC",
|
|
||||||
"dependencies": {
|
|
||||||
"moment": "^2.29.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@alicloud/darabonba-map": {
|
|
||||||
"version": "0.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/@alicloud/darabonba-map/-/darabonba-map-0.0.1.tgz",
|
|
||||||
"integrity": "sha512-2ep+G3YDvuI+dRYVlmER1LVUQDhf9kEItmVB/bbEu1pgKzelcocCwAc79XZQjTcQGFgjDycf3vH87WLDGLFMlw==",
|
|
||||||
"license": "ISC",
|
|
||||||
"dependencies": {
|
|
||||||
"@alicloud/tea-typescript": "^1.7.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@alicloud/darabonba-signature-util": {
|
|
||||||
"version": "0.0.4",
|
|
||||||
"resolved": "https://registry.npmjs.org/@alicloud/darabonba-signature-util/-/darabonba-signature-util-0.0.4.tgz",
|
|
||||||
"integrity": "sha512-I1TtwtAnzLamgqnAaOkN0IGjwkiti//0a7/auyVThdqiC/3kyafSAn6znysWOmzub4mrzac2WiqblZKFcN5NWg==",
|
|
||||||
"license": "ISC",
|
|
||||||
"dependencies": {
|
|
||||||
"@alicloud/darabonba-encode-util": "^0.0.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@alicloud/darabonba-signature-util/node_modules/@alicloud/darabonba-encode-util": {
|
|
||||||
"version": "0.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/@alicloud/darabonba-encode-util/-/darabonba-encode-util-0.0.1.tgz",
|
|
||||||
"integrity": "sha512-Sl5vCRVAYMqwmvXpJLM9hYoCHOMsQlGxaWSGhGWulpKk/NaUBArtoO1B0yHruJf1C5uHhEJIaylYcM48icFHgw==",
|
|
||||||
"license": "ISC",
|
|
||||||
"dependencies": {
|
|
||||||
"@alicloud/tea-typescript": "^1.7.1",
|
|
||||||
"moment": "^2.29.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@alicloud/darabonba-string": {
|
|
||||||
"version": "1.0.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/@alicloud/darabonba-string/-/darabonba-string-1.0.3.tgz",
|
|
||||||
"integrity": "sha512-NyWwrU8cAIesWk3uHL1Q7pTDTqLkCI/0PmJXC4/4A0MFNAZ9Ouq0iFBsRqvfyUujSSM+WhYLuTfakQXiVLkTMA==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"dependencies": {
|
|
||||||
"@alicloud/tea-typescript": "^1.5.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@alicloud/docmind-api20220711": {
|
|
||||||
"version": "1.4.15",
|
|
||||||
"resolved": "https://registry.npmjs.org/@alicloud/docmind-api20220711/-/docmind-api20220711-1.4.15.tgz",
|
|
||||||
"integrity": "sha512-QmjSDPV52d2B5bd/Dk3Zeofu+cJFPKYS+MphIHqlulfYsOynLgOaDqTRMGTK/RhcmVCwG14CyZ/15GBF00GRFw==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"dependencies": {
|
|
||||||
"@alicloud/credentials": "^2.4.2",
|
|
||||||
"@alicloud/openapi-core": "^1.0.0",
|
|
||||||
"@darabonba/typescript": "^1.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@alicloud/endpoint-util": {
|
|
||||||
"version": "0.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/@alicloud/endpoint-util/-/endpoint-util-0.0.1.tgz",
|
|
||||||
"integrity": "sha512-+pH7/KEXup84cHzIL6UJAaPqETvln4yXlD9JzlrqioyCSaWxbug5FUobsiI6fuUOpw5WwoB3fWAtGbFnJ1K3Yg==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"dependencies": {
|
|
||||||
"@alicloud/tea-typescript": "^1.5.1",
|
|
||||||
"kitx": "^2.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@alicloud/gateway-pop": {
|
|
||||||
"version": "0.0.6",
|
|
||||||
"resolved": "https://registry.npmjs.org/@alicloud/gateway-pop/-/gateway-pop-0.0.6.tgz",
|
|
||||||
"integrity": "sha512-KF4I+JvfYuLKc3fWeWYIZ7lOVJ9jRW0sQXdXidZn1DKZ978ncfGf7i0LBfONGk4OxvNb/HD3/0yYhkgZgPbKtA==",
|
|
||||||
"license": "ISC",
|
|
||||||
"dependencies": {
|
|
||||||
"@alicloud/credentials": "^2",
|
|
||||||
"@alicloud/darabonba-array": "^0.1.0",
|
|
||||||
"@alicloud/darabonba-encode-util": "^0.0.2",
|
|
||||||
"@alicloud/darabonba-map": "^0.0.1",
|
|
||||||
"@alicloud/darabonba-signature-util": "^0.0.4",
|
|
||||||
"@alicloud/darabonba-string": "^1.0.2",
|
|
||||||
"@alicloud/endpoint-util": "^0.0.1",
|
|
||||||
"@alicloud/gateway-spi": "^0.0.8",
|
|
||||||
"@alicloud/openapi-util": "^0.3.2",
|
|
||||||
"@alicloud/tea-typescript": "^1.7.1",
|
|
||||||
"@alicloud/tea-util": "^1.4.8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@alicloud/gateway-spi": {
|
|
||||||
"version": "0.0.8",
|
|
||||||
"resolved": "https://registry.npmjs.org/@alicloud/gateway-spi/-/gateway-spi-0.0.8.tgz",
|
|
||||||
"integrity": "sha512-KM7fu5asjxZPmrz9sJGHJeSU+cNQNOxW+SFmgmAIrITui5hXL2LB+KNRuzWmlwPjnuA2X3/keq9h6++S9jcV5g==",
|
|
||||||
"license": "ISC",
|
|
||||||
"dependencies": {
|
|
||||||
"@alicloud/credentials": "^2",
|
|
||||||
"@alicloud/tea-typescript": "^1.7.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@alicloud/openapi-core": {
|
|
||||||
"version": "1.0.8",
|
|
||||||
"resolved": "https://registry.npmjs.org/@alicloud/openapi-core/-/openapi-core-1.0.8.tgz",
|
|
||||||
"integrity": "sha512-xs8LdgMDcEUqv13kZ4nl+Vd+Fc1mixTF0g1lm5QSrNWDaLUUD5vqpuMtvUZnKNnq9PITfUQ+8KunAvNQJpFo8g==",
|
|
||||||
"hasInstallScript": true,
|
|
||||||
"license": "ISC",
|
|
||||||
"dependencies": {
|
|
||||||
"@alicloud/credentials": "^2.4.2",
|
|
||||||
"@alicloud/gateway-pop": "0.0.6",
|
|
||||||
"@alicloud/gateway-spi": "^0.0.8",
|
|
||||||
"@darabonba/typescript": "^1.0.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@alicloud/openapi-util": {
|
|
||||||
"version": "0.3.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/@alicloud/openapi-util/-/openapi-util-0.3.3.tgz",
|
|
||||||
"integrity": "sha512-vf0cQ/q8R2U7ZO88X5hDiu1yV3t/WexRj+YycWxRutkH/xVXfkmpRgps8lmNEk7Ar+0xnY8+daN2T+2OyB9F4A==",
|
|
||||||
"license": "ISC",
|
|
||||||
"dependencies": {
|
|
||||||
"@alicloud/tea-typescript": "^1.7.1",
|
|
||||||
"@alicloud/tea-util": "^1.3.0",
|
|
||||||
"kitx": "^2.1.0",
|
|
||||||
"sm3": "^1.0.3"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@alicloud/tea-typescript": {
|
|
||||||
"version": "1.8.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@alicloud/tea-typescript/-/tea-typescript-1.8.0.tgz",
|
|
||||||
"integrity": "sha512-CWXWaquauJf0sW30mgJRVu9aaXyBth5uMBCUc+5vKTK1zlgf3hIqRUjJZbjlwHwQ5y9anwcu18r48nOZb7l2QQ==",
|
|
||||||
"license": "ISC",
|
|
||||||
"dependencies": {
|
|
||||||
"@types/node": "^12.0.2",
|
|
||||||
"httpx": "^2.2.6"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@alicloud/tea-typescript/node_modules/@types/node": {
|
|
||||||
"version": "12.20.55",
|
|
||||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz",
|
|
||||||
"integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==",
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/@alicloud/tea-util": {
|
|
||||||
"version": "1.4.11",
|
|
||||||
"resolved": "https://registry.npmjs.org/@alicloud/tea-util/-/tea-util-1.4.11.tgz",
|
|
||||||
"integrity": "sha512-HyPEEQ8F0WoZegiCp7sVdrdm6eBOB+GCvGl4182u69LDFktxfirGLcAx3WExUr1zFWkq2OSmBroTwKQ4w/+Yww==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"dependencies": {
|
|
||||||
"@alicloud/tea-typescript": "^1.5.1",
|
|
||||||
"@darabonba/typescript": "^1.0.0",
|
|
||||||
"kitx": "^2.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@anthropic-ai/claude-agent-sdk": {
|
"node_modules/@anthropic-ai/claude-agent-sdk": {
|
||||||
"version": "0.3.202",
|
"version": "0.3.202",
|
||||||
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk/-/claude-agent-sdk-0.3.202.tgz",
|
"resolved": "https://registry.npmjs.org/@anthropic-ai/claude-agent-sdk/-/claude-agent-sdk-0.3.202.tgz",
|
||||||
@@ -406,24 +234,6 @@
|
|||||||
"node": ">=6.9.0"
|
"node": ">=6.9.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@darabonba/typescript": {
|
|
||||||
"version": "1.0.5",
|
|
||||||
"resolved": "https://registry.npmjs.org/@darabonba/typescript/-/typescript-1.0.5.tgz",
|
|
||||||
"integrity": "sha512-pfxHFVM8I3h8K2o8skpDQLMmR5iAeQ2eNpP1HrKDEm/9ZPF8aKwDKPwwEszT1NnIo0Y3++E7x1YsVkVpGjA/xw==",
|
|
||||||
"license": "Apache License 2.0",
|
|
||||||
"dependencies": {
|
|
||||||
"@alicloud/tea-typescript": "^1.5.1",
|
|
||||||
"http-proxy-agent": "^5.0.0",
|
|
||||||
"https-proxy-agent": "^5.0.1",
|
|
||||||
"httpx": "^2.3.2",
|
|
||||||
"lodash": "^4.17.21",
|
|
||||||
"moment": "^2.30.1",
|
|
||||||
"moment-timezone": "^0.5.45",
|
|
||||||
"socks-proxy-agent": "^6.2.1",
|
|
||||||
"ws": "^8.18.0",
|
|
||||||
"xml2js": "^0.6.2"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@emnapi/core": {
|
"node_modules/@emnapi/core": {
|
||||||
"version": "1.11.2",
|
"version": "1.11.2",
|
||||||
"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.2.tgz",
|
"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.2.tgz",
|
||||||
@@ -1586,15 +1396,6 @@
|
|||||||
"integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
|
"integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/@tootallnate/once": {
|
|
||||||
"version": "2.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.1.tgz",
|
|
||||||
"integrity": "sha512-HqmEUIGRJ5fSXchkVgR5F7qn48bDBzv0kWj/Kfu5e6uci4UlEeng4331LnBkWffb++Ei3FOVLxo8JJWMFBDMeQ==",
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 10"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@tybys/wasm-util": {
|
"node_modules/@tybys/wasm-util": {
|
||||||
"version": "0.10.3",
|
"version": "0.10.3",
|
||||||
"resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.3.tgz",
|
"resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.3.tgz",
|
||||||
@@ -3029,20 +2830,6 @@
|
|||||||
"url": "https://opencollective.com/express"
|
"url": "https://opencollective.com/express"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/http-proxy-agent": {
|
|
||||||
"version": "5.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
|
|
||||||
"integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"@tootallnate/once": "2",
|
|
||||||
"agent-base": "6",
|
|
||||||
"debug": "4"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 6"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/https-proxy-agent": {
|
"node_modules/https-proxy-agent": {
|
||||||
"version": "5.0.1",
|
"version": "5.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
|
||||||
@@ -3056,25 +2843,6 @@
|
|||||||
"node": ">= 6"
|
"node": ">= 6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/httpx": {
|
|
||||||
"version": "2.3.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/httpx/-/httpx-2.3.3.tgz",
|
|
||||||
"integrity": "sha512-k1qv94u1b6e+XKCxVbLgYlOypVP9MPGpnN5G/vxFf6tDO4V3xpz3d6FUOY/s8NtPgaq5RBVVgSB+7IHpVxMYzw==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"@types/node": "^20",
|
|
||||||
"debug": "^4.1.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/httpx/node_modules/@types/node": {
|
|
||||||
"version": "20.19.43",
|
|
||||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.43.tgz",
|
|
||||||
"integrity": "sha512-6oYBAi5ikg4Pl+kGsoYtawUMBT2zZMCvPNF7pVLnHZfd1zf38DRiWn/gT01RYCdUqkv7Fhr+C9ot4/tb+2sVvA==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"undici-types": "~6.21.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/iconv-lite": {
|
"node_modules/iconv-lite": {
|
||||||
"version": "0.7.3",
|
"version": "0.7.3",
|
||||||
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.3.tgz",
|
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.3.tgz",
|
||||||
@@ -3099,17 +2867,12 @@
|
|||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"peer": true
|
"peer": true
|
||||||
},
|
},
|
||||||
"node_modules/ini": {
|
|
||||||
"version": "1.3.8",
|
|
||||||
"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
|
|
||||||
"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
|
|
||||||
"license": "ISC"
|
|
||||||
},
|
|
||||||
"node_modules/ip-address": {
|
"node_modules/ip-address": {
|
||||||
"version": "10.2.0",
|
"version": "10.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz",
|
||||||
"integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==",
|
"integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 12"
|
"node": ">= 12"
|
||||||
}
|
}
|
||||||
@@ -3209,15 +2972,6 @@
|
|||||||
"license": "BSD-2-Clause",
|
"license": "BSD-2-Clause",
|
||||||
"peer": true
|
"peer": true
|
||||||
},
|
},
|
||||||
"node_modules/kitx": {
|
|
||||||
"version": "2.2.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/kitx/-/kitx-2.2.0.tgz",
|
|
||||||
"integrity": "sha512-tBMwe6AALTBQJb0woQDD40734NKzb0Kzi3k7wQj9ar3AbP9oqhoVrdXPh7rk2r00/glIgd0YbToIUJsnxWMiIg==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"@types/node": "^22.5.4"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/light-my-request": {
|
"node_modules/light-my-request": {
|
||||||
"version": "6.6.0",
|
"version": "6.6.0",
|
||||||
"resolved": "https://registry.npmjs.org/light-my-request/-/light-my-request-6.6.0.tgz",
|
"resolved": "https://registry.npmjs.org/light-my-request/-/light-my-request-6.6.0.tgz",
|
||||||
@@ -3516,12 +3270,6 @@
|
|||||||
"url": "https://opencollective.com/parcel"
|
"url": "https://opencollective.com/parcel"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/lodash": {
|
|
||||||
"version": "4.18.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
|
|
||||||
"integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/lodash.identity": {
|
"node_modules/lodash.identity": {
|
||||||
"version": "3.0.0",
|
"version": "3.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/lodash.identity/-/lodash.identity-3.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/lodash.identity/-/lodash.identity-3.0.0.tgz",
|
||||||
@@ -3609,27 +3357,6 @@
|
|||||||
"node": ">= 0.6"
|
"node": ">= 0.6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/moment": {
|
|
||||||
"version": "2.30.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
|
|
||||||
"integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": "*"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/moment-timezone": {
|
|
||||||
"version": "0.5.48",
|
|
||||||
"resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.48.tgz",
|
|
||||||
"integrity": "sha512-f22b8LV1gbTO2ms2j2z13MuPogNoh5UzxL3nzNAYKGraILnbGc9NEE6dyiiiLv46DGRb8A4kg8UKWLjPthxBHw==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"moment": "^2.29.4"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "*"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/ms": {
|
"node_modules/ms": {
|
||||||
"version": "2.1.3",
|
"version": "2.1.3",
|
||||||
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
|
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
|
||||||
@@ -4249,15 +3976,6 @@
|
|||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"peer": true
|
"peer": true
|
||||||
},
|
},
|
||||||
"node_modules/sax": {
|
|
||||||
"version": "1.6.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/sax/-/sax-1.6.0.tgz",
|
|
||||||
"integrity": "sha512-6R3J5M4AcbtLUdZmRv2SygeVaM7IhrLXu9BmnOGmmACak8fiUtOsYNWUS4uK7upbmHIBbLBeFeI//477BKLBzA==",
|
|
||||||
"license": "BlueOak-1.0.0",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=11.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/secure-json-parse": {
|
"node_modules/secure-json-parse": {
|
||||||
"version": "4.1.0",
|
"version": "4.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-4.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-4.1.0.tgz",
|
||||||
@@ -4475,50 +4193,6 @@
|
|||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
},
|
},
|
||||||
"node_modules/sm3": {
|
|
||||||
"version": "1.0.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/sm3/-/sm3-1.0.3.tgz",
|
|
||||||
"integrity": "sha512-KyFkIfr8QBlFG3uc3NaljaXdYcsbRy1KrSfc4tsQV8jW68jAktGeOcifu530Vx/5LC+PULHT0Rv8LiI8Gw+c1g==",
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/smart-buffer": {
|
|
||||||
"version": "4.2.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
|
|
||||||
"integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 6.0.0",
|
|
||||||
"npm": ">= 3.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/socks": {
|
|
||||||
"version": "2.8.9",
|
|
||||||
"resolved": "https://registry.npmjs.org/socks/-/socks-2.8.9.tgz",
|
|
||||||
"integrity": "sha512-LJhUYUvItdQ0LkJTmPeaEObWXAqFyfmP85x0tch/ez9cahmhlBBLbIqDFnvBnUJGagb0JbIQrkBs1wJ+yRYpEw==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"ip-address": "^10.1.1",
|
|
||||||
"smart-buffer": "^4.2.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 10.0.0",
|
|
||||||
"npm": ">= 3.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/socks-proxy-agent": {
|
|
||||||
"version": "6.2.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz",
|
|
||||||
"integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"agent-base": "^6.0.2",
|
|
||||||
"debug": "^4.3.3",
|
|
||||||
"socks": "^2.6.2"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 10"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/sonic-boom": {
|
"node_modules/sonic-boom": {
|
||||||
"version": "4.2.1",
|
"version": "4.2.1",
|
||||||
"resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-4.2.1.tgz",
|
"resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-4.2.1.tgz",
|
||||||
@@ -5026,28 +4700,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/xml2js": {
|
|
||||||
"version": "0.6.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz",
|
|
||||||
"integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"sax": ">=0.6.0",
|
|
||||||
"xmlbuilder": "~11.0.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=4.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/xmlbuilder": {
|
|
||||||
"version": "11.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
|
|
||||||
"integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=4.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/zod": {
|
"node_modules/zod": {
|
||||||
"version": "4.4.3",
|
"version": "4.4.3",
|
||||||
"resolved": "https://registry.npmjs.org/zod/-/zod-4.4.3.tgz",
|
"resolved": "https://registry.npmjs.org/zod/-/zod-4.4.3.tgz",
|
||||||
|
|||||||
@@ -7,9 +7,6 @@
|
|||||||
"node": ">=24"
|
"node": ">=24"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@alicloud/credentials": "^2.4.5",
|
|
||||||
"@alicloud/docmind-api20220711": "^1.4.15",
|
|
||||||
"@alicloud/tea-util": "^1.4.11",
|
|
||||||
"@anthropic-ai/claude-agent-sdk": "^0.3.202",
|
"@anthropic-ai/claude-agent-sdk": "^0.3.202",
|
||||||
"@fastify/cookie": "^11.0.2",
|
"@fastify/cookie": "^11.0.2",
|
||||||
"@larksuiteoapi/node-sdk": "^1.70.0",
|
"@larksuiteoapi/node-sdk": "^1.70.0",
|
||||||
|
|||||||
@@ -1,69 +0,0 @@
|
|||||||
-- ADR-0027: org-scoped capability connections for external document/media
|
|
||||||
-- transforms (PDF→MD, audio/video→text, …). Mirrors the Feishu Application
|
|
||||||
-- Connection shape: reuses the ADR-0024 envelope machinery with its own
|
|
||||||
-- payload schema and readiness probe, distinct from the model-provider
|
|
||||||
-- connection.
|
|
||||||
|
|
||||||
CREATE TABLE "OrganizationCapabilityConnection" (
|
|
||||||
"id" TEXT NOT NULL,
|
|
||||||
"organizationId" TEXT NOT NULL,
|
|
||||||
"capabilityId" TEXT NOT NULL,
|
|
||||||
"status" "OrganizationConnectionStatus" NOT NULL DEFAULT 'DRAFT',
|
|
||||||
"activeSecretVersionId" TEXT,
|
|
||||||
"activatedAt" TIMESTAMP(3),
|
|
||||||
"disabledAt" TIMESTAMP(3),
|
|
||||||
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
"updatedAt" TIMESTAMP(3) NOT NULL,
|
|
||||||
CONSTRAINT "OrganizationCapabilityConnection_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE UNIQUE INDEX "OrganizationCapabilityConnection_organizationId_capabilityId_key"
|
|
||||||
ON "OrganizationCapabilityConnection"("organizationId", "capabilityId");
|
|
||||||
CREATE UNIQUE INDEX "OrganizationCapabilityConnection_activeSecretVersionId_key"
|
|
||||||
ON "OrganizationCapabilityConnection"("activeSecretVersionId");
|
|
||||||
CREATE INDEX "OrganizationCapabilityConnection_organizationId_status_idx"
|
|
||||||
ON "OrganizationCapabilityConnection"("organizationId", "status");
|
|
||||||
CREATE INDEX "OrganizationCapabilityConnection_capabilityId_status_idx"
|
|
||||||
ON "OrganizationCapabilityConnection"("capabilityId", "status");
|
|
||||||
|
|
||||||
CREATE TABLE "CapabilityCredentialVersion" (
|
|
||||||
"id" TEXT NOT NULL,
|
|
||||||
"connectionId" TEXT NOT NULL,
|
|
||||||
"version" INTEGER NOT NULL,
|
|
||||||
"envelopeVersion" INTEGER NOT NULL DEFAULT 1,
|
|
||||||
"keyId" TEXT NOT NULL,
|
|
||||||
"envelope" JSONB NOT NULL,
|
|
||||||
"createdByUserId" TEXT,
|
|
||||||
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
"retiredAt" TIMESTAMP(3),
|
|
||||||
CONSTRAINT "CapabilityCredentialVersion_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE UNIQUE INDEX "CapabilityCredentialVersion_connectionId_version_key"
|
|
||||||
ON "CapabilityCredentialVersion"("connectionId", "version");
|
|
||||||
CREATE INDEX "CapabilityCredentialVersion_connectionId_retiredAt_idx"
|
|
||||||
ON "CapabilityCredentialVersion"("connectionId", "retiredAt");
|
|
||||||
CREATE INDEX "CapabilityCredentialVersion_keyId_idx"
|
|
||||||
ON "CapabilityCredentialVersion"("keyId");
|
|
||||||
CREATE INDEX "CapabilityCredentialVersion_createdByUserId_idx"
|
|
||||||
ON "CapabilityCredentialVersion"("createdByUserId");
|
|
||||||
|
|
||||||
ALTER TABLE "OrganizationCapabilityConnection"
|
|
||||||
ADD CONSTRAINT "OrganizationCapabilityConnection_organizationId_fkey"
|
|
||||||
FOREIGN KEY ("organizationId") REFERENCES "Organization"("id")
|
|
||||||
ON DELETE CASCADE ON UPDATE CASCADE;
|
|
||||||
|
|
||||||
ALTER TABLE "OrganizationCapabilityConnection"
|
|
||||||
ADD CONSTRAINT "OrganizationCapabilityConnection_activeSecretVersionId_fkey"
|
|
||||||
FOREIGN KEY ("activeSecretVersionId") REFERENCES "CapabilityCredentialVersion"("id")
|
|
||||||
ON DELETE RESTRICT ON UPDATE CASCADE;
|
|
||||||
|
|
||||||
ALTER TABLE "CapabilityCredentialVersion"
|
|
||||||
ADD CONSTRAINT "CapabilityCredentialVersion_connectionId_fkey"
|
|
||||||
FOREIGN KEY ("connectionId") REFERENCES "OrganizationCapabilityConnection"("id")
|
|
||||||
ON DELETE CASCADE ON UPDATE CASCADE;
|
|
||||||
|
|
||||||
ALTER TABLE "CapabilityCredentialVersion"
|
|
||||||
ADD CONSTRAINT "CapabilityCredentialVersion_createdByUserId_fkey"
|
|
||||||
FOREIGN KEY ("createdByUserId") REFERENCES "User"("id")
|
|
||||||
ON DELETE SET NULL ON UPDATE CASCADE;
|
|
||||||
@@ -44,7 +44,6 @@ model Organization {
|
|||||||
externalDirectoryConnections ExternalDirectoryConnection[]
|
externalDirectoryConnections ExternalDirectoryConnection[]
|
||||||
providerConnections OrganizationProviderConnection[]
|
providerConnections OrganizationProviderConnection[]
|
||||||
feishuApplicationConnection OrganizationFeishuApplicationConnection?
|
feishuApplicationConnection OrganizationFeishuApplicationConnection?
|
||||||
capabilityConnections OrganizationCapabilityConnection[]
|
|
||||||
agentSkills OrganizationAgentSkill[]
|
agentSkills OrganizationAgentSkill[]
|
||||||
agentRoles OrganizationAgentRole[]
|
agentRoles OrganizationAgentRole[]
|
||||||
projectGroupBindings ProjectGroupBinding[]
|
projectGroupBindings ProjectGroupBinding[]
|
||||||
@@ -199,7 +198,6 @@ model User {
|
|||||||
auditEntries AuditEntry[] @relation("auditActor")
|
auditEntries AuditEntry[] @relation("auditActor")
|
||||||
providerCredentialVersions ProviderCredentialVersion[] @relation("providerCredentialVersionCreator")
|
providerCredentialVersions ProviderCredentialVersion[] @relation("providerCredentialVersionCreator")
|
||||||
feishuCredentialVersions FeishuApplicationCredentialVersion[] @relation("feishuCredentialVersionCreator")
|
feishuCredentialVersions FeishuApplicationCredentialVersion[] @relation("feishuCredentialVersionCreator")
|
||||||
capabilityCredentialVersions CapabilityCredentialVersion[] @relation("capabilityCredentialVersionCreator")
|
|
||||||
feishuIdentities FeishuUserIdentity[]
|
feishuIdentities FeishuUserIdentity[]
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -871,55 +869,3 @@ model UsageFact {
|
|||||||
@@index([provider, model, occurredAt])
|
@@index([provider, model, occurredAt])
|
||||||
@@index([capabilityId, occurredAt])
|
@@index([capabilityId, occurredAt])
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- External capability connections (ADR-0027) -------------------------
|
|
||||||
|
|
||||||
/// ADR-0027: org-scoped credential connection for an external capability
|
|
||||||
/// (PDF→MD, audio/video→text, …). Structurally mirrors the Feishu Application
|
|
||||||
/// Connection: reuses the ADR-0024 envelope (KEK→DEK→AES-256-GCM, AAD-bound)
|
|
||||||
/// but has its own payload schema and readiness probe, distinct from the
|
|
||||||
/// model-provider connection. Unique by (organizationId, capabilityId).
|
|
||||||
model OrganizationCapabilityConnection {
|
|
||||||
id String @id @default(cuid())
|
|
||||||
organizationId String
|
|
||||||
capabilityId String
|
|
||||||
status OrganizationConnectionStatus @default(DRAFT)
|
|
||||||
activeSecretVersionId String? @unique
|
|
||||||
activatedAt DateTime?
|
|
||||||
disabledAt DateTime?
|
|
||||||
createdAt DateTime @default(now())
|
|
||||||
updatedAt DateTime @updatedAt
|
|
||||||
|
|
||||||
organization Organization @relation(fields: [organizationId], references: [id], onDelete: Cascade)
|
|
||||||
secretVersions CapabilityCredentialVersion[] @relation("capabilityCredentialVersions")
|
|
||||||
activeSecretVersion CapabilityCredentialVersion? @relation("activeCapabilityCredentialVersion", fields: [activeSecretVersionId], references: [id], onDelete: Restrict)
|
|
||||||
|
|
||||||
@@unique([organizationId, capabilityId])
|
|
||||||
@@index([organizationId, status])
|
|
||||||
@@index([capabilityId, status])
|
|
||||||
}
|
|
||||||
|
|
||||||
/// ADR-0024/0027: one immutable authenticated envelope per capability secret
|
|
||||||
/// version. Same encryption machinery as Provider/Feishu credential versions;
|
|
||||||
/// the payload inside is CapabilitySecretPayloadV1 (baseUrl, apiToken,
|
|
||||||
/// optional projectId).
|
|
||||||
model CapabilityCredentialVersion {
|
|
||||||
id String @id @default(cuid())
|
|
||||||
connectionId String
|
|
||||||
version Int
|
|
||||||
envelopeVersion Int @default(1)
|
|
||||||
keyId String
|
|
||||||
envelope Json
|
|
||||||
createdByUserId String?
|
|
||||||
createdAt DateTime @default(now())
|
|
||||||
retiredAt DateTime?
|
|
||||||
|
|
||||||
connection OrganizationCapabilityConnection @relation("capabilityCredentialVersions", fields: [connectionId], references: [id], onDelete: Cascade)
|
|
||||||
activeFor OrganizationCapabilityConnection? @relation("activeCapabilityCredentialVersion")
|
|
||||||
createdBy User? @relation("capabilityCredentialVersionCreator", fields: [createdByUserId], references: [id], onDelete: SetNull)
|
|
||||||
|
|
||||||
@@unique([connectionId, version])
|
|
||||||
@@index([connectionId, retiredAt])
|
|
||||||
@@index([keyId])
|
|
||||||
@@index([createdByUserId])
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,89 +0,0 @@
|
|||||||
/**
|
|
||||||
* Smoke test: real Aliyun docmind API call using createReadStream.
|
|
||||||
* Run: node --experimental-strip-types scripts/smoke-docmind.ts <pdf-path>
|
|
||||||
*/
|
|
||||||
import DocmindClient from "@alicloud/docmind-api20220711";
|
|
||||||
import { RuntimeOptions } from "@alicloud/tea-util";
|
|
||||||
import { createReadStream } from "node:fs";
|
|
||||||
import { basename } from "node:path";
|
|
||||||
|
|
||||||
const accessKeyId = process.env["ALIBABA_CLOUD_ACCESS_KEY_ID"];
|
|
||||||
const accessKeySecret = process.env["ALIBABA_CLOUD_ACCESS_KEY_SECRET"];
|
|
||||||
if (accessKeyId === undefined || accessKeySecret === undefined) {
|
|
||||||
console.error("Set ALIBABA_CLOUD_ACCESS_KEY_ID and ALIBABA_CLOUD_ACCESS_KEY_SECRET env vars.");
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
const pdfPath = process.argv[2] ?? "../examples/trial/prime_sieve.pdf";
|
|
||||||
console.log(`Parsing: ${pdfPath}`);
|
|
||||||
|
|
||||||
const client = new DocmindClient.default({
|
|
||||||
endpoint: "docmind-api.cn-hangzhou.aliyuncs.com",
|
|
||||||
accessKeyId,
|
|
||||||
accessKeySecret,
|
|
||||||
type: "access_key",
|
|
||||||
regionId: "cn-hangzhou",
|
|
||||||
} as never);
|
|
||||||
|
|
||||||
const fileStream = createReadStream(pdfPath);
|
|
||||||
const runtime = new RuntimeOptions({});
|
|
||||||
|
|
||||||
console.log("Submitting job...");
|
|
||||||
const submitResp = await client.submitDocParserJobAdvance(
|
|
||||||
new DocmindClient.SubmitDocParserJobAdvanceRequest({
|
|
||||||
fileUrlObject: fileStream,
|
|
||||||
fileName: basename(pdfPath),
|
|
||||||
outputFormat: ["markdown"],
|
|
||||||
formulaEnhancement: true,
|
|
||||||
}),
|
|
||||||
runtime,
|
|
||||||
);
|
|
||||||
const jobId = submitResp.body?.data?.id;
|
|
||||||
console.log("Job ID:", jobId);
|
|
||||||
|
|
||||||
if (jobId === undefined) {
|
|
||||||
console.error("No job id:", JSON.stringify(submitResp.body));
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log("Polling...");
|
|
||||||
const deadline = Date.now() + 5 * 60_000;
|
|
||||||
let status = "";
|
|
||||||
let markdownUrl = "";
|
|
||||||
let pageCount = 0;
|
|
||||||
while (Date.now() < deadline) {
|
|
||||||
await new Promise((r) => setTimeout(r, 10_000));
|
|
||||||
const resp = await client.queryDocParserStatus(
|
|
||||||
new DocmindClient.QueryDocParserStatusRequest({ id: jobId }),
|
|
||||||
);
|
|
||||||
const data = (resp.body as { data?: { status?: string; pageCountEstimate?: number; outputFormatResult?: Array<{ outputFileUrl?: string; outputType?: string }> } }).data;
|
|
||||||
status = data?.status ?? "";
|
|
||||||
console.log(` status: ${status}`);
|
|
||||||
if (status === "success") {
|
|
||||||
const md = data?.outputFormatResult?.find((r) => r.outputType === "markdown");
|
|
||||||
markdownUrl = md?.outputFileUrl ?? "";
|
|
||||||
pageCount = data?.pageCountEstimate ?? 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (status === "fail") {
|
|
||||||
console.error("Job failed!");
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (status !== "success" || markdownUrl === "") {
|
|
||||||
console.error("Failed or timed out:", status);
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log("Downloading markdown from OSS...");
|
|
||||||
const mdResp = await fetch(markdownUrl);
|
|
||||||
const markdown = await mdResp.text();
|
|
||||||
|
|
||||||
console.log("--- Result ---");
|
|
||||||
console.log("Pages:", pageCount);
|
|
||||||
console.log("Cost (USD, est):", ((pageCount > 0 ? pageCount : 1) * 0.0056).toFixed(4));
|
|
||||||
console.log("Job ID:", jobId);
|
|
||||||
console.log("Markdown length:", markdown.length, "chars");
|
|
||||||
console.log("--- Markdown (first 1000 chars) ---");
|
|
||||||
console.log(markdown.slice(0, 1000));
|
|
||||||
@@ -1,70 +0,0 @@
|
|||||||
/**
|
|
||||||
* ADR-0027: org-scoped capability credential resolver. Reuses the ADR-0024
|
|
||||||
* envelope decryption machinery (LocalSecretEnvelope) with
|
|
||||||
* purpose="capability", distinct from the model-provider and Feishu
|
|
||||||
* application connections. Fail-closed: no process-global fallback.
|
|
||||||
*
|
|
||||||
* Mirrors the Feishu application connection resolver shape, minus the
|
|
||||||
* readiness probe (capability probes are per-capability and injected by the
|
|
||||||
* adapter wiring, not this resolver).
|
|
||||||
*/
|
|
||||||
import type { PrismaClient } from "@prisma/client";
|
|
||||||
import { LocalSecretEnvelope, type SecretEnvelopeV1 } from "../security/secretEnvelope.js";
|
|
||||||
import {
|
|
||||||
CapabilityConnectionUnavailable,
|
|
||||||
type CapabilitySecretPayload,
|
|
||||||
type CapabilityId,
|
|
||||||
} from "./types.js";
|
|
||||||
|
|
||||||
const CAPABILITY_PURPOSE = "capability";
|
|
||||||
|
|
||||||
export interface ResolvedCapabilityCredential extends CapabilitySecretPayload {
|
|
||||||
readonly connectionId: string;
|
|
||||||
readonly organizationId: string;
|
|
||||||
readonly capabilityId: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Resolve the active capability credential for an organization. Throws
|
|
||||||
* CapabilityConnectionUnavailable when the org has no ACTIVE connection
|
|
||||||
* (fail-closed, ADR-0024). Decrypted plaintext exists only in the returned
|
|
||||||
* object for the duration of the capability call; it is never cached, logged,
|
|
||||||
* or passed to the Agent process.
|
|
||||||
*/
|
|
||||||
export async function resolveCapabilityCredential(
|
|
||||||
prisma: PrismaClient,
|
|
||||||
secrets: LocalSecretEnvelope,
|
|
||||||
input: { readonly organizationId: string; readonly capabilityId: CapabilityId },
|
|
||||||
): Promise<ResolvedCapabilityCredential> {
|
|
||||||
const connection = await prisma.organizationCapabilityConnection.findFirst({
|
|
||||||
where: {
|
|
||||||
organizationId: input.organizationId,
|
|
||||||
capabilityId: input.capabilityId,
|
|
||||||
status: "ACTIVE",
|
|
||||||
},
|
|
||||||
include: { activeSecretVersion: true },
|
|
||||||
});
|
|
||||||
if (connection === null || connection.activeSecretVersion === null) {
|
|
||||||
throw new CapabilityConnectionUnavailable(input.capabilityId, input.organizationId);
|
|
||||||
}
|
|
||||||
const version = connection.activeSecretVersion;
|
|
||||||
const binding = {
|
|
||||||
purpose: CAPABILITY_PURPOSE,
|
|
||||||
organizationId: connection.organizationId,
|
|
||||||
connectionId: connection.id,
|
|
||||||
secretVersionId: version.id,
|
|
||||||
};
|
|
||||||
const payload = secrets.decryptJson<CapabilitySecretPayload>(binding, version.envelope as unknown as SecretEnvelopeV1);
|
|
||||||
if (payload.schemaVersion !== 1) {
|
|
||||||
throw new Error(`unsupported capability secret schemaVersion: ${payload.schemaVersion}`);
|
|
||||||
}
|
|
||||||
return {
|
|
||||||
connectionId: connection.id,
|
|
||||||
organizationId: connection.organizationId,
|
|
||||||
capabilityId: connection.capabilityId,
|
|
||||||
schemaVersion: 1,
|
|
||||||
accessKeyId: payload.accessKeyId,
|
|
||||||
accessKeySecret: payload.accessKeySecret,
|
|
||||||
endpoint: payload.endpoint,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,231 +0,0 @@
|
|||||||
/**
|
|
||||||
* ADR-0027: Alibaba Cloud Document Mind (docmind) client.
|
|
||||||
*
|
|
||||||
* Uses the official @alicloud/docmind-api20220711 SDK to call the document
|
|
||||||
* parsing (large model version) API. The API is asynchronous:
|
|
||||||
* 1. SubmitDocParserJobAdvance — upload local file as a stream, get job id
|
|
||||||
* 2. QueryDocParserStatus — poll until data.status === "success";
|
|
||||||
* the markdown output URL is returned in outputFormatResult
|
|
||||||
* 3. Download markdown from OSS, extract and download referenced images
|
|
||||||
*
|
|
||||||
* Pricing (2025-07, aliyun docmind):
|
|
||||||
* - 图文文档基础链路: 0.02元/页
|
|
||||||
* - 图文文档增强链路 (含公式 LaTeX): 0.04元/页
|
|
||||||
* - 视频: 0.002元/秒
|
|
||||||
* - 音频: 0.00035元/秒
|
|
||||||
*/
|
|
||||||
import $DocmindClient, {
|
|
||||||
SubmitDocParserJobAdvanceRequest,
|
|
||||||
QueryDocParserStatusRequest,
|
|
||||||
} from "@alicloud/docmind-api20220711";
|
|
||||||
import { RuntimeOptions } from "@alicloud/tea-util";
|
|
||||||
import { createReadStream } from "node:fs";
|
|
||||||
import { basename } from "node:path";
|
|
||||||
import type { CapabilitySecretPayload } from "./types.js";
|
|
||||||
|
|
||||||
/** A single extracted image downloaded from the markdown's OSS image URLs. */
|
|
||||||
export interface DocmindExtractedImage {
|
|
||||||
readonly filename: string;
|
|
||||||
readonly data: Uint8Array;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** The structured result of parsing one document. */
|
|
||||||
export interface DocmindParseResult {
|
|
||||||
readonly markdown: string;
|
|
||||||
readonly images: readonly DocmindExtractedImage[];
|
|
||||||
readonly pageCount: number;
|
|
||||||
readonly costUsd: number | null;
|
|
||||||
readonly requestId: string | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface DocmindParseOptions {
|
|
||||||
readonly inputFilePath: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface CapabilityProviderClient {
|
|
||||||
parse(credential: CapabilitySecretPayload, options: DocmindParseOptions): Promise<DocmindParseResult>;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class DocmindClientError extends Error {
|
|
||||||
constructor(
|
|
||||||
message: string,
|
|
||||||
readonly code: "docmind_unreachable" | "docmind_rejected" | "docmind_invalid_response" | "docmind_no_output" | "docmind_timeout",
|
|
||||||
readonly upstreamStatus?: number,
|
|
||||||
) {
|
|
||||||
super(message);
|
|
||||||
this.name = "DocmindClientError";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Cost per page in USD (0.04 CNY/page ≈ 0.0056 USD). */
|
|
||||||
const COST_PER_PAGE_USD = 0.0056;
|
|
||||||
const POLL_INTERVAL_MS = 10_000;
|
|
||||||
const POLL_TIMEOUT_MS = 5 * 60_000;
|
|
||||||
|
|
||||||
type DocmindConfig = ConstructorParameters<typeof $DocmindClient.default>[0];
|
|
||||||
|
|
||||||
export class AliyunDocmindClient implements CapabilityProviderClient {
|
|
||||||
async parse(credential: CapabilitySecretPayload, options: DocmindParseOptions): Promise<DocmindParseResult> {
|
|
||||||
const config: DocmindConfig = {
|
|
||||||
endpoint: credential.endpoint,
|
|
||||||
accessKeyId: credential.accessKeyId,
|
|
||||||
accessKeySecret: credential.accessKeySecret,
|
|
||||||
type: "access_key",
|
|
||||||
regionId: "cn-hangzhou",
|
|
||||||
} as DocmindConfig;
|
|
||||||
const client = new $DocmindClient.default(config);
|
|
||||||
|
|
||||||
// 1. Submit job with local file as a ReadStream (not a Buffer — the SDK
|
|
||||||
// serializes Buffers as JSON {type:"Buffer",data:[...]} which the API
|
|
||||||
// can't read; a Stream is uploaded as multipart form data).
|
|
||||||
const fileName = basename(options.inputFilePath);
|
|
||||||
const fileStream = createReadStream(options.inputFilePath);
|
|
||||||
const advanceRequest = new SubmitDocParserJobAdvanceRequest({
|
|
||||||
fileUrlObject: fileStream,
|
|
||||||
fileName,
|
|
||||||
outputFormat: ["markdown"],
|
|
||||||
formulaEnhancement: true,
|
|
||||||
});
|
|
||||||
const runtime = new RuntimeOptions({});
|
|
||||||
let submitResponse;
|
|
||||||
try {
|
|
||||||
submitResponse = await client.submitDocParserJobAdvance(advanceRequest, runtime);
|
|
||||||
} catch (e) {
|
|
||||||
throw new DocmindClientError(
|
|
||||||
e instanceof Error ? e.message : String(e),
|
|
||||||
"docmind_unreachable",
|
|
||||||
);
|
|
||||||
}
|
|
||||||
const jobId = submitResponse.body?.data?.id;
|
|
||||||
if (jobId === undefined || jobId === null || jobId === "") {
|
|
||||||
throw new DocmindClientError("docmind submit returned no job id", "docmind_invalid_response");
|
|
||||||
}
|
|
||||||
|
|
||||||
// 2. Poll QueryDocParserStatus until data.status === "success" or "fail".
|
|
||||||
const deadline = Date.now() + POLL_TIMEOUT_MS;
|
|
||||||
let status = "";
|
|
||||||
let markdownUrl: string | null = null;
|
|
||||||
let pageCount = 0;
|
|
||||||
while (Date.now() < deadline) {
|
|
||||||
await sleep(POLL_INTERVAL_MS);
|
|
||||||
const statusReq = new QueryDocParserStatusRequest({ id: jobId });
|
|
||||||
const statusResponse = await client.queryDocParserStatus(statusReq);
|
|
||||||
const body = statusResponse.body as {
|
|
||||||
data?: {
|
|
||||||
status?: string;
|
|
||||||
pageCountEstimate?: number;
|
|
||||||
outputFormatResult?: Array<{ outputFileUrl?: string; outputType?: string }>;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
status = body.data?.status ?? "";
|
|
||||||
if (status === "success") {
|
|
||||||
const mdResult = body.data?.outputFormatResult?.find((r) => r.outputType === "markdown");
|
|
||||||
markdownUrl = mdResult?.outputFileUrl ?? null;
|
|
||||||
pageCount = body.data?.pageCountEstimate ?? 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (status === "fail") {
|
|
||||||
throw new DocmindClientError(`docmind job ${jobId} failed`, "docmind_rejected");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (status !== "success") {
|
|
||||||
throw new DocmindClientError(`docmind job ${jobId} timed out (status: ${status})`, "docmind_timeout");
|
|
||||||
}
|
|
||||||
if (markdownUrl === null) {
|
|
||||||
throw new DocmindClientError("docmind returned no markdown output URL", "docmind_no_output");
|
|
||||||
}
|
|
||||||
|
|
||||||
// 3. Download the markdown file from OSS.
|
|
||||||
let markdown: string;
|
|
||||||
try {
|
|
||||||
const mdResp = await fetch(markdownUrl);
|
|
||||||
if (!mdResp.ok) {
|
|
||||||
throw new DocmindClientError(`failed to download markdown: HTTP ${mdResp.status}`, "docmind_unreachable");
|
|
||||||
}
|
|
||||||
markdown = await mdResp.text();
|
|
||||||
} catch (e) {
|
|
||||||
if (e instanceof DocmindClientError) throw e;
|
|
||||||
throw new DocmindClientError(
|
|
||||||
e instanceof Error ? e.message : String(e),
|
|
||||||
"docmind_unreachable",
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if (markdown === "") {
|
|
||||||
throw new DocmindClientError("docmind returned empty markdown", "docmind_no_output");
|
|
||||||
}
|
|
||||||
|
|
||||||
// 4. Download images referenced in the markdown (OSS URLs).
|
|
||||||
// Markdown contains  entries.
|
|
||||||
// We rewrite them to local relative paths and download the images.
|
|
||||||
const images: DocmindExtractedImage[] = [];
|
|
||||||
const imageRefRegex = /!\[([^\]]*)\]\((https?:\/\/[^)]+)\)/g;
|
|
||||||
const localMarkdown = markdown.replace(imageRefRegex, (match, altText: string, url: string) => {
|
|
||||||
const idx = images.findIndex((img) => img.filename === extractFilename(altText, url, images.length));
|
|
||||||
if (idx >= 0) {
|
|
||||||
const img = images[idx]!;
|
|
||||||
return ``;
|
|
||||||
}
|
|
||||||
return match;
|
|
||||||
});
|
|
||||||
|
|
||||||
// Collect all image URLs first, then download.
|
|
||||||
const imageUrls: Array<{ url: string; altText: string }> = [];
|
|
||||||
let match: RegExpExecArray | null;
|
|
||||||
const collectRegex = /!\[([^\]]*)\]\((https?:\/\/[^)]+)\)/g;
|
|
||||||
while ((match = collectRegex.exec(markdown)) !== null) {
|
|
||||||
imageUrls.push({ url: match[2]!, altText: match[1]! });
|
|
||||||
}
|
|
||||||
|
|
||||||
for (let i = 0; i < imageUrls.length; i++) {
|
|
||||||
const { url, altText } = imageUrls[i]!;
|
|
||||||
const filename = extractFilename(altText, url, i);
|
|
||||||
try {
|
|
||||||
const imgResp = await fetch(url);
|
|
||||||
if (!imgResp.ok) continue;
|
|
||||||
const data = new Uint8Array(await imgResp.arrayBuffer());
|
|
||||||
images.push({ filename, data });
|
|
||||||
} catch {
|
|
||||||
// Best-effort: skip images that fail to download.
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Rewrite markdown with local image paths.
|
|
||||||
let finalMarkdown = markdown;
|
|
||||||
let imageIdx = 0;
|
|
||||||
finalMarkdown = finalMarkdown.replace(imageRefRegex, (match, altText: string, _url: string) => {
|
|
||||||
if (imageIdx < images.length) {
|
|
||||||
const img = images[imageIdx]!;
|
|
||||||
imageIdx++;
|
|
||||||
return ``;
|
|
||||||
}
|
|
||||||
return match;
|
|
||||||
});
|
|
||||||
|
|
||||||
if (pageCount === 0) {
|
|
||||||
pageCount = Math.max(1, images.length);
|
|
||||||
}
|
|
||||||
const costUsd = (pageCount > 0 ? pageCount : 1) * COST_PER_PAGE_USD;
|
|
||||||
|
|
||||||
return { markdown: finalMarkdown, images, pageCount, costUsd, requestId: jobId };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function sleep(ms: number): Promise<void> {
|
|
||||||
return new Promise((resolve) => {
|
|
||||||
setTimeout(resolve, ms);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Derive a clean filename from the alt text or URL. */
|
|
||||||
function extractFilename(altText: string, url: string, index: number): string {
|
|
||||||
// Try alt text first (docmind often puts the original filename).
|
|
||||||
if (altText !== "" && altText.length < 100) {
|
|
||||||
const cleaned = altText.replace(/[^a-zA-Z0-9._-]/g, "_");
|
|
||||||
if (cleaned.length > 0) return cleaned;
|
|
||||||
}
|
|
||||||
// Fall back to URL path.
|
|
||||||
const urlPath = new URL(url).pathname;
|
|
||||||
const base = basename(urlPath);
|
|
||||||
if (base !== "" && base !== "/") return base;
|
|
||||||
return `image_${index + 1}.png`;
|
|
||||||
}
|
|
||||||
@@ -1,152 +0,0 @@
|
|||||||
/**
|
|
||||||
* ADR-0027: pdf_to_md_bundle capability adapter.
|
|
||||||
*
|
|
||||||
* Converts a PDF in the run's workspace into a Markdown bundle (md + extracted
|
|
||||||
* images) by calling the MinerU document parsing service, writing outputs into
|
|
||||||
* the workspace, and recording consumption on a UsageFact (ADR-0026).
|
|
||||||
*
|
|
||||||
* Invariants (ADR-0027):
|
|
||||||
* 1. Credential isolation — the capability credential is resolved in Hub and
|
|
||||||
* never reaches the Agent process. The MineruClient receives it as a
|
|
||||||
* call argument, not from the environment.
|
|
||||||
* 2. Workspace containment — input and output paths are confined to the
|
|
||||||
* run's workspace dir (ADR-0018 AgentSurface). Escapes are rejected.
|
|
||||||
* 3. Mandatory fact — a successful invocation always writes ≥1 UsageFact
|
|
||||||
* with kind=external_capability, even when costUsd is null (ADR-0022:
|
|
||||||
* missing cost ≠ zero).
|
|
||||||
*/
|
|
||||||
import { mkdir, writeFile } from "node:fs/promises";
|
|
||||||
import { join, resolve, relative, isAbsolute } from "node:path";
|
|
||||||
import type { PrismaClient } from "@prisma/client";
|
|
||||||
import { LocalSecretEnvelope } from "../security/secretEnvelope.js";
|
|
||||||
import { resolveCapabilityCredential } from "./capabilityConnections.js";
|
|
||||||
import { DocmindClientError, type CapabilityProviderClient } from "./docmindClient.js";
|
|
||||||
import {
|
|
||||||
CAPABILITIES,
|
|
||||||
type CapabilityAdapter,
|
|
||||||
type CapabilityInvocationInput,
|
|
||||||
type CapabilityInvocationResult,
|
|
||||||
type CapabilityOutputArtifact,
|
|
||||||
} from "./types.js";
|
|
||||||
|
|
||||||
const CAPABILITY_ID = "pdf_to_md_bundle" as const;
|
|
||||||
const PROVIDER_ID = "aliyun_docmind";
|
|
||||||
|
|
||||||
/** Thrown when a requested path escapes the workspace root (ADR-0018). */
|
|
||||||
export class CapabilityPathEscape extends Error {
|
|
||||||
constructor(readonly requested: string, readonly workspaceDir: string) {
|
|
||||||
super(`capability path escapes workspace: ${requested} (root ${workspaceDir})`);
|
|
||||||
this.name = "CapabilityPathEscape";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Resolve a workspace-relative path, rejecting escapes (ADR-0018 AgentSurface). */
|
|
||||||
function confineToWorkspace(requestedPath: string, workspaceDir: string): string {
|
|
||||||
if (isAbsolute(requestedPath)) {
|
|
||||||
const rel = relative(workspaceDir, requestedPath);
|
|
||||||
if (rel.startsWith("..") || rel === "") {
|
|
||||||
throw new CapabilityPathEscape(requestedPath, workspaceDir);
|
|
||||||
}
|
|
||||||
return requestedPath;
|
|
||||||
}
|
|
||||||
const resolved = resolve(workspaceDir, requestedPath);
|
|
||||||
const rel = relative(workspaceDir, resolved);
|
|
||||||
if (rel.startsWith("..")) {
|
|
||||||
throw new CapabilityPathEscape(requestedPath, workspaceDir);
|
|
||||||
}
|
|
||||||
return resolved;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface PdfToMdBundleDeps {
|
|
||||||
readonly secrets: LocalSecretEnvelope;
|
|
||||||
readonly client: CapabilityProviderClient;
|
|
||||||
readonly prisma: PrismaClient;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Build the pdf_to_md_bundle adapter. The client is injectable for testing. */
|
|
||||||
export function createPdfToMdBundleAdapter(deps: PdfToMdBundleDeps): CapabilityAdapter {
|
|
||||||
return {
|
|
||||||
capabilityId: CAPABILITY_ID,
|
|
||||||
async invoke(input: CapabilityInvocationInput): Promise<CapabilityInvocationResult> {
|
|
||||||
const descriptor = CAPABILITIES[CAPABILITY_ID];
|
|
||||||
// 1. Resolve org-scoped credential (fail-closed, ADR-0024/0027).
|
|
||||||
const credential = await resolveCapabilityCredential(deps.prisma, deps.secrets, {
|
|
||||||
organizationId: input.organizationId,
|
|
||||||
capabilityId: CAPABILITY_ID,
|
|
||||||
});
|
|
||||||
|
|
||||||
// 2. Confine input + output paths to the workspace (ADR-0018).
|
|
||||||
const absoluteInput = confineToWorkspace(input.inputPath, input.workspaceDir);
|
|
||||||
const absoluteOutputDir = confineToWorkspace(input.outputDir, input.workspaceDir);
|
|
||||||
await mkdir(absoluteOutputDir, { recursive: true });
|
|
||||||
|
|
||||||
// 3. Call the backing service.
|
|
||||||
let result;
|
|
||||||
try {
|
|
||||||
result = await deps.client.parse(credential, { inputFilePath: absoluteInput });
|
|
||||||
} catch (e) {
|
|
||||||
if (e instanceof DocmindClientError) throw e;
|
|
||||||
throw new DocmindClientError(
|
|
||||||
e instanceof Error ? e.message : String(e),
|
|
||||||
"docmind_unreachable",
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if (result.markdown === "") {
|
|
||||||
throw new DocmindClientError("docmind returned empty markdown", "docmind_no_output");
|
|
||||||
}
|
|
||||||
|
|
||||||
// 4. Write outputs into the workspace.
|
|
||||||
const artifacts: CapabilityOutputArtifact[] = [];
|
|
||||||
const mdPath = join(absoluteOutputDir, "document.md");
|
|
||||||
await writeFile(mdPath, result.markdown, "utf8");
|
|
||||||
artifacts.push({ path: relative(input.workspaceDir, mdPath), kind: "markdown" });
|
|
||||||
|
|
||||||
for (const image of result.images) {
|
|
||||||
const imagePath = join(absoluteOutputDir, image.filename);
|
|
||||||
const rel = relative(absoluteOutputDir, imagePath);
|
|
||||||
if (rel.startsWith("..")) {
|
|
||||||
// Defensive: image filename must not escape the output dir.
|
|
||||||
throw new CapabilityPathEscape(image.filename, absoluteOutputDir);
|
|
||||||
}
|
|
||||||
await writeFile(imagePath, image.data);
|
|
||||||
artifacts.push({ path: relative(input.workspaceDir, imagePath), kind: "image" });
|
|
||||||
}
|
|
||||||
|
|
||||||
// 5. Write the UsageFact (ADR-0026/0027). Always written on success;
|
|
||||||
// costUsd null means unknown, NOT zero (ADR-0022).
|
|
||||||
const occurredAt = new Date();
|
|
||||||
await deps.prisma.usageFact.create({
|
|
||||||
data: {
|
|
||||||
runId: input.runId,
|
|
||||||
occurredAt,
|
|
||||||
kind: "external_capability",
|
|
||||||
provider: PROVIDER_ID,
|
|
||||||
model: null,
|
|
||||||
inputTokens: null,
|
|
||||||
outputTokens: null,
|
|
||||||
quantity: result.pageCount,
|
|
||||||
unit: descriptor.meteringUnit,
|
|
||||||
costUsd: result.costUsd,
|
|
||||||
costSource: result.costUsd !== null ? "provider_reported" : "unknown",
|
|
||||||
capabilityId: CAPABILITY_ID,
|
|
||||||
correlationId: result.requestId,
|
|
||||||
metadata: {},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
return {
|
|
||||||
artifacts,
|
|
||||||
consumption: {
|
|
||||||
provider: PROVIDER_ID,
|
|
||||||
model: null,
|
|
||||||
inputTokens: null,
|
|
||||||
outputTokens: null,
|
|
||||||
quantity: result.pageCount,
|
|
||||||
unit: descriptor.meteringUnit,
|
|
||||||
costUsd: result.costUsd,
|
|
||||||
correlationId: result.requestId,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,101 +0,0 @@
|
|||||||
/**
|
|
||||||
* ADR-0027: External capability types shared across the adapter layer.
|
|
||||||
*
|
|
||||||
* A capability is a platform-registered, org-enabled document/media transform
|
|
||||||
* invoked as a side effect of an AgentRun. The adapter resolves the org's
|
|
||||||
* active capability connection, calls the backing service via an injectable
|
|
||||||
* client, writes output into the run's workspace (AgentSurface, ADR-0018),
|
|
||||||
* and records consumption on a UsageFact (ADR-0026).
|
|
||||||
*/
|
|
||||||
import type { PrismaClient, Prisma } from "@prisma/client";
|
|
||||||
|
|
||||||
/** Stable capability identifiers registered with the platform (ADR-0027). */
|
|
||||||
export const CAPABILITY_IDS = [
|
|
||||||
"pdf_to_md_bundle",
|
|
||||||
"audio_video_to_text",
|
|
||||||
] as const;
|
|
||||||
|
|
||||||
export type CapabilityId = (typeof CAPABILITY_IDS)[number];
|
|
||||||
|
|
||||||
/** Non-token metering unit for a capability (ADR-0026/0027). */
|
|
||||||
export interface CapabilityDescriptor {
|
|
||||||
readonly id: CapabilityId;
|
|
||||||
readonly meteringUnit: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Known capabilities and their metering units. Code-level registry. */
|
|
||||||
export const CAPABILITIES: Readonly<Record<CapabilityId, CapabilityDescriptor>> = {
|
|
||||||
pdf_to_md_bundle: { id: "pdf_to_md_bundle", meteringUnit: "pages" },
|
|
||||||
audio_video_to_text: { id: "audio_video_to_text", meteringUnit: "audio_seconds" },
|
|
||||||
};
|
|
||||||
|
|
||||||
/** Input passed to a capability adapter invocation. */
|
|
||||||
export interface CapabilityInvocationInput {
|
|
||||||
readonly runId: string;
|
|
||||||
readonly organizationId: string;
|
|
||||||
readonly projectId: string;
|
|
||||||
/** Absolute workspace dir of the run's project (ADR-0018 surface root). */
|
|
||||||
readonly workspaceDir: string;
|
|
||||||
/** Workspace-relative path to the input file (PDF, audio, …). */
|
|
||||||
readonly inputPath: string;
|
|
||||||
/** Workspace-relative directory to write outputs into. Created if absent. */
|
|
||||||
readonly outputDir: string;
|
|
||||||
/** Prisma client for UsageFact writes. */
|
|
||||||
readonly prisma: PrismaClient;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** A successfully produced output artifact (file written into workspace). */
|
|
||||||
export interface CapabilityOutputArtifact {
|
|
||||||
/** Workspace-relative path of the written artifact. */
|
|
||||||
readonly path: string;
|
|
||||||
readonly kind: "markdown" | "image" | "metadata" | "other";
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Consumption recorded for one invocation (written to UsageFact). */
|
|
||||||
export interface CapabilityConsumption {
|
|
||||||
/** The backing service provider id (e.g. "mineru", "openai_whisper"). */
|
|
||||||
readonly provider: string;
|
|
||||||
/** Model id if the service reports one; null for non-model services. */
|
|
||||||
readonly model: string | null;
|
|
||||||
readonly inputTokens: number | null;
|
|
||||||
readonly outputTokens: number | null;
|
|
||||||
/** Non-token meter (page count, audio seconds). */
|
|
||||||
readonly quantity: number;
|
|
||||||
readonly unit: string;
|
|
||||||
/** USD cost if the service reported one; null = unknown (ADR-0022). */
|
|
||||||
readonly costUsd: number | null;
|
|
||||||
/** External request id for reconciliation. */
|
|
||||||
readonly correlationId: string | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Result of a successful capability invocation. */
|
|
||||||
export interface CapabilityInvocationResult {
|
|
||||||
readonly artifacts: readonly CapabilityOutputArtifact[];
|
|
||||||
readonly consumption: CapabilityConsumption;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** A capability adapter: resolves credentials, calls the service, writes output. */
|
|
||||||
export interface CapabilityAdapter {
|
|
||||||
readonly capabilityId: CapabilityId;
|
|
||||||
invoke(input: CapabilityInvocationInput): Promise<CapabilityInvocationResult>;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Decrypted capability credential (CapabilitySecretPayloadV1, ADR-0027).
|
|
||||||
* Alibaba Cloud Document Mind (docmind) uses AccessKey ID + Secret + endpoint. */
|
|
||||||
export interface CapabilitySecretPayload {
|
|
||||||
readonly schemaVersion: 1;
|
|
||||||
readonly accessKeyId: string;
|
|
||||||
readonly accessKeySecret: string;
|
|
||||||
readonly endpoint: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Thrown when an org has no ACTIVE capability connection (fail-closed, ADR-0024). */
|
|
||||||
export class CapabilityConnectionUnavailable extends Error {
|
|
||||||
constructor(readonly capabilityId: string, readonly organizationId: string) {
|
|
||||||
super(`no ACTIVE capability connection for ${capabilityId} in org ${organizationId}`);
|
|
||||||
this.name = "CapabilityConnectionUnavailable";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Prisma transaction client type alias (for resolver signatures). */
|
|
||||||
export type TxClient = Prisma.TransactionClient;
|
|
||||||
@@ -1,285 +0,0 @@
|
|||||||
import { mkdtemp, mkdir, writeFile, readFile, rm } from "node:fs/promises";
|
|
||||||
import { tmpdir } from "node:os";
|
|
||||||
import { join } from "node:path";
|
|
||||||
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
||||||
import { prisma, resetDb, seedTestOrganization, testSecretEnvelope, DEFAULT_ORG_ID } from "./helpers.js";
|
|
||||||
import { createPdfToMdBundleAdapter, CapabilityPathEscape } from "../../src/capability/pdfToMdBundle.js";
|
|
||||||
import { DocmindClientError, type CapabilityProviderClient, type DocmindParseResult } from "../../src/capability/docmindClient.js";
|
|
||||||
import type { CapabilitySecretPayload } from "../../src/capability/types.js";
|
|
||||||
|
|
||||||
const CAPABILITY_ID = "pdf_to_md_bundle";
|
|
||||||
const PROVIDER_ID = "aliyun_docmind";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* ADR-0027: pdf_to_md_bundle adapter contract tests. Proves:
|
|
||||||
* - workspace containment (input + output confined to run workspace)
|
|
||||||
* - fail-closed credential resolution (no ACTIVE connection → error)
|
|
||||||
* - UsageFact attribution with non-token meter (pages), costSource rules
|
|
||||||
* - outputs (md + images) written into workspace
|
|
||||||
* - docmind client errors propagate
|
|
||||||
* The client is mocked; the prisma + envelope + filesystem are real.
|
|
||||||
*/
|
|
||||||
describe("pdf_to_md_bundle capability adapter (ADR-0027)", () => {
|
|
||||||
let workspaceRoot: string;
|
|
||||||
let runId: string;
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
|
||||||
await resetDb();
|
|
||||||
await seedTestOrganization();
|
|
||||||
workspaceRoot = await mkdtemp(join(tmpdir(), "cph-cap-"));
|
|
||||||
runId = "run-cap-test";
|
|
||||||
// AgentRun is required for the UsageFact FK.
|
|
||||||
await prisma.project.create({
|
|
||||||
data: {
|
|
||||||
id: "proj-cap",
|
|
||||||
organizationId: DEFAULT_ORG_ID,
|
|
||||||
name: "Cap Test",
|
|
||||||
workspaceDir: workspaceRoot,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
await prisma.agentRun.create({
|
|
||||||
data: {
|
|
||||||
id: runId,
|
|
||||||
projectId: "proj-cap",
|
|
||||||
entrypoint: "FEISHU",
|
|
||||||
provider: "openrouter",
|
|
||||||
model: "mock-model",
|
|
||||||
status: "ACTIVE",
|
|
||||||
prompt: "convert this pdf",
|
|
||||||
metadata: {},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(async () => {
|
|
||||||
await rm(workspaceRoot, { recursive: true, force: true }).catch(() => {});
|
|
||||||
});
|
|
||||||
|
|
||||||
async function seedActiveCapabilityConnection(): Promise<void> {
|
|
||||||
const payload: CapabilitySecretPayload = {
|
|
||||||
schemaVersion: 1,
|
|
||||||
accessKeyId: "LTAI-test-key-id",
|
|
||||||
accessKeySecret: "test-secret-never-log",
|
|
||||||
endpoint: "docmind-api.cn-hangzhou.aliyuncs.com",
|
|
||||||
};
|
|
||||||
const connection = await prisma.organizationCapabilityConnection.create({
|
|
||||||
data: {
|
|
||||||
id: "cap-conn-1",
|
|
||||||
organizationId: DEFAULT_ORG_ID,
|
|
||||||
capabilityId: CAPABILITY_ID,
|
|
||||||
status: "ACTIVE",
|
|
||||||
activatedAt: new Date(),
|
|
||||||
},
|
|
||||||
});
|
|
||||||
const envelope = testSecretEnvelope.encryptJson(
|
|
||||||
{
|
|
||||||
purpose: "capability",
|
|
||||||
organizationId: DEFAULT_ORG_ID,
|
|
||||||
connectionId: connection.id,
|
|
||||||
secretVersionId: "cap-sv-1",
|
|
||||||
},
|
|
||||||
payload,
|
|
||||||
);
|
|
||||||
await prisma.capabilityCredentialVersion.create({
|
|
||||||
data: {
|
|
||||||
id: "cap-sv-1",
|
|
||||||
connectionId: connection.id,
|
|
||||||
version: 1,
|
|
||||||
envelope: envelope as object,
|
|
||||||
keyId: envelope.keyId,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
await prisma.organizationCapabilityConnection.update({
|
|
||||||
where: { id: connection.id },
|
|
||||||
data: { activeSecretVersionId: "cap-sv-1" },
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function mockDocmindClient(result: Partial<DocmindParseResult> = {}): CapabilityProviderClient {
|
|
||||||
const full: DocmindParseResult = {
|
|
||||||
markdown: "# Parsed Document\n\nHello world.\n\n\n",
|
|
||||||
images: [
|
|
||||||
{ filename: "page_1.jpg", data: new Uint8Array([0xff, 0xd8, 0xff, 0xe0]) },
|
|
||||||
],
|
|
||||||
pageCount: 3,
|
|
||||||
costUsd: 0.0168,
|
|
||||||
requestId: "docmind-job-abc",
|
|
||||||
...result,
|
|
||||||
};
|
|
||||||
return {
|
|
||||||
parse: vi.fn(async (): Promise<DocmindParseResult> => full),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function makeAdapter(client: CapabilityProviderClient) {
|
|
||||||
return createPdfToMdBundleAdapter({
|
|
||||||
secrets: testSecretEnvelope,
|
|
||||||
client,
|
|
||||||
prisma,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
async function seedInputPdf(name: string = "input.pdf"): Promise<string> {
|
|
||||||
const dir = join(workspaceRoot, "sources");
|
|
||||||
await mkdir(dir, { recursive: true });
|
|
||||||
const path = join(dir, name);
|
|
||||||
await writeFile(path, "%PDF-1.4 fake pdf bytes");
|
|
||||||
return join("sources", name);
|
|
||||||
}
|
|
||||||
|
|
||||||
it("writes md + images into the workspace and records a UsageFact", async () => {
|
|
||||||
await seedActiveCapabilityConnection();
|
|
||||||
const inputPath = await seedInputPdf();
|
|
||||||
const client = mockDocmindClient();
|
|
||||||
const adapter = makeAdapter(client);
|
|
||||||
|
|
||||||
const result = await adapter.invoke({
|
|
||||||
runId,
|
|
||||||
organizationId: DEFAULT_ORG_ID,
|
|
||||||
projectId: "proj-cap",
|
|
||||||
workspaceDir: workspaceRoot,
|
|
||||||
inputPath,
|
|
||||||
outputDir: "output",
|
|
||||||
prisma,
|
|
||||||
});
|
|
||||||
|
|
||||||
// Outputs landed in workspace.
|
|
||||||
const md = await readFile(join(workspaceRoot, "output", "document.md"), "utf8");
|
|
||||||
expect(md).toContain("# Parsed Document");
|
|
||||||
expect(result.artifacts.some((a) => a.kind === "markdown" && a.path === "output/document.md")).toBe(true);
|
|
||||||
expect(result.artifacts.some((a) => a.kind === "image" && a.path === "output/page_1.jpg")).toBe(true);
|
|
||||||
|
|
||||||
// Client received the decrypted credential, not the env.
|
|
||||||
const call = (client.parse as ReturnType<typeof vi.fn>).mock.calls[0]?.[0] as CapabilitySecretPayload;
|
|
||||||
expect(call.accessKeyId).toBe("LTAI-test-key-id");
|
|
||||||
expect(call.endpoint).toBe("docmind-api.cn-hangzhou.aliyuncs.com");
|
|
||||||
|
|
||||||
// UsageFact written with non-token meter and provider_reported cost.
|
|
||||||
const facts = await prisma.usageFact.findMany({ where: { runId } });
|
|
||||||
expect(facts).toHaveLength(1);
|
|
||||||
const fact = facts[0]!;
|
|
||||||
expect(fact.kind).toBe("external_capability");
|
|
||||||
expect(fact.provider).toBe(PROVIDER_ID);
|
|
||||||
expect(fact.capabilityId).toBe(CAPABILITY_ID);
|
|
||||||
expect(Number(fact.quantity)).toBe(3);
|
|
||||||
expect(fact.unit).toBe("pages");
|
|
||||||
expect(Number(fact.costUsd!)).toBeCloseTo(0.0168, 8);
|
|
||||||
expect(fact.costSource).toBe("provider_reported");
|
|
||||||
expect(fact.correlationId).toBe("docmind-job-abc");
|
|
||||||
});
|
|
||||||
|
|
||||||
it("writes UsageFact with costSource=unknown when docmind reports no cost", async () => {
|
|
||||||
await seedActiveCapabilityConnection();
|
|
||||||
const inputPath = await seedInputPdf();
|
|
||||||
const client = mockDocmindClient({ costUsd: null, requestId: null });
|
|
||||||
const adapter = makeAdapter(client);
|
|
||||||
|
|
||||||
await adapter.invoke({
|
|
||||||
runId,
|
|
||||||
organizationId: DEFAULT_ORG_ID,
|
|
||||||
projectId: "proj-cap",
|
|
||||||
workspaceDir: workspaceRoot,
|
|
||||||
inputPath,
|
|
||||||
outputDir: "output",
|
|
||||||
prisma,
|
|
||||||
});
|
|
||||||
|
|
||||||
const fact = (await prisma.usageFact.findFirstOrThrow({ where: { runId } }));
|
|
||||||
expect(fact.costUsd).toBeNull();
|
|
||||||
expect(fact.costSource).toBe("unknown");
|
|
||||||
// quantity still recorded — missing cost ≠ zero consumption (ADR-0022).
|
|
||||||
expect(Number(fact.quantity)).toBe(3);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("fails closed when the org has no ACTIVE capability connection", async () => {
|
|
||||||
// No connection seeded.
|
|
||||||
const inputPath = await seedInputPdf();
|
|
||||||
const adapter = makeAdapter(mockDocmindClient());
|
|
||||||
|
|
||||||
await expect(adapter.invoke({
|
|
||||||
runId,
|
|
||||||
organizationId: DEFAULT_ORG_ID,
|
|
||||||
projectId: "proj-cap",
|
|
||||||
workspaceDir: workspaceRoot,
|
|
||||||
inputPath,
|
|
||||||
outputDir: "output",
|
|
||||||
prisma,
|
|
||||||
})).rejects.toThrow(/no ACTIVE capability connection/);
|
|
||||||
|
|
||||||
// No UsageFact written for a failed resolution.
|
|
||||||
const facts = await prisma.usageFact.findMany({ where: { runId } });
|
|
||||||
expect(facts).toHaveLength(0);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("rejects an input path that escapes the workspace", async () => {
|
|
||||||
await seedActiveCapabilityConnection();
|
|
||||||
const adapter = makeAdapter(mockDocmindClient());
|
|
||||||
|
|
||||||
await expect(adapter.invoke({
|
|
||||||
runId,
|
|
||||||
organizationId: DEFAULT_ORG_ID,
|
|
||||||
projectId: "proj-cap",
|
|
||||||
workspaceDir: workspaceRoot,
|
|
||||||
inputPath: "../../../etc/passwd",
|
|
||||||
outputDir: "output",
|
|
||||||
prisma,
|
|
||||||
})).rejects.toBeInstanceOf(CapabilityPathEscape);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("rejects an output path that escapes the workspace", async () => {
|
|
||||||
await seedActiveCapabilityConnection();
|
|
||||||
const inputPath = await seedInputPdf();
|
|
||||||
const adapter = makeAdapter(mockDocmindClient());
|
|
||||||
|
|
||||||
await expect(adapter.invoke({
|
|
||||||
runId,
|
|
||||||
organizationId: DEFAULT_ORG_ID,
|
|
||||||
projectId: "proj-cap",
|
|
||||||
workspaceDir: workspaceRoot,
|
|
||||||
inputPath,
|
|
||||||
outputDir: "../../outside",
|
|
||||||
prisma,
|
|
||||||
})).rejects.toBeInstanceOf(CapabilityPathEscape);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("propagates docmind client errors without writing a UsageFact", async () => {
|
|
||||||
await seedActiveCapabilityConnection();
|
|
||||||
const inputPath = await seedInputPdf();
|
|
||||||
const client: CapabilityProviderClient = {
|
|
||||||
parse: vi.fn(async (): Promise<DocmindParseResult> => {
|
|
||||||
throw new DocmindClientError("upstream 502", "docmind_rejected", 502);
|
|
||||||
}),
|
|
||||||
};
|
|
||||||
const adapter = makeAdapter(client);
|
|
||||||
|
|
||||||
await expect(adapter.invoke({
|
|
||||||
runId,
|
|
||||||
organizationId: DEFAULT_ORG_ID,
|
|
||||||
projectId: "proj-cap",
|
|
||||||
workspaceDir: workspaceRoot,
|
|
||||||
inputPath,
|
|
||||||
outputDir: "output",
|
|
||||||
prisma,
|
|
||||||
})).rejects.toThrow(/upstream 502/);
|
|
||||||
|
|
||||||
const facts = await prisma.usageFact.findMany({ where: { runId } });
|
|
||||||
expect(facts).toHaveLength(0);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("rejects empty markdown output as a parse failure", async () => {
|
|
||||||
await seedActiveCapabilityConnection();
|
|
||||||
const inputPath = await seedInputPdf();
|
|
||||||
const client = mockDocmindClient({ markdown: "" });
|
|
||||||
const adapter = makeAdapter(client);
|
|
||||||
|
|
||||||
await expect(adapter.invoke({
|
|
||||||
runId,
|
|
||||||
organizationId: DEFAULT_ORG_ID,
|
|
||||||
projectId: "proj-cap",
|
|
||||||
workspaceDir: workspaceRoot,
|
|
||||||
inputPath,
|
|
||||||
outputDir: "output",
|
|
||||||
prisma,
|
|
||||||
})).rejects.toThrow(/empty markdown/);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -11,7 +11,6 @@ import Spec.System.Agent.AgentRole
|
|||||||
import Spec.System.Agent.Memory
|
import Spec.System.Agent.Memory
|
||||||
import Spec.System.Agent.AgentSurface
|
import Spec.System.Agent.AgentSurface
|
||||||
import Spec.System.Agent.Usage
|
import Spec.System.Agent.Usage
|
||||||
import Spec.System.Agent.Capability
|
|
||||||
import Spec.System.Lock
|
import Spec.System.Lock
|
||||||
import Spec.System.Permission
|
import Spec.System.Permission
|
||||||
import Spec.System.PermissionGrant
|
import Spec.System.PermissionGrant
|
||||||
@@ -44,14 +43,11 @@ likec4 已画出结构;这里补语义:
|
|||||||
- `Usage` —— Run 内 append-only 用量计量事实账本(ADR-0026);主模型 completion、
|
- `Usage` —— Run 内 append-only 用量计量事实账本(ADR-0026);主模型 completion、
|
||||||
外部能力调用、代理网关旁路共用同一账本。fact 不持锁、不跨 run;`costUsd = none`
|
外部能力调用、代理网关旁路共用同一账本。fact 不持锁、不跨 run;`costUsd = none`
|
||||||
表示未知而非零(ADR-0022)。Run 上的 cost/token 标量是其 rollup cache。
|
表示未知而非零(ADR-0022)。Run 上的 cost/token 标量是其 rollup cache。
|
||||||
- `Capability` —— 外部能力(PDF→MD、音视频→文本等)注册与调用(ADR-0027);
|
|
||||||
org-scoped 凭证连接复用 ADR-0024 信封但独立于 model-provider;调用是 Run 内副作用,
|
|
||||||
产物落 workspace,消耗记 UsageFact。capability credential 不进 Agent 进程。
|
|
||||||
- `Permission` —— read⊂edit⊂manage 角色体系、能力推导、单调性;force-release 在格外。
|
- `Permission` —— read⊂edit⊂manage 角色体系、能力推导、单调性;force-release 在格外。
|
||||||
- `PermissionGrant` —— grant(resource×principal×role)与 settings(六 policy 旋钮)
|
- `PermissionGrant` —— grant(resource×principal×role)与 settings(六 policy 旋钮)
|
||||||
(ADR-0004);组合规则 OPEN。
|
(ADR-0004);组合规则 OPEN。
|
||||||
- `Audit` —— customer Project/Run 审计从简(内容 OPEN);Platform Audit 由
|
- `Audit` —— customer Project/Run 审计从简(内容 OPEN);Platform Audit 由
|
||||||
`PlatformAdministration` 独立承载。
|
`PlatformAdministration` 独立承载。
|
||||||
|
|
||||||
标识符见 `Spec.Prelude`。决策出处:ADR-0001..0004, 0018, 0020..0027。
|
标识符见 `Spec.Prelude`。决策出处:ADR-0001..0004, 0018, 0020..0026。
|
||||||
-/
|
-/
|
||||||
|
|||||||
@@ -1,104 +0,0 @@
|
|||||||
import Spec.Prelude
|
|
||||||
import Spec.System.Agent.Run
|
|
||||||
import Spec.System.Agent.Usage
|
|
||||||
|
|
||||||
/-!
|
|
||||||
# Capability —— 外部能力注册与调用(ADR-0027)
|
|
||||||
|
|
||||||
`AgentRun` 内可能调用**外部能力**:PDF→MD bundle、音视频→文本、OCR 等。这些能力
|
|
||||||
不是主 agent loop 的模型 completion,不持项目锁,不占 session 语义(ADR-0026 已拒绝
|
|
||||||
nested Run)。它们是 Run 内的副作用:读 workspace 输入、调外部服务、产物落 workspace、
|
|
||||||
写一条 `UsageFact`。
|
|
||||||
|
|
||||||
本模块 pin 三件事:
|
|
||||||
|
|
||||||
1. **ExternalCapability** —— 平台注册的、org 启用的文档/媒体转换服务,由稳定
|
|
||||||
`capabilityId` 标识。
|
|
||||||
2. **CapabilityConnection** —— org-scoped 凭证连接,复用 ADR-0024 信封机制但独立于
|
|
||||||
model-provider connection。只有 `active` connection 可被 resolver 使用。
|
|
||||||
3. **CapabilityInvocation 良构** —— 调用的输入/输出必须落在 run 的 workspace 内
|
|
||||||
(ADR-0018 `AgentSurface`),且调用产生的消耗必须以 `UsageFact` 记录。
|
|
||||||
|
|
||||||
凭证不经 Agent 子进程:Agent 只通过 capability adapter 间接调用,adapter 在 Hub 侧
|
|
||||||
解析 org-scoped 凭证并调用外部服务(ADR-0024 resolver boundary)。这与 model-provider
|
|
||||||
的 loopback proxy 是不同的机制——capability 调用不走 agent 的网络面,走 Hub 直连。
|
|
||||||
|
|
||||||
不变式(`PINNED`, ADR-0027):
|
|
||||||
|
|
||||||
- **凭证隔离** —— capability credential 不进 Agent 进程环境;adapter 在 Hub 侧解析。
|
|
||||||
- **workspace 边界** —— 输入路径与输出目录都必须落在 run 的 workspace 内(ADR-0018)。
|
|
||||||
- **必记 fact** —— 一次成功调用必须产生 ≥1 条 `UsageFact`(`kind = externalCapability`),
|
|
||||||
即使 `costUsd = none`(unknown ≠ 零,ADR-0022/0026)。
|
|
||||||
|
|
||||||
`CapabilityInvocation` 作为一等持久记录(status/retries/partial output)在 pilot 不做;
|
|
||||||
`UsageFact` 的 `capabilityId + correlationId` 是唯一可追溯痕迹(ADR-0027 Deferred)。
|
|
||||||
-/
|
|
||||||
|
|
||||||
namespace Spec.System.Agent
|
|
||||||
|
|
||||||
variable (I : Identifiers) (Path : Type)
|
|
||||||
|
|
||||||
/-- 外部能力的输入种类(`PINNED`, ADR-0027)。集合 `OPEN`——新增 kind 须 surface。 -/
|
|
||||||
inductive CapabilityInputKind where
|
|
||||||
/-- PDF 文档(`PINNED`)。 -/
|
|
||||||
| pdf
|
|
||||||
/-- 图片(`PINNED`)。 -/
|
|
||||||
| image
|
|
||||||
/-- 音频(`PINNED`)。 -/
|
|
||||||
| audio
|
|
||||||
/-- 视频(`PINNED`)。 -/
|
|
||||||
| video
|
|
||||||
|
|
||||||
/-- 外部能力(`PINNED`, ADR-0027)。平台注册的文档/媒体转换服务,由 org 启用。
|
|
||||||
|
|
||||||
一个 capability 由稳定 `capabilityId` 标识(如 `pdf_to_md_bundle`),声明接受的输入
|
|
||||||
种类与计量单位。org 通过 `CapabilityConnection` 启用它;adapter 是平台侧实现。 -/
|
|
||||||
structure ExternalCapability where
|
|
||||||
/-- 稳定能力标识(`PINNED`;如 `pdf_to_md_bundle`、`audio_video_to_text`)。 -/
|
|
||||||
capabilityId : String
|
|
||||||
/-- 接受的输入种类(`PINNED`, ADR-0027)。 -/
|
|
||||||
inputKind : CapabilityInputKind
|
|
||||||
/-- 计量单位(`OPEN`;如 `"pages"`、`"audio_seconds"`)。与 UsageFact.unit 对齐。 -/
|
|
||||||
meteringUnit : String
|
|
||||||
|
|
||||||
/-- capability connection 的运行态(`PINNED`, ADR-0024/0027):与 model-provider /
|
|
||||||
Feishu connection 同构,只有 `active` 可被 resolver 使用。 -/
|
|
||||||
inductive CapabilityConnectionStatus where
|
|
||||||
| draft
|
|
||||||
| active
|
|
||||||
| disabled
|
|
||||||
|
|
||||||
/-- Organization 的外部能力凭证连接(`PINNED`, ADR-0027)。复用 ADR-0024 信封机制
|
|
||||||
但独立于 model-provider connection:capability 服务(如 MinerU、Whisper)有自己的 auth
|
|
||||||
形状与 readiness probe,不走 OpenRouter `/v1/models`。唯一性键为
|
|
||||||
`(organization, capabilityId)`。 -/
|
|
||||||
structure OrganizationCapabilityConnection where
|
|
||||||
/-- connection 所属 organization(`PINNED`, ADR-0027)。 -/
|
|
||||||
organization : I.OrganizationId
|
|
||||||
/-- 该 connection 启用的 capability(`PINNED`, ADR-0027)。 -/
|
|
||||||
capability : ExternalCapability
|
|
||||||
/-- 运行态(`PINNED`, ADR-0024/0027)。 -/
|
|
||||||
status : CapabilityConnectionStatus
|
|
||||||
|
|
||||||
/-- 一次 capability 调用的良构约束(`PINNED`, ADR-0027)。输入路径与输出目录都必须落在
|
|
||||||
发起 run 的 workspace 内(ADR-0018 `AgentSurface`);`runWorkspace` 与 `pathWithin`
|
|
||||||
由平台提供(表示 `OPEN`)。逃逸即越权,拒绝。 -/
|
|
||||||
structure CapabilityInvocation where
|
|
||||||
/-- 发起调用的 run(`PINNED`;调用是 Run 内副作用,不跨 run,ADR-0026/0027)。 -/
|
|
||||||
run : I.RunId
|
|
||||||
/-- 被调用的 capability(`PINNED`)。 -/
|
|
||||||
capability : ExternalCapability
|
|
||||||
/-- 输入路径(workspace 内,`PINNED`, ADR-0018)。 -/
|
|
||||||
inputPath : Path
|
|
||||||
/-- 输出目录(workspace 内,`PINNED`, ADR-0018)。 -/
|
|
||||||
outputDir : Path
|
|
||||||
|
|
||||||
/-- capability 调用良构:输入与输出路径都落在 run 的 workspace 内(`PINNED`,
|
|
||||||
ADR-0018/0027)。这是 `AgentFileOp.Authorized` 在 capability 调用上的对应物。 -/
|
|
||||||
def CapabilityInvocation.Authorized
|
|
||||||
(inv : CapabilityInvocation I Path)
|
|
||||||
(runWorkspace : I.RunId → Option Path)
|
|
||||||
(pathWithin : Path → Path → Prop) : Prop :=
|
|
||||||
∃ w, runWorkspace inv.run = some w ∧ pathWithin inv.inputPath w ∧ pathWithin inv.outputDir w
|
|
||||||
|
|
||||||
end Spec.System.Agent
|
|
||||||
Reference in New Issue
Block a user