@zengxingyuan/aamp-cli-bridge 0.1.7-dev.2 → 0.1.7-dev.4
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 +33 -4
- package/dist/agent-bridge.d.ts +5 -0
- package/dist/agent-bridge.js +208 -30
- package/dist/agent-bridge.js.map +1 -1
- package/dist/bridge.d.ts +109 -0
- package/dist/bridge.js +35 -1
- package/dist/bridge.js.map +1 -1
- package/dist/cli-agent-client.d.ts +1 -0
- package/dist/cli-agent-client.js +13 -0
- package/dist/cli-agent-client.js.map +1 -1
- package/dist/cli-profiles.js +1 -1
- package/dist/cli-profiles.js.map +1 -1
- package/dist/config.js +1 -1
- package/dist/config.js.map +1 -1
- package/dist/discovery.d.ts +20 -0
- package/dist/discovery.js +172 -0
- package/dist/discovery.js.map +1 -0
- package/dist/index.js +152 -7
- package/dist/index.js.map +1 -1
- package/dist/json-init.d.ts +280 -0
- package/dist/json-init.js +177 -0
- package/dist/json-init.js.map +1 -0
- package/dist/prompt-builder.js +41 -22
- package/dist/prompt-builder.js.map +1 -1
- package/dist/sender-policy.d.ts +27 -0
- package/dist/sender-policy.js +161 -0
- package/dist/sender-policy.js.map +1 -0
- package/dist/stream-parser.js +17 -6
- package/dist/stream-parser.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,161 @@
|
|
|
1
|
+
import { mkdirSync, writeFileSync } from 'node:fs';
|
|
2
|
+
import { dirname } from 'node:path';
|
|
3
|
+
import { loadSenderPolicies, resolveSenderPoliciesFile } from './pairing.js';
|
|
4
|
+
export function policyTextFromSenderPolicies(senderPolicies) {
|
|
5
|
+
const policies = senderPolicies ?? [];
|
|
6
|
+
const lines = [];
|
|
7
|
+
for (const policy of policies) {
|
|
8
|
+
const sender = policy.sender.trim();
|
|
9
|
+
if (!sender)
|
|
10
|
+
continue;
|
|
11
|
+
lines.push(`allow_from: ${sender}`);
|
|
12
|
+
const contextRules = [];
|
|
13
|
+
for (const [key, values] of Object.entries(policy.dispatchContextRules ?? {})) {
|
|
14
|
+
const normalizedKey = key.trim();
|
|
15
|
+
if (!normalizedKey)
|
|
16
|
+
continue;
|
|
17
|
+
for (const value of values ?? []) {
|
|
18
|
+
const normalizedValue = value.trim();
|
|
19
|
+
if (normalizedValue)
|
|
20
|
+
contextRules.push(`${normalizedKey}=${normalizedValue}`);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
if (contextRules.length > 0) {
|
|
24
|
+
lines.push(`context_equals: ${contextRules.join(', ')}`);
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
return lines.join('\n');
|
|
28
|
+
}
|
|
29
|
+
export function senderPoliciesFromPolicyText(policyText) {
|
|
30
|
+
const policies = [];
|
|
31
|
+
let activeIndexes = [];
|
|
32
|
+
for (const rawLine of policyText.split(/\r?\n/)) {
|
|
33
|
+
const line = rawLine.trim();
|
|
34
|
+
if (!line || line.startsWith('#'))
|
|
35
|
+
continue;
|
|
36
|
+
const match = /^([a-z_]+)\s*:\s*(.+)$/i.exec(line);
|
|
37
|
+
if (!match?.[1] || !match[2])
|
|
38
|
+
continue;
|
|
39
|
+
const key = match[1].toLowerCase();
|
|
40
|
+
const value = match[2].trim();
|
|
41
|
+
if (key === 'allow_from') {
|
|
42
|
+
activeIndexes = [];
|
|
43
|
+
for (const sender of value.split(',').map((entry) => entry.trim().toLowerCase()).filter(Boolean)) {
|
|
44
|
+
const existingIndex = policies.findIndex((policy) => policy.sender === sender);
|
|
45
|
+
if (existingIndex >= 0) {
|
|
46
|
+
activeIndexes.push(existingIndex);
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
activeIndexes.push(policies.push({ sender }) - 1);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
continue;
|
|
53
|
+
}
|
|
54
|
+
if (key === 'context_equals') {
|
|
55
|
+
if (activeIndexes.length === 0)
|
|
56
|
+
continue;
|
|
57
|
+
for (const entry of value.split(',')) {
|
|
58
|
+
const [rawContextKey, ...rawContextValueParts] = entry.split('=');
|
|
59
|
+
const contextKey = rawContextKey?.trim().toLowerCase();
|
|
60
|
+
const contextValue = rawContextValueParts.join('=').trim();
|
|
61
|
+
if (!contextKey || !contextValue)
|
|
62
|
+
continue;
|
|
63
|
+
for (const index of activeIndexes) {
|
|
64
|
+
const policy = policies[index];
|
|
65
|
+
if (!policy)
|
|
66
|
+
continue;
|
|
67
|
+
policy.dispatchContextRules = {
|
|
68
|
+
...(policy.dispatchContextRules ?? {}),
|
|
69
|
+
[contextKey]: [
|
|
70
|
+
...(policy.dispatchContextRules?.[contextKey] ?? []),
|
|
71
|
+
contextValue,
|
|
72
|
+
],
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
return policies.length > 0 ? policies : undefined;
|
|
79
|
+
}
|
|
80
|
+
export function getAgentSenderPolicy(config, agentName) {
|
|
81
|
+
const agent = getAgent(config, agentName);
|
|
82
|
+
const pairedPolicies = loadSenderPolicies(resolveSenderPoliciesFile(agent.senderPoliciesFile, agent.name));
|
|
83
|
+
const senderPolicies = mergeSenderPolicies([
|
|
84
|
+
...(agent.senderPolicies ?? []),
|
|
85
|
+
...pairedPolicies,
|
|
86
|
+
]);
|
|
87
|
+
return {
|
|
88
|
+
schemaVersion: 1,
|
|
89
|
+
type: 'sender-policy.loaded',
|
|
90
|
+
bridge: 'cli-bridge',
|
|
91
|
+
agent: agent.name,
|
|
92
|
+
senderPolicy: policyTextFromSenderPolicies(senderPolicies),
|
|
93
|
+
senderPolicies,
|
|
94
|
+
};
|
|
95
|
+
}
|
|
96
|
+
export function setAgentSenderPolicy(config, configPath, agentName, policyText) {
|
|
97
|
+
const nextAgents = config.agents.map((agent) => {
|
|
98
|
+
if (agent.name !== agentName)
|
|
99
|
+
return agent;
|
|
100
|
+
const senderPolicies = senderPoliciesFromPolicyText(policyText);
|
|
101
|
+
const nextAgent = {
|
|
102
|
+
...agent,
|
|
103
|
+
...(senderPolicies ? { senderPolicies } : {}),
|
|
104
|
+
};
|
|
105
|
+
if (!senderPolicies)
|
|
106
|
+
delete nextAgent.senderPolicies;
|
|
107
|
+
delete nextAgent.senderWhitelist;
|
|
108
|
+
return nextAgent;
|
|
109
|
+
});
|
|
110
|
+
if (!config.agents.some((agent) => agent.name === agentName)) {
|
|
111
|
+
throw new Error(`Agent "${agentName}" not found in config`);
|
|
112
|
+
}
|
|
113
|
+
const nextConfig = {
|
|
114
|
+
...config,
|
|
115
|
+
agents: nextAgents,
|
|
116
|
+
};
|
|
117
|
+
mkdirSync(dirname(configPath), { recursive: true });
|
|
118
|
+
writeFileSync(configPath, `${JSON.stringify(nextConfig, null, 2)}\n`);
|
|
119
|
+
return {
|
|
120
|
+
schemaVersion: 1,
|
|
121
|
+
type: 'sender-policy.updated',
|
|
122
|
+
bridge: 'cli-bridge',
|
|
123
|
+
agent: agentName,
|
|
124
|
+
senderPolicy: policyText,
|
|
125
|
+
senderPolicies: senderPoliciesFromPolicyText(policyText) ?? [],
|
|
126
|
+
};
|
|
127
|
+
}
|
|
128
|
+
function mergeSenderPolicies(policies) {
|
|
129
|
+
const merged = new Map();
|
|
130
|
+
for (const policy of policies) {
|
|
131
|
+
const sender = policy.sender.trim().toLowerCase();
|
|
132
|
+
if (!sender)
|
|
133
|
+
continue;
|
|
134
|
+
const current = merged.get(sender) ?? { sender };
|
|
135
|
+
for (const [key, values] of Object.entries(policy.dispatchContextRules ?? {})) {
|
|
136
|
+
const normalizedKey = key.trim().toLowerCase();
|
|
137
|
+
if (!normalizedKey)
|
|
138
|
+
continue;
|
|
139
|
+
const currentValues = new Set(current.dispatchContextRules?.[normalizedKey] ?? []);
|
|
140
|
+
for (const value of values ?? []) {
|
|
141
|
+
const normalizedValue = value.trim();
|
|
142
|
+
if (normalizedValue)
|
|
143
|
+
currentValues.add(normalizedValue);
|
|
144
|
+
}
|
|
145
|
+
current.dispatchContextRules = {
|
|
146
|
+
...(current.dispatchContextRules ?? {}),
|
|
147
|
+
[normalizedKey]: [...currentValues],
|
|
148
|
+
};
|
|
149
|
+
}
|
|
150
|
+
merged.set(sender, current);
|
|
151
|
+
}
|
|
152
|
+
return [...merged.values()];
|
|
153
|
+
}
|
|
154
|
+
function getAgent(config, agentName) {
|
|
155
|
+
const agent = config.agents.find((item) => item.name === agentName);
|
|
156
|
+
if (!agent) {
|
|
157
|
+
throw new Error(`Agent "${agentName}" not found in config`);
|
|
158
|
+
}
|
|
159
|
+
return agent;
|
|
160
|
+
}
|
|
161
|
+
//# sourceMappingURL=sender-policy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sender-policy.js","sourceRoot":"","sources":["../src/sender-policy.ts"],"names":[],"mappings":"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"}
|
package/dist/stream-parser.js
CHANGED
|
@@ -29,15 +29,26 @@ function normalizeEventType(value) {
|
|
|
29
29
|
}
|
|
30
30
|
export function normalizeCliStreamEvent(event) {
|
|
31
31
|
const record = asRecord(event.data);
|
|
32
|
-
const
|
|
33
|
-
const
|
|
34
|
-
|
|
35
|
-
|
|
32
|
+
const payloadRecord = asRecord(record?.payload) ?? asRecord(record?.data) ?? record;
|
|
33
|
+
const type = event.type === 'message'
|
|
34
|
+
? normalizeEventType(record?.type)
|
|
35
|
+
?? normalizeEventType(record?.event)
|
|
36
|
+
?? normalizeEventType(record?.kind)
|
|
37
|
+
?? normalizeEventType(record?.sse_type)
|
|
38
|
+
?? event.type
|
|
39
|
+
: event.type;
|
|
40
|
+
const textDelta = firstString(payloadRecord, ['delta', 'text_delta', 'textDelta', 'content_delta', 'contentDelta'])
|
|
41
|
+
?? (['delta', 'text.delta'].includes(type) ? firstString(payloadRecord, ['text', 'content', 'message', 'output']) : undefined)
|
|
42
|
+
?? (type === 'text' ? firstString(payloadRecord, ['text', 'content', 'message', 'output']) : undefined);
|
|
36
43
|
const finalText = ['result', 'final', 'output', 'message'].includes(type)
|
|
37
|
-
? firstString(
|
|
44
|
+
? firstString(payloadRecord, ['output', 'text', 'content', 'message'])
|
|
38
45
|
: undefined;
|
|
39
46
|
return {
|
|
40
|
-
event
|
|
47
|
+
event: {
|
|
48
|
+
...event,
|
|
49
|
+
type,
|
|
50
|
+
data: payloadRecord ?? event.data,
|
|
51
|
+
},
|
|
41
52
|
...(textDelta ? { textDelta } : {}),
|
|
42
53
|
...(finalText ? { finalText } : {}),
|
|
43
54
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream-parser.js","sourceRoot":"","sources":["../src/stream-parser.ts"],"names":[],"mappings":"AAYA,SAAS,aAAa,CAAC,KAAa;IAClC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAA;IAC5B,IAAI,CAAC,OAAO;QAAE,OAAO,SAAS,CAAA;IAC9B,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAC5B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,OAAO,CAAA;IAChB,CAAC;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,SAAS,CAAA;IACjF,OAAO,KAAgC,CAAA;AACzC,CAAC;AAED,SAAS,WAAW,CAAC,MAA2C,EAAE,IAAc;IAC9E,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAA;IAC7B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;QACzB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,KAAK,CAAA;IACjE,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAc;IACxC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;AAC7E,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,KAAqB;IAC3D,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACnC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"stream-parser.js","sourceRoot":"","sources":["../src/stream-parser.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED