@cef-ai/cli 2.0.2 → 2.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +19 -1
- package/dist/build/manifest.d.ts +39 -4
- package/dist/build/manifest.d.ts.map +1 -1
- package/dist/build/manifest.js +3 -1
- package/dist/build/manifest.js.map +1 -1
- package/dist/cli-program.d.ts.map +1 -1
- package/dist/cli-program.js +132 -16
- package/dist/cli-program.js.map +1 -1
- package/dist/commands/deploy.d.ts.map +1 -1
- package/dist/commands/deploy.js +2 -9
- package/dist/commands/deploy.js.map +1 -1
- package/dist/commands/external.d.ts +141 -0
- package/dist/commands/external.d.ts.map +1 -0
- package/dist/commands/external.js +267 -0
- package/dist/commands/external.js.map +1 -0
- package/dist/commands/publish.d.ts.map +1 -1
- package/dist/commands/publish.js +2 -9
- package/dist/commands/publish.js.map +1 -1
- package/dist/commands/push.d.ts.map +1 -1
- package/dist/commands/push.js +14 -28
- package/dist/commands/push.js.map +1 -1
- package/dist/lib/ddc.d.ts +29 -12
- package/dist/lib/ddc.d.ts.map +1 -1
- package/dist/lib/ddc.js +133 -12
- package/dist/lib/ddc.js.map +1 -1
- package/dist/lib/identity.d.ts +13 -0
- package/dist/lib/identity.d.ts.map +1 -0
- package/dist/lib/identity.js +21 -0
- package/dist/lib/identity.js.map +1 -0
- package/dist/lib/widget-manifest.d.ts +6 -5
- package/dist/lib/widget-manifest.d.ts.map +1 -1
- package/dist/lib/widget-manifest.js +2 -1
- package/dist/lib/widget-manifest.js.map +1 -1
- package/dist/lib.d.ts +2 -0
- package/dist/lib.d.ts.map +1 -1
- package/dist/lib.js +1 -0
- package/dist/lib.js.map +1 -1
- package/package.json +3 -3
|
@@ -0,0 +1,141 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `cef push --kind external` — register an agent that runs SOMEWHERE ELSE.
|
|
3
|
+
*
|
|
4
|
+
* An external agent has no code of ours. It is a service someone else operates,
|
|
5
|
+
* speaking [A2A](https://agent2agent.info), and the only thing the platform
|
|
6
|
+
* needs to know about it is where its Agent Card lives. Everything else —
|
|
7
|
+
* endpoint, skills, security schemes, capabilities — the card already says, and
|
|
8
|
+
* it says it at the moment of use rather than at the moment of registration.
|
|
9
|
+
*
|
|
10
|
+
* So this command does not build, bundle, or compile anything. It fetches the
|
|
11
|
+
* card, checks it is really an A2A card, derives a manifest from it, and pushes
|
|
12
|
+
* that manifest into the same bucket DAG `cef push` writes to. From that point
|
|
13
|
+
* the agent is indistinguishable from any other in the registry: it appears in
|
|
14
|
+
* ROC, it can be connected to a vault, and events dispatch to it.
|
|
15
|
+
*
|
|
16
|
+
* Signing identity is the same as `cef push`: a substrate (Sr25519) bucket
|
|
17
|
+
* owner phrase, or an access token that owner minted.
|
|
18
|
+
*/
|
|
19
|
+
import { type DdcModule, type DdcPreset } from "../lib/ddc.js";
|
|
20
|
+
import type { CefManifest } from "../build/manifest.js";
|
|
21
|
+
export interface CefExternalOptions {
|
|
22
|
+
/**
|
|
23
|
+
* URL of the agent's A2A Agent Card. A bare origin is accepted and the
|
|
24
|
+
* well-known path is appended, because that is what people paste.
|
|
25
|
+
*/
|
|
26
|
+
card: string;
|
|
27
|
+
/**
|
|
28
|
+
* Registry alias — the per-agent record name in the bucket DAG and the second
|
|
29
|
+
* half of `agentId`. Defaults to a slug of the card's own name, so the common
|
|
30
|
+
* case needs no flag.
|
|
31
|
+
*/
|
|
32
|
+
alias?: string;
|
|
33
|
+
/** Semver for this registration. Defaults to {@link DEFAULT_VERSION}. */
|
|
34
|
+
version?: string;
|
|
35
|
+
/** Vault scopes the agent asks for. Consent is still the user's, at connect. */
|
|
36
|
+
scopes?: string[];
|
|
37
|
+
/**
|
|
38
|
+
* How long a Job — the conversation — survives with no events, e.g. "45m".
|
|
39
|
+
* Defaults to {@link DEFAULT_IDLE_TIMEOUT}. See that constant for why this is
|
|
40
|
+
* not left to the deployment default.
|
|
41
|
+
*/
|
|
42
|
+
idleTimeout?: string;
|
|
43
|
+
/** DDC bucket id (decimal). The substrate signer must own it. */
|
|
44
|
+
bucket: number | bigint | string;
|
|
45
|
+
/** Sr25519 phrase for the bucket owner. Mutually exclusive with `accessToken`. */
|
|
46
|
+
secretPhrase?: string;
|
|
47
|
+
/** DDC access token minted by the bucket owner. Mutually exclusive with `secretPhrase`. */
|
|
48
|
+
accessToken?: string;
|
|
49
|
+
/** Agent Service pubkey (hex, as shown in ROC) — stamped into the identity. */
|
|
50
|
+
agentServicePubkey?: string;
|
|
51
|
+
preset?: DdcPreset;
|
|
52
|
+
endpoint?: string;
|
|
53
|
+
cdn?: string;
|
|
54
|
+
/** Test seam: inject the DDC module instead of importing it. */
|
|
55
|
+
ddcModuleImpl?: DdcModule;
|
|
56
|
+
/** Test seam: inject the card fetcher. Defaults to global `fetch`. */
|
|
57
|
+
fetchImpl?: typeof fetch;
|
|
58
|
+
}
|
|
59
|
+
export interface CefExternalResult {
|
|
60
|
+
agentId: string;
|
|
61
|
+
alias: string;
|
|
62
|
+
version: string;
|
|
63
|
+
cardUrl: string;
|
|
64
|
+
/** The card's own name, for the confirmation line. */
|
|
65
|
+
cardName: string;
|
|
66
|
+
bucketId: string;
|
|
67
|
+
manifestCid: string;
|
|
68
|
+
versionCid: string;
|
|
69
|
+
recordCid: string;
|
|
70
|
+
directoryCid: string;
|
|
71
|
+
}
|
|
72
|
+
/** The slice of the A2A Agent Card this command reads. The agent serves the whole thing. */
|
|
73
|
+
interface A2AAgentCard {
|
|
74
|
+
name?: string;
|
|
75
|
+
description?: string;
|
|
76
|
+
version?: string;
|
|
77
|
+
/**
|
|
78
|
+
* Where the current spec puts the endpoints: "Ordered list of supported
|
|
79
|
+
* interfaces. The first entry is preferred." A real card carries no
|
|
80
|
+
* top-level `url` at all.
|
|
81
|
+
*/
|
|
82
|
+
supportedInterfaces?: A2AInterface[];
|
|
83
|
+
/** The 0.3 spellings, read so an older card still resolves. */
|
|
84
|
+
interfaces?: A2AInterface[];
|
|
85
|
+
url?: string;
|
|
86
|
+
skills?: Array<{
|
|
87
|
+
id?: string;
|
|
88
|
+
name?: string;
|
|
89
|
+
description?: string;
|
|
90
|
+
}>;
|
|
91
|
+
}
|
|
92
|
+
/** `protocolBinding` is the current field name; 0.3 called it `transport`. */
|
|
93
|
+
interface A2AInterface {
|
|
94
|
+
url?: string;
|
|
95
|
+
protocolBinding?: string;
|
|
96
|
+
transport?: string;
|
|
97
|
+
}
|
|
98
|
+
/**
|
|
99
|
+
* Accept either a full card URL or the origin it lives under. Pasting an origin
|
|
100
|
+
* is the common mistake and the fix is unambiguous, so we make it rather than
|
|
101
|
+
* report it.
|
|
102
|
+
*/
|
|
103
|
+
export declare function normalizeCardUrl(input: string): string;
|
|
104
|
+
/**
|
|
105
|
+
* Slug a card name into a registry alias: lowercase, non-alphanumerics folded
|
|
106
|
+
* to single dashes. The alias is a DAG link name and half of `agentId`, so it
|
|
107
|
+
* has to be stable and boring even when the card's name is neither.
|
|
108
|
+
*/
|
|
109
|
+
export declare function aliasFromCardName(name: string): string;
|
|
110
|
+
/**
|
|
111
|
+
* Check an alias the person typed.
|
|
112
|
+
*
|
|
113
|
+
* A derived alias cannot contain `:` — the slug folds it away — but an explicit
|
|
114
|
+
* `--alias "a:b"` produces `agentId = "<pubkey>:a:b"`, and everything that
|
|
115
|
+
* reads an agentId splits on the LAST colon to recover the peer name
|
|
116
|
+
* (`ctx.self`, the peer table). So `a:b` would be read back as the agent
|
|
117
|
+
* `<pubkey>:a` named `b`, silently, in a value that is then immutable in DDC.
|
|
118
|
+
* Refuse it here, where it costs one message.
|
|
119
|
+
*/
|
|
120
|
+
export declare function checkExplicitAlias(alias: string): string;
|
|
121
|
+
/**
|
|
122
|
+
* Build the manifest for a external agent.
|
|
123
|
+
*
|
|
124
|
+
* Note what is absent and why: no `bundle` (there is no code), no `handles`
|
|
125
|
+
* (there are no handler functions — the connect saga writes a `*` subscription
|
|
126
|
+
* instead), no `engagements` (an engagement selects a handler, and there is
|
|
127
|
+
* one endpoint), no `cubbies`, no `eventSchemas`. Filling any of them with an
|
|
128
|
+
* empty placeholder would suggest the agent might grow one.
|
|
129
|
+
*/
|
|
130
|
+
export declare function buildExternalManifest(input: {
|
|
131
|
+
card: A2AAgentCard;
|
|
132
|
+
cardUrl: string;
|
|
133
|
+
alias: string;
|
|
134
|
+
version: string;
|
|
135
|
+
scopes: string[];
|
|
136
|
+
idleTimeoutMs: number;
|
|
137
|
+
agentServicePubkey?: string;
|
|
138
|
+
}): CefManifest;
|
|
139
|
+
export declare function cefRegisterExternal(opts: CefExternalOptions): Promise<CefExternalResult>;
|
|
140
|
+
export {};
|
|
141
|
+
//# sourceMappingURL=external.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"external.d.ts","sourceRoot":"","sources":["../../src/commands/external.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,267 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `cef push --kind external` — register an agent that runs SOMEWHERE ELSE.
|
|
3
|
+
*
|
|
4
|
+
* An external agent has no code of ours. It is a service someone else operates,
|
|
5
|
+
* speaking [A2A](https://agent2agent.info), and the only thing the platform
|
|
6
|
+
* needs to know about it is where its Agent Card lives. Everything else —
|
|
7
|
+
* endpoint, skills, security schemes, capabilities — the card already says, and
|
|
8
|
+
* it says it at the moment of use rather than at the moment of registration.
|
|
9
|
+
*
|
|
10
|
+
* So this command does not build, bundle, or compile anything. It fetches the
|
|
11
|
+
* card, checks it is really an A2A card, derives a manifest from it, and pushes
|
|
12
|
+
* that manifest into the same bucket DAG `cef push` writes to. From that point
|
|
13
|
+
* the agent is indistinguishable from any other in the registry: it appears in
|
|
14
|
+
* ROC, it can be connected to a vault, and events dispatch to it.
|
|
15
|
+
*
|
|
16
|
+
* Signing identity is the same as `cef push`: a substrate (Sr25519) bucket
|
|
17
|
+
* owner phrase, or an access token that owner minted.
|
|
18
|
+
*/
|
|
19
|
+
import { parseBucketId, pushAgentVersion, resolveDdcCredential, } from "../lib/ddc.js";
|
|
20
|
+
import { parseDuration } from "../build/duration.js";
|
|
21
|
+
/** Default when `--version` is omitted: the first version of anything. */
|
|
22
|
+
const DEFAULT_VERSION = "1.0.0";
|
|
23
|
+
/**
|
|
24
|
+
* How long a conversation with a external agent survives silence.
|
|
25
|
+
*
|
|
26
|
+
* This matters more here than for an internal agent, and it is worth saying why.
|
|
27
|
+
* A Job holds the A2A `contextId` — the remote agent's memory of this
|
|
28
|
+
* conversation — so when the orchestrator sweeps the Job as idle, the next event
|
|
29
|
+
* opens a NEW context and the agent meets you as a stranger. The gaps are human
|
|
30
|
+
* gaps: someone reading a Slack thread, or an agent parked on INPUT_REQUIRED
|
|
31
|
+
* waiting for an answer. Minutes, not seconds.
|
|
32
|
+
*
|
|
33
|
+
* Note that `0` does NOT mean "no timeout" to the orchestrator — it means "use
|
|
34
|
+
* the deployment default", which on a dev cluster can be 15 seconds. Leaving it
|
|
35
|
+
* unset is how you get a conversation that silently forgets between two
|
|
36
|
+
* messages.
|
|
37
|
+
*/
|
|
38
|
+
const DEFAULT_IDLE_TIMEOUT = "30m";
|
|
39
|
+
/** Where the A2A spec says a card lives, appended when a bare origin is given. */
|
|
40
|
+
const WELL_KNOWN_CARD_PATH = "/.well-known/agent-card.json";
|
|
41
|
+
/**
|
|
42
|
+
* Accept either a full card URL or the origin it lives under. Pasting an origin
|
|
43
|
+
* is the common mistake and the fix is unambiguous, so we make it rather than
|
|
44
|
+
* report it.
|
|
45
|
+
*/
|
|
46
|
+
export function normalizeCardUrl(input) {
|
|
47
|
+
const trimmed = input.trim();
|
|
48
|
+
if (!trimmed)
|
|
49
|
+
throw new Error("[cef push] --card is required");
|
|
50
|
+
let parsed;
|
|
51
|
+
try {
|
|
52
|
+
parsed = new URL(trimmed);
|
|
53
|
+
}
|
|
54
|
+
catch {
|
|
55
|
+
throw new Error(`[cef push] --card is not a URL: "${trimmed}"`);
|
|
56
|
+
}
|
|
57
|
+
if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
|
|
58
|
+
throw new Error(`[cef push] --card must be http(s): "${trimmed}"`);
|
|
59
|
+
}
|
|
60
|
+
if (parsed.pathname === "/" || parsed.pathname === "") {
|
|
61
|
+
parsed.pathname = WELL_KNOWN_CARD_PATH;
|
|
62
|
+
}
|
|
63
|
+
return parsed.toString();
|
|
64
|
+
}
|
|
65
|
+
/**
|
|
66
|
+
* Slug a card name into a registry alias: lowercase, non-alphanumerics folded
|
|
67
|
+
* to single dashes. The alias is a DAG link name and half of `agentId`, so it
|
|
68
|
+
* has to be stable and boring even when the card's name is neither.
|
|
69
|
+
*/
|
|
70
|
+
export function aliasFromCardName(name) {
|
|
71
|
+
const slug = name
|
|
72
|
+
.toLowerCase()
|
|
73
|
+
.replace(/[^a-z0-9]+/g, "-")
|
|
74
|
+
.replace(/^-+|-+$/g, "");
|
|
75
|
+
if (!slug) {
|
|
76
|
+
throw new Error("[cef push] could not derive an alias from the card name — pass --alias");
|
|
77
|
+
}
|
|
78
|
+
return slug;
|
|
79
|
+
}
|
|
80
|
+
/**
|
|
81
|
+
* Check an alias the person typed.
|
|
82
|
+
*
|
|
83
|
+
* A derived alias cannot contain `:` — the slug folds it away — but an explicit
|
|
84
|
+
* `--alias "a:b"` produces `agentId = "<pubkey>:a:b"`, and everything that
|
|
85
|
+
* reads an agentId splits on the LAST colon to recover the peer name
|
|
86
|
+
* (`ctx.self`, the peer table). So `a:b` would be read back as the agent
|
|
87
|
+
* `<pubkey>:a` named `b`, silently, in a value that is then immutable in DDC.
|
|
88
|
+
* Refuse it here, where it costs one message.
|
|
89
|
+
*/
|
|
90
|
+
export function checkExplicitAlias(alias) {
|
|
91
|
+
if (alias.includes(":")) {
|
|
92
|
+
throw new Error(`[cef push] --alias must not contain ":" (got "${alias}") — the colon `
|
|
93
|
+
+ "separates the pubkey from the alias in agentId, and an alias "
|
|
94
|
+
+ "carrying one is read back as a different agent");
|
|
95
|
+
}
|
|
96
|
+
return alias;
|
|
97
|
+
}
|
|
98
|
+
/** How long to wait for the card before giving up and saying so. */
|
|
99
|
+
const CARD_FETCH_TIMEOUT_MS = 15_000;
|
|
100
|
+
/**
|
|
101
|
+
* Fetch and sanity-check the card.
|
|
102
|
+
*
|
|
103
|
+
* The check is narrow on purpose: we verify the agent declares SOMEWHERE TO
|
|
104
|
+
* SEND, and nothing else. A card that lists no endpoint produces a registration
|
|
105
|
+
* that can never be invoked, and that failure is far better here — where a
|
|
106
|
+
* person is watching — than at the first event, in a worker, an hour later.
|
|
107
|
+
* Beyond that the card is theirs to define and ours to re-read at use.
|
|
108
|
+
*/
|
|
109
|
+
async function fetchCard(url, fetchImpl) {
|
|
110
|
+
let res;
|
|
111
|
+
try {
|
|
112
|
+
// Bounded: a card URL that accepts the connection and then never answers
|
|
113
|
+
// would otherwise hang the CLI forever with no output, which reads as a
|
|
114
|
+
// broken tool rather than an unreachable agent.
|
|
115
|
+
res = await fetchImpl(url, {
|
|
116
|
+
headers: { accept: "application/json" },
|
|
117
|
+
signal: AbortSignal.timeout(CARD_FETCH_TIMEOUT_MS),
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
catch (e) {
|
|
121
|
+
const why = e instanceof Error && e.name === "TimeoutError"
|
|
122
|
+
? `no response within ${CARD_FETCH_TIMEOUT_MS / 1000}s`
|
|
123
|
+
: e instanceof Error
|
|
124
|
+
? e.message
|
|
125
|
+
: String(e);
|
|
126
|
+
throw new Error(`[cef push] could not reach the agent card at ${url}: ${why}`);
|
|
127
|
+
}
|
|
128
|
+
if (!res.ok) {
|
|
129
|
+
throw new Error(`[cef push] agent card ${url} returned HTTP ${res.status}`);
|
|
130
|
+
}
|
|
131
|
+
let card;
|
|
132
|
+
try {
|
|
133
|
+
card = (await res.json());
|
|
134
|
+
}
|
|
135
|
+
catch {
|
|
136
|
+
throw new Error(`[cef push] agent card ${url} is not JSON`);
|
|
137
|
+
}
|
|
138
|
+
if (!cardEndpoint(card)) {
|
|
139
|
+
throw new Error(`[cef push] agent card ${url} declares no endpoint `
|
|
140
|
+
+ `(neither "url" nor a JSONRPC entry in "interfaces") — nothing could be sent to it`);
|
|
141
|
+
}
|
|
142
|
+
return card;
|
|
143
|
+
}
|
|
144
|
+
/**
|
|
145
|
+
* First JSON-RPC interface, falling back to the card's own `url`.
|
|
146
|
+
*
|
|
147
|
+
* Reads both spellings because the wild has both: the current spec's
|
|
148
|
+
* `supportedInterfaces`/`protocolBinding`, and 0.3's `interfaces`/`transport`.
|
|
149
|
+
* A non-JSON-RPC binding is skipped rather than sent JSON-RPC it does not speak.
|
|
150
|
+
*/
|
|
151
|
+
function cardEndpoint(card) {
|
|
152
|
+
for (const list of [card.supportedInterfaces ?? [], card.interfaces ?? []]) {
|
|
153
|
+
for (const i of list) {
|
|
154
|
+
const binding = i.protocolBinding ?? i.transport;
|
|
155
|
+
if ((!binding || binding === "JSONRPC") && i.url)
|
|
156
|
+
return i.url;
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
return card.url ?? "";
|
|
160
|
+
}
|
|
161
|
+
/**
|
|
162
|
+
* Build the manifest for a external agent.
|
|
163
|
+
*
|
|
164
|
+
* Note what is absent and why: no `bundle` (there is no code), no `handles`
|
|
165
|
+
* (there are no handler functions — the connect saga writes a `*` subscription
|
|
166
|
+
* instead), no `engagements` (an engagement selects a handler, and there is
|
|
167
|
+
* one endpoint), no `cubbies`, no `eventSchemas`. Filling any of them with an
|
|
168
|
+
* empty placeholder would suggest the agent might grow one.
|
|
169
|
+
*/
|
|
170
|
+
export function buildExternalManifest(input) {
|
|
171
|
+
const asPub = input.agentServicePubkey?.trim() ?? "";
|
|
172
|
+
return {
|
|
173
|
+
agentId: asPub ? `${asPub}:${input.alias}` : "",
|
|
174
|
+
agentServicePubkey: asPub,
|
|
175
|
+
version: input.version,
|
|
176
|
+
alias: input.alias,
|
|
177
|
+
kind: "external",
|
|
178
|
+
a2aCard: input.cardUrl,
|
|
179
|
+
// Omitted rather than empty when unset: an absent field reads as "not
|
|
180
|
+
// declared", which is what it is, and the orchestrator's transitional
|
|
181
|
+
// fallback handles it.
|
|
182
|
+
// The marketplace listing, taken from what the agent says about itself.
|
|
183
|
+
// A different thing from a2aCard despite the shared word: this one is a
|
|
184
|
+
// human-facing description, that one is a machine-facing address.
|
|
185
|
+
card: {
|
|
186
|
+
name: input.card.name || input.alias,
|
|
187
|
+
description: input.card.description || "",
|
|
188
|
+
},
|
|
189
|
+
requiredScopes: input.scopes,
|
|
190
|
+
idleTimeout: input.idleTimeoutMs,
|
|
191
|
+
settings: [],
|
|
192
|
+
engagements: [],
|
|
193
|
+
handles: [],
|
|
194
|
+
publishes: [],
|
|
195
|
+
eventSchemas: {},
|
|
196
|
+
cubbies: [],
|
|
197
|
+
models: {},
|
|
198
|
+
uses: {},
|
|
199
|
+
targeting: { engagements: [] },
|
|
200
|
+
source: "",
|
|
201
|
+
signature: "",
|
|
202
|
+
};
|
|
203
|
+
}
|
|
204
|
+
export async function cefRegisterExternal(opts) {
|
|
205
|
+
// One shared resolver with the internal path, because the last bug here was
|
|
206
|
+
// copy-drift between two of them.
|
|
207
|
+
const credential = resolveDdcCredential(opts);
|
|
208
|
+
const bucketId = parseBucketId(opts.bucket);
|
|
209
|
+
const cardUrl = normalizeCardUrl(opts.card);
|
|
210
|
+
const card = await fetchCard(cardUrl, opts.fetchImpl ?? fetch);
|
|
211
|
+
const explicitAlias = opts.alias?.trim();
|
|
212
|
+
const alias = explicitAlias
|
|
213
|
+
? checkExplicitAlias(explicitAlias)
|
|
214
|
+
: aliasFromCardName(card.name ?? "");
|
|
215
|
+
const version = opts.version?.trim() || DEFAULT_VERSION;
|
|
216
|
+
const scopes = opts.scopes?.length ? opts.scopes : ["default"];
|
|
217
|
+
const idleTimeoutMs = parseDuration(opts.idleTimeout ?? DEFAULT_IDLE_TIMEOUT, "idleTimeout");
|
|
218
|
+
// `0` does NOT mean "no timeout" to the orchestrator -- it means "use the
|
|
219
|
+
// deployment default", which on a dev cluster is 15 seconds. Someone typing
|
|
220
|
+
// it means the opposite, and this flag is the one place that can be caught
|
|
221
|
+
// with a person watching rather than as a conversation that forgets itself
|
|
222
|
+
// between two messages.
|
|
223
|
+
if (idleTimeoutMs === 0) {
|
|
224
|
+
throw new Error("[cef push] --idle-timeout 0 means \"use the deployment default\" (as little as 15s), "
|
|
225
|
+
+ "not \"never time out\". Give a real duration, e.g. 45m.");
|
|
226
|
+
}
|
|
227
|
+
console.log(`[cef push] ${card.name || alias} → ${cardEndpoint(card)}`);
|
|
228
|
+
if (card.skills?.length) {
|
|
229
|
+
console.log(` skills: ${card.skills.map((s) => s.id || s.name).join(", ")}`);
|
|
230
|
+
}
|
|
231
|
+
const manifest = buildExternalManifest({
|
|
232
|
+
card,
|
|
233
|
+
cardUrl,
|
|
234
|
+
alias,
|
|
235
|
+
version,
|
|
236
|
+
scopes,
|
|
237
|
+
idleTimeoutMs,
|
|
238
|
+
...(opts.agentServicePubkey !== undefined
|
|
239
|
+
? { agentServicePubkey: opts.agentServicePubkey }
|
|
240
|
+
: {}),
|
|
241
|
+
});
|
|
242
|
+
const result = await pushAgentVersion({
|
|
243
|
+
bucketId,
|
|
244
|
+
agentName: alias,
|
|
245
|
+
version,
|
|
246
|
+
// No bundleBytes: the version node carries manifest.json alone.
|
|
247
|
+
buildManifestBytes: () => new TextEncoder().encode(JSON.stringify(manifest, null, 2) + "\n"),
|
|
248
|
+
...credential,
|
|
249
|
+
...(opts.preset !== undefined ? { preset: opts.preset } : {}),
|
|
250
|
+
...(opts.endpoint !== undefined ? { endpoint: opts.endpoint } : {}),
|
|
251
|
+
...(opts.cdn !== undefined ? { cdn: opts.cdn } : {}),
|
|
252
|
+
...(opts.ddcModuleImpl !== undefined ? { ddcModuleImpl: opts.ddcModuleImpl } : {}),
|
|
253
|
+
});
|
|
254
|
+
return {
|
|
255
|
+
agentId: manifest.agentId,
|
|
256
|
+
alias,
|
|
257
|
+
version,
|
|
258
|
+
cardUrl,
|
|
259
|
+
cardName: card.name || alias,
|
|
260
|
+
bucketId: bucketId.toString(),
|
|
261
|
+
manifestCid: result.manifestCid,
|
|
262
|
+
versionCid: result.versionCid,
|
|
263
|
+
recordCid: result.recordCid,
|
|
264
|
+
directoryCid: result.directoryCid,
|
|
265
|
+
};
|
|
266
|
+
}
|
|
267
|
+
//# sourceMappingURL=external.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"external.js","sourceRoot":"","sources":["../../src/commands/external.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../src/commands/publish.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../src/commands/publish.ts"],"names":[],"mappings":"AA6CA,MAAM,WAAW,iBAAiB;IAChC,iEAAiE;IACjE,cAAc,EAAE,MAAM,CAAC;IACvB,mEAAmE;IACnE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gCAAgC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mCAAmC;IACnC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;;;;;OAOG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;;;;;;OAOG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAC/B,uEAAuE;IACvE,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,qEAAqE;IACrE,MAAM,EAAE,MAAM,CAAC;CAChB;AAgCD,wBAAsB,UAAU,CAC9B,IAAI,EAAE,iBAAiB,GACtB,OAAO,CAAC,gBAAgB,CAAC,CAqI3B"}
|
package/dist/commands/publish.js
CHANGED
|
@@ -40,6 +40,7 @@
|
|
|
40
40
|
import crypto from "node:crypto";
|
|
41
41
|
import fs from "node:fs/promises";
|
|
42
42
|
import path from "node:path";
|
|
43
|
+
import { canonicalAsPubkey } from "../lib/identity.js";
|
|
43
44
|
const DEFAULT_DIST = "dist";
|
|
44
45
|
export async function cefPublish(opts) {
|
|
45
46
|
const cwd = opts.cwd ? path.resolve(opts.cwd) : process.cwd();
|
|
@@ -102,15 +103,7 @@ export async function cefPublish(opts) {
|
|
|
102
103
|
if (!explicitAsPubkey) {
|
|
103
104
|
throw new Error("[cef publish] no AS pubkey to publish under — pass --as-pubkey or set agentServicePubkey in cef.config.ts");
|
|
104
105
|
}
|
|
105
|
-
|
|
106
|
-
// `as_pubkey`, always "0x"-prefixed (how ROC displays and copies it) — see
|
|
107
|
-
// deploy.ts's identical normalization for why stripping it breaks lookups.
|
|
108
|
-
// publish doesn't call the orchestrator directly, but this same value is
|
|
109
|
-
// what vault-api's connect saga compares against `manifest.agentId`'s
|
|
110
|
-
// prefix, so it must match what deploy registered under the same flag.
|
|
111
|
-
const asPubkey = explicitAsPubkey.startsWith("0x")
|
|
112
|
-
? explicitAsPubkey
|
|
113
|
-
: `0x${explicitAsPubkey}`;
|
|
106
|
+
const asPubkey = canonicalAsPubkey(explicitAsPubkey);
|
|
114
107
|
const compositeAgentId = `${asPubkey}:${alias}`;
|
|
115
108
|
// Card-only wire body. The full manifest stays in the DDC bucket registry
|
|
116
109
|
// (written by `cef push`); the marketplace only stores the card for
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../src/commands/publish.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../src/commands/publish.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../src/commands/push.ts"],"names":[],"mappings":"AAmBA,OAAO,
|
|
1
|
+
{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../src/commands/push.ts"],"names":[],"mappings":"AAmBA,OAAO,EAIL,KAAK,SAAS,EACd,KAAK,SAAS,EAEf,MAAM,eAAe,CAAC;AACvB,OAAO,EAAa,KAAK,MAAM,EAAE,MAAM,eAAe,CAAC;AAGvD,MAAM,WAAW,cAAc;IAC7B,gEAAgE;IAChE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IACjC;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oEAAoE;IACpE,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB;;;;;;OAMG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,yDAAyD;IACzD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;;;;;OASG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,sCAAsC;IACtC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,qEAAqE;IACrE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mCAAmC;IACnC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,mEAAmE;IACnE,aAAa,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,MAAM,WAAW,aAAa;IAC5B,qCAAqC;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,yCAAyC;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,qEAAqE;IACrE,GAAG,EAAE,MAAM,CAAC;IACZ,qEAAqE;IACrE,WAAW,EAAE,MAAM,CAAC;IACpB,wEAAwE;IACxE,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,mDAAmD;IACnD,YAAY,EAAE,MAAM,CAAC;IACrB,yFAAyF;IACzF,OAAO,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACnE;AAID,wBAAsB,OAAO,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAoN1E"}
|
package/dist/commands/push.js
CHANGED
|
@@ -15,8 +15,9 @@
|
|
|
15
15
|
*/
|
|
16
16
|
import fs from "node:fs/promises";
|
|
17
17
|
import path from "node:path";
|
|
18
|
-
import { pushAgentVersion, } from "../lib/ddc.js";
|
|
18
|
+
import { parseBucketId, pushAgentVersion, resolveDdcCredential, } from "../lib/ddc.js";
|
|
19
19
|
import { envConfig } from "../lib/env.js";
|
|
20
|
+
import { canonicalAsPubkey } from "../lib/identity.js";
|
|
20
21
|
const DEFAULT_DIST = "dist";
|
|
21
22
|
export async function cefPush(opts) {
|
|
22
23
|
const cwd = opts.cwd ? path.resolve(opts.cwd) : process.cwd();
|
|
@@ -27,18 +28,12 @@ export async function cefPush(opts) {
|
|
|
27
28
|
// Auth: either the bucket owner's secret phrase or an access token minted by
|
|
28
29
|
// that owner. Exactly one — a token lets you push to a bucket whose seed you
|
|
29
30
|
// don't hold (e.g. one generated in ROC by the AS bucket's owner wallet).
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
const
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
+ " --secret-phrase / $CEF_DDC_SECRET_PHRASE (the Sr25519 phrase that owns the bucket)\n"
|
|
37
|
-
+ " --access-token / $CEF_DDC_ACCESS_TOKEN (a token granted by the bucket owner)");
|
|
38
|
-
}
|
|
39
|
-
if (hasPhrase && hasToken) {
|
|
40
|
-
throw new Error("[cef push] both --secret-phrase and --access-token were provided — pass exactly one.");
|
|
41
|
-
}
|
|
31
|
+
// Resolved by the shared helper so this path and `--kind external` cannot
|
|
32
|
+
// drift apart again.
|
|
33
|
+
const credential = resolveDdcCredential({
|
|
34
|
+
...(opts.secretPhrase !== undefined ? { secretPhrase: opts.secretPhrase } : {}),
|
|
35
|
+
...(opts.accessToken !== undefined ? { accessToken: opts.accessToken } : {}),
|
|
36
|
+
});
|
|
42
37
|
const agentId = opts.agentId ?? (await autodetectAgentId(distDir));
|
|
43
38
|
const agentDir = path.join(distDir, agentId);
|
|
44
39
|
const manifestPath = path.join(agentDir, "manifest.json");
|
|
@@ -105,9 +100,11 @@ export async function cefPush(opts) {
|
|
|
105
100
|
// Without the agentId stamp a widget breaks `connectAgent()`; without the
|
|
106
101
|
// endpoint stamp it calls the wrong environment (a confusing runtime 403).
|
|
107
102
|
// This is the widget analogue of the agent manifest's identity stamping below.
|
|
108
|
-
const
|
|
109
|
-
|
|
110
|
-
|
|
103
|
+
const asPub = opts.agentServicePubkey
|
|
104
|
+
? canonicalAsPubkey(opts.agentServicePubkey)
|
|
105
|
+
: undefined;
|
|
106
|
+
const widgetAgentId = asPub
|
|
107
|
+
? `${asPub}:${manifest.alias || agentName}`
|
|
111
108
|
: undefined;
|
|
112
109
|
const widgetEnv = opts.env ? envConfig(opts.env) : undefined;
|
|
113
110
|
if (widgetAgentId || widgetEnv) {
|
|
@@ -177,7 +174,6 @@ export async function cefPush(opts) {
|
|
|
177
174
|
// a known agent service, so stamp them here from the supplied AS pubkey
|
|
178
175
|
// — the manifest's `agentId` is `<asPubkey>:<alias>`, matching what ROC,
|
|
179
176
|
// the dashboard registry, and the vault-api connect check expect.
|
|
180
|
-
const asPub = opts.agentServicePubkey?.trim();
|
|
181
177
|
if (asPub) {
|
|
182
178
|
manifest.agentServicePubkey = asPub;
|
|
183
179
|
manifest.agentId = `${asPub}:${manifest.alias || agentName}`;
|
|
@@ -185,8 +181,7 @@ export async function cefPush(opts) {
|
|
|
185
181
|
finalManifestBytes = JSON.stringify(manifest, null, 2) + "\n";
|
|
186
182
|
return new TextEncoder().encode(finalManifestBytes);
|
|
187
183
|
},
|
|
188
|
-
...
|
|
189
|
-
...(hasToken ? { accessToken } : {}),
|
|
184
|
+
...credential,
|
|
190
185
|
...(opts.preset !== undefined ? { preset: opts.preset } : {}),
|
|
191
186
|
...(opts.endpoint !== undefined ? { endpoint: opts.endpoint } : {}),
|
|
192
187
|
...(opts.cdn !== undefined ? { cdn: opts.cdn } : {}),
|
|
@@ -265,15 +260,6 @@ function patchBakedWidgetManifest(source, patch) {
|
|
|
265
260
|
const json = JSON.stringify(manifest, null, 2).replace(/<\/script/gi, "<\\/script");
|
|
266
261
|
return source.slice(0, m.index) + m[1] + json + m[3] + source.slice(m.index + m[0].length);
|
|
267
262
|
}
|
|
268
|
-
function parseBucketId(bucket) {
|
|
269
|
-
if (typeof bucket === "bigint")
|
|
270
|
-
return bucket;
|
|
271
|
-
const str = String(bucket).trim();
|
|
272
|
-
if (!/^\d+$/.test(str)) {
|
|
273
|
-
throw new Error(`[cef push] --bucket must be a numeric bucket id (got "${bucket}")`);
|
|
274
|
-
}
|
|
275
|
-
return BigInt(str);
|
|
276
|
-
}
|
|
277
263
|
async function readManifest(manifestPath) {
|
|
278
264
|
let raw;
|
|
279
265
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push.js","sourceRoot":"","sources":["../../src/commands/push.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"push.js","sourceRoot":"","sources":["../../src/commands/push.ts"],"names":[],"mappings":"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"}
|