@lobu/gateway 3.0.5 → 3.0.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/src/__tests__/agent-config-routes.test.ts +254 -0
- package/src/__tests__/agent-history-routes.test.ts +72 -0
- package/src/__tests__/agent-routes.test.ts +68 -0
- package/src/__tests__/agent-schedules-routes.test.ts +59 -0
- package/src/__tests__/agent-settings-store.test.ts +323 -0
- package/src/__tests__/chat-instance-manager-slack.test.ts +204 -0
- package/src/__tests__/chat-response-bridge.test.ts +131 -0
- package/src/__tests__/config-memory-plugins.test.ts +92 -0
- package/src/__tests__/config-request-store.test.ts +127 -0
- package/src/__tests__/connection-routes.test.ts +144 -0
- package/src/__tests__/core-services-store-selection.test.ts +92 -0
- package/src/__tests__/docker-deployment.test.ts +1211 -0
- package/src/__tests__/embedded-deployment.test.ts +342 -0
- package/src/__tests__/grant-store.test.ts +148 -0
- package/src/__tests__/http-proxy.test.ts +281 -0
- package/src/__tests__/instruction-service.test.ts +37 -0
- package/src/__tests__/link-buttons.test.ts +112 -0
- package/src/__tests__/lobu.test.ts +32 -0
- package/src/__tests__/mcp-config-service.test.ts +347 -0
- package/src/__tests__/mcp-proxy.test.ts +696 -0
- package/src/__tests__/message-handler-bridge.test.ts +17 -0
- package/src/__tests__/model-selection.test.ts +172 -0
- package/src/__tests__/oauth-templates.test.ts +39 -0
- package/src/__tests__/platform-adapter-slack-send.test.ts +114 -0
- package/src/__tests__/platform-helpers-model-resolution.test.ts +253 -0
- package/src/__tests__/provider-inheritance.test.ts +212 -0
- package/src/__tests__/routes/cli-auth.test.ts +337 -0
- package/src/__tests__/routes/interactions.test.ts +121 -0
- package/src/__tests__/secret-proxy.test.ts +85 -0
- package/src/__tests__/session-manager.test.ts +572 -0
- package/src/__tests__/setup.ts +133 -0
- package/src/__tests__/skill-and-mcp-registry.test.ts +203 -0
- package/src/__tests__/slack-routes.test.ts +161 -0
- package/src/__tests__/system-config-resolver.test.ts +75 -0
- package/src/__tests__/system-message-limiter.test.ts +89 -0
- package/src/__tests__/system-skills-service.test.ts +362 -0
- package/src/__tests__/transcription-service.test.ts +222 -0
- package/src/__tests__/utils/rate-limiter.test.ts +102 -0
- package/src/__tests__/worker-connection-manager.test.ts +497 -0
- package/src/__tests__/worker-job-router.test.ts +722 -0
- package/src/api/index.ts +1 -0
- package/src/api/platform.ts +292 -0
- package/src/api/response-renderer.ts +157 -0
- package/src/auth/agent-metadata-store.ts +168 -0
- package/src/auth/api-auth-middleware.ts +69 -0
- package/src/auth/api-key-provider-module.ts +213 -0
- package/src/auth/base-provider-module.ts +201 -0
- package/src/auth/chatgpt/chatgpt-oauth-module.ts +185 -0
- package/src/auth/chatgpt/device-code-client.ts +218 -0
- package/src/auth/chatgpt/index.ts +1 -0
- package/src/auth/claude/oauth-module.ts +280 -0
- package/src/auth/cli/token-service.ts +249 -0
- package/src/auth/external/client.ts +560 -0
- package/src/auth/external/device-code-client.ts +225 -0
- package/src/auth/mcp/config-service.ts +392 -0
- package/src/auth/mcp/proxy.ts +1088 -0
- package/src/auth/mcp/string-substitution.ts +17 -0
- package/src/auth/mcp/tool-cache.ts +90 -0
- package/src/auth/oauth/base-client.ts +267 -0
- package/src/auth/oauth/client.ts +153 -0
- package/src/auth/oauth/credentials.ts +7 -0
- package/src/auth/oauth/providers.ts +69 -0
- package/src/auth/oauth/state-store.ts +150 -0
- package/src/auth/oauth-templates.ts +179 -0
- package/src/auth/provider-catalog.ts +220 -0
- package/src/auth/provider-model-options.ts +41 -0
- package/src/auth/settings/agent-settings-store.ts +565 -0
- package/src/auth/settings/auth-profiles-manager.ts +216 -0
- package/src/auth/settings/index.ts +12 -0
- package/src/auth/settings/model-preference-store.ts +52 -0
- package/src/auth/settings/model-selection.ts +135 -0
- package/src/auth/settings/resolved-settings-view.ts +298 -0
- package/src/auth/settings/template-utils.ts +44 -0
- package/src/auth/settings/token-service.ts +88 -0
- package/src/auth/system-env-store.ts +98 -0
- package/src/auth/user-agents-store.ts +68 -0
- package/src/channels/binding-service.ts +214 -0
- package/src/channels/index.ts +4 -0
- package/src/cli/gateway.ts +1304 -0
- package/src/cli/index.ts +74 -0
- package/src/commands/built-in-commands.ts +80 -0
- package/src/commands/command-dispatcher.ts +94 -0
- package/src/commands/command-reply-adapters.ts +27 -0
- package/src/config/file-loader.ts +618 -0
- package/src/config/index.ts +588 -0
- package/src/config/network-allowlist.ts +71 -0
- package/src/connections/chat-instance-manager.ts +1284 -0
- package/src/connections/chat-response-bridge.ts +618 -0
- package/src/connections/index.ts +7 -0
- package/src/connections/interaction-bridge.ts +831 -0
- package/src/connections/message-handler-bridge.ts +415 -0
- package/src/connections/platform-auth-methods.ts +15 -0
- package/src/connections/types.ts +84 -0
- package/src/gateway/connection-manager.ts +291 -0
- package/src/gateway/index.ts +700 -0
- package/src/gateway/job-router.ts +201 -0
- package/src/gateway-main.ts +200 -0
- package/src/index.ts +41 -0
- package/src/infrastructure/queue/index.ts +12 -0
- package/src/infrastructure/queue/queue-producer.ts +148 -0
- package/src/infrastructure/queue/redis-queue.ts +361 -0
- package/src/infrastructure/queue/types.ts +133 -0
- package/src/infrastructure/redis/system-message-limiter.ts +94 -0
- package/src/interactions/config-request-store.ts +198 -0
- package/src/interactions.ts +363 -0
- package/src/lobu.ts +311 -0
- package/src/metrics/prometheus.ts +159 -0
- package/src/modules/module-system.ts +179 -0
- package/src/orchestration/base-deployment-manager.ts +900 -0
- package/src/orchestration/deployment-utils.ts +98 -0
- package/src/orchestration/impl/docker-deployment.ts +620 -0
- package/src/orchestration/impl/embedded-deployment.ts +268 -0
- package/src/orchestration/impl/index.ts +8 -0
- package/src/orchestration/impl/k8s/deployment.ts +1061 -0
- package/src/orchestration/impl/k8s/helpers.ts +610 -0
- package/src/orchestration/impl/k8s/index.ts +1 -0
- package/src/orchestration/index.ts +333 -0
- package/src/orchestration/message-consumer.ts +584 -0
- package/src/orchestration/scheduled-wakeup.ts +704 -0
- package/src/permissions/approval-policy.ts +36 -0
- package/src/permissions/grant-store.ts +219 -0
- package/src/platform/file-handler.ts +66 -0
- package/src/platform/link-buttons.ts +57 -0
- package/src/platform/renderer-utils.ts +44 -0
- package/src/platform/response-renderer.ts +84 -0
- package/src/platform/unified-thread-consumer.ts +187 -0
- package/src/platform.ts +318 -0
- package/src/proxy/http-proxy.ts +752 -0
- package/src/proxy/proxy-manager.ts +81 -0
- package/src/proxy/secret-proxy.ts +402 -0
- package/src/proxy/token-refresh-job.ts +143 -0
- package/src/routes/internal/audio.ts +141 -0
- package/src/routes/internal/device-auth.ts +566 -0
- package/src/routes/internal/files.ts +226 -0
- package/src/routes/internal/history.ts +69 -0
- package/src/routes/internal/images.ts +127 -0
- package/src/routes/internal/interactions.ts +84 -0
- package/src/routes/internal/middleware.ts +23 -0
- package/src/routes/internal/schedule.ts +226 -0
- package/src/routes/internal/types.ts +22 -0
- package/src/routes/openapi-auto.ts +239 -0
- package/src/routes/public/agent-access.ts +23 -0
- package/src/routes/public/agent-config.ts +675 -0
- package/src/routes/public/agent-history.ts +422 -0
- package/src/routes/public/agent-schedules.ts +296 -0
- package/src/routes/public/agent.ts +1086 -0
- package/src/routes/public/agents.ts +373 -0
- package/src/routes/public/channels.ts +191 -0
- package/src/routes/public/cli-auth.ts +883 -0
- package/src/routes/public/connections.ts +574 -0
- package/src/routes/public/landing.ts +16 -0
- package/src/routes/public/oauth.ts +147 -0
- package/src/routes/public/settings-auth.ts +104 -0
- package/src/routes/public/slack.ts +173 -0
- package/src/routes/shared/agent-ownership.ts +101 -0
- package/src/routes/shared/token-verifier.ts +34 -0
- package/src/services/core-services.ts +1053 -0
- package/src/services/image-generation-service.ts +257 -0
- package/src/services/instruction-service.ts +318 -0
- package/src/services/mcp-registry.ts +94 -0
- package/src/services/platform-helpers.ts +287 -0
- package/src/services/session-manager.ts +262 -0
- package/src/services/settings-resolver.ts +74 -0
- package/src/services/system-config-resolver.ts +90 -0
- package/src/services/system-skills-service.ts +229 -0
- package/src/services/transcription-service.ts +684 -0
- package/src/session.ts +110 -0
- package/src/spaces/index.ts +1 -0
- package/src/spaces/space-resolver.ts +17 -0
- package/src/stores/in-memory-agent-store.ts +403 -0
- package/src/stores/redis-agent-store.ts +279 -0
- package/src/utils/public-url.ts +44 -0
- package/src/utils/rate-limiter.ts +94 -0
- package/tsconfig.json +33 -0
|
@@ -0,0 +1,618 @@
|
|
|
1
|
+
import { readdir, readFile, stat } from "node:fs/promises";
|
|
2
|
+
import { join, resolve } from "node:path";
|
|
3
|
+
import type { AgentSettings, SkillConfig, SystemSkillEntry } from "@lobu/core";
|
|
4
|
+
import { createLogger } from "@lobu/core";
|
|
5
|
+
import { parse as parseToml } from "smol-toml";
|
|
6
|
+
import { parse as parseYaml } from "yaml";
|
|
7
|
+
import { z } from "zod";
|
|
8
|
+
|
|
9
|
+
const logger = createLogger("file-loader");
|
|
10
|
+
|
|
11
|
+
// ── lobu.toml Zod Schema ─────────────────────────────────────────────────
|
|
12
|
+
// Duplicated from @lobu/cli because CLI uses zod@3, gateway uses zod@4.
|
|
13
|
+
// If the CLI migrates to zod@4, this should move to @lobu/core.
|
|
14
|
+
|
|
15
|
+
const providerSchema = z.object({
|
|
16
|
+
id: z.string(),
|
|
17
|
+
model: z.string().optional(),
|
|
18
|
+
key: z.string().optional(),
|
|
19
|
+
});
|
|
20
|
+
|
|
21
|
+
const connectionSchema = z.object({
|
|
22
|
+
type: z.string(),
|
|
23
|
+
config: z.record(z.string(), z.string()),
|
|
24
|
+
});
|
|
25
|
+
|
|
26
|
+
const mcpOAuthSchema = z.object({
|
|
27
|
+
auth_url: z.string(),
|
|
28
|
+
token_url: z.string(),
|
|
29
|
+
client_id: z.string().optional(),
|
|
30
|
+
client_secret: z.string().optional(),
|
|
31
|
+
scopes: z.array(z.string()).optional(),
|
|
32
|
+
token_endpoint_auth_method: z.string().optional(),
|
|
33
|
+
});
|
|
34
|
+
|
|
35
|
+
const mcpServerSchema = z.object({
|
|
36
|
+
url: z.string().optional(),
|
|
37
|
+
command: z.string().optional(),
|
|
38
|
+
args: z.array(z.string()).optional(),
|
|
39
|
+
env: z.record(z.string(), z.string()).optional(),
|
|
40
|
+
headers: z.record(z.string(), z.string()).optional(),
|
|
41
|
+
oauth: mcpOAuthSchema.optional(),
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
const skillsSchema = z.object({
|
|
45
|
+
enabled: z.array(z.string()).default([]),
|
|
46
|
+
mcp: z.record(z.string(), mcpServerSchema).optional(),
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
const networkSchema = z.object({
|
|
50
|
+
allowed: z.array(z.string()).optional(),
|
|
51
|
+
denied: z.array(z.string()).optional(),
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
const workerSchema = z.object({
|
|
55
|
+
nix_packages: z.array(z.string()).optional(),
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
const agentEntrySchema = z.object({
|
|
59
|
+
name: z.string(),
|
|
60
|
+
description: z.string().optional(),
|
|
61
|
+
dir: z.string(),
|
|
62
|
+
providers: z.array(providerSchema).default([]),
|
|
63
|
+
connections: z.array(connectionSchema).default([]),
|
|
64
|
+
skills: skillsSchema.default({ enabled: [] }),
|
|
65
|
+
network: networkSchema.optional(),
|
|
66
|
+
worker: workerSchema.optional(),
|
|
67
|
+
});
|
|
68
|
+
|
|
69
|
+
const lobuConfigSchema = z.object({
|
|
70
|
+
agents: z.record(z.string(), agentEntrySchema),
|
|
71
|
+
});
|
|
72
|
+
|
|
73
|
+
type LobuTomlConfig = z.infer<typeof lobuConfigSchema>;
|
|
74
|
+
type AgentEntry = z.infer<typeof agentEntrySchema>;
|
|
75
|
+
type McpServerEntry = z.infer<typeof mcpServerSchema>;
|
|
76
|
+
|
|
77
|
+
// ── Public Types ──────────────────────────────────────────────────────────
|
|
78
|
+
|
|
79
|
+
export interface FileLoadedAgent {
|
|
80
|
+
agentId: string;
|
|
81
|
+
name: string;
|
|
82
|
+
description?: string;
|
|
83
|
+
settings: Partial<AgentSettings>;
|
|
84
|
+
credentials: Array<{ provider: string; key: string }>;
|
|
85
|
+
connections: Array<{ type: string; config: Record<string, string> }>;
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
// ── Main Entry Point ──────────────────────────────────────────────────────
|
|
89
|
+
|
|
90
|
+
/**
|
|
91
|
+
* Load agent config directly from lobu.toml + markdown files on disk.
|
|
92
|
+
* Reads agent config directly from project files at startup.
|
|
93
|
+
*
|
|
94
|
+
* @param projectPath - Root directory containing lobu.toml (e.g. /app)
|
|
95
|
+
*/
|
|
96
|
+
export async function loadAgentConfigFromFiles(
|
|
97
|
+
projectPath: string
|
|
98
|
+
): Promise<FileLoadedAgent[]> {
|
|
99
|
+
const config = await loadAndValidateToml(projectPath);
|
|
100
|
+
if (!config) return [];
|
|
101
|
+
|
|
102
|
+
const rootSkillsDir = join(projectPath, "skills");
|
|
103
|
+
const registrySkills = await loadSystemSkillsRegistry(projectPath);
|
|
104
|
+
|
|
105
|
+
const agents: FileLoadedAgent[] = [];
|
|
106
|
+
|
|
107
|
+
for (const [agentId, agentConfig] of Object.entries(config.agents)) {
|
|
108
|
+
try {
|
|
109
|
+
const agent = await buildAgentConfig(
|
|
110
|
+
agentId,
|
|
111
|
+
agentConfig,
|
|
112
|
+
projectPath,
|
|
113
|
+
rootSkillsDir,
|
|
114
|
+
registrySkills
|
|
115
|
+
);
|
|
116
|
+
agents.push(agent);
|
|
117
|
+
} catch (err) {
|
|
118
|
+
logger.error(`Failed to load agent "${agentId}" from files`, {
|
|
119
|
+
error: err instanceof Error ? err.message : String(err),
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
logger.info(`Loaded ${agents.length} agent(s) from lobu.toml`);
|
|
125
|
+
return agents;
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
// ── TOML Loading ──────────────────────────────────────────────────────────
|
|
129
|
+
|
|
130
|
+
async function loadAndValidateToml(
|
|
131
|
+
projectPath: string
|
|
132
|
+
): Promise<LobuTomlConfig | null> {
|
|
133
|
+
const configPath = join(projectPath, "lobu.toml");
|
|
134
|
+
|
|
135
|
+
let raw: string;
|
|
136
|
+
try {
|
|
137
|
+
raw = await readFile(configPath, "utf-8");
|
|
138
|
+
} catch {
|
|
139
|
+
logger.debug(`No lobu.toml found at ${configPath}`);
|
|
140
|
+
return null;
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
let parsed: Record<string, unknown>;
|
|
144
|
+
try {
|
|
145
|
+
parsed = parseToml(raw) as Record<string, unknown>;
|
|
146
|
+
} catch (err) {
|
|
147
|
+
logger.error("Invalid TOML syntax in lobu.toml", {
|
|
148
|
+
error: err instanceof Error ? err.message : String(err),
|
|
149
|
+
});
|
|
150
|
+
return null;
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
const result = lobuConfigSchema.safeParse(parsed);
|
|
154
|
+
if (!result.success) {
|
|
155
|
+
const details = result.error.issues.map(
|
|
156
|
+
(issue) => `${issue.path.join(".")}: ${issue.message}`
|
|
157
|
+
);
|
|
158
|
+
logger.error("Invalid lobu.toml schema", { details });
|
|
159
|
+
return null;
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
return result.data;
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
// ── Agent Config Builder ──────────────────────────────────────────────────
|
|
166
|
+
|
|
167
|
+
async function buildAgentConfig(
|
|
168
|
+
agentId: string,
|
|
169
|
+
agentConfig: AgentEntry,
|
|
170
|
+
projectPath: string,
|
|
171
|
+
rootSkillsDir: string,
|
|
172
|
+
registrySkills: Map<string, SystemSkillEntry>
|
|
173
|
+
): Promise<FileLoadedAgent> {
|
|
174
|
+
const agentDir = resolve(projectPath, agentConfig.dir);
|
|
175
|
+
const markdown = await loadAgentMarkdown(agentDir);
|
|
176
|
+
const skillFiles = await loadSkillFiles([
|
|
177
|
+
rootSkillsDir,
|
|
178
|
+
join(agentDir, "skills"),
|
|
179
|
+
]);
|
|
180
|
+
|
|
181
|
+
const settings: Partial<AgentSettings> = {
|
|
182
|
+
...markdown,
|
|
183
|
+
};
|
|
184
|
+
|
|
185
|
+
// Providers
|
|
186
|
+
if (agentConfig.providers.length > 0) {
|
|
187
|
+
settings.installedProviders = agentConfig.providers.map((p) => ({
|
|
188
|
+
providerId: p.id,
|
|
189
|
+
installedAt: Date.now(),
|
|
190
|
+
}));
|
|
191
|
+
settings.modelSelection = { mode: "auto" };
|
|
192
|
+
const providerModelPreferences = Object.fromEntries(
|
|
193
|
+
agentConfig.providers
|
|
194
|
+
.filter((provider) => !!provider.model?.trim())
|
|
195
|
+
.map((provider) => [provider.id, provider.model!.trim()])
|
|
196
|
+
);
|
|
197
|
+
if (Object.keys(providerModelPreferences).length > 0) {
|
|
198
|
+
settings.providerModelPreferences = providerModelPreferences;
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
// Skills (system + local)
|
|
203
|
+
const systemSkills = buildSystemSkills(agentConfig, registrySkills);
|
|
204
|
+
const localSkills = buildLocalSkills(skillFiles);
|
|
205
|
+
if (systemSkills.length > 0 || localSkills.length > 0) {
|
|
206
|
+
settings.skillsConfig = {
|
|
207
|
+
skills: [...systemSkills, ...localSkills],
|
|
208
|
+
};
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
// Network — start with agent-level config, then merge skill-level domains
|
|
212
|
+
const mergedAllowedDomains: string[] = [
|
|
213
|
+
...(agentConfig.network?.allowed || []),
|
|
214
|
+
];
|
|
215
|
+
const mergedDeniedDomains: string[] = [
|
|
216
|
+
...(agentConfig.network?.denied || []),
|
|
217
|
+
];
|
|
218
|
+
|
|
219
|
+
// Nix packages — start with agent-level, then merge skill-level
|
|
220
|
+
const mergedNixPackages: string[] = [
|
|
221
|
+
...(agentConfig.worker?.nix_packages || []),
|
|
222
|
+
];
|
|
223
|
+
|
|
224
|
+
// Tool permissions — merge from all skills
|
|
225
|
+
const mergedToolAllow: string[] = [];
|
|
226
|
+
const mergedToolDeny: string[] = [];
|
|
227
|
+
|
|
228
|
+
// MCP servers — start with agent-level toml config
|
|
229
|
+
const mcpServers: Record<string, any> = {};
|
|
230
|
+
if (agentConfig.skills.mcp) {
|
|
231
|
+
for (const [id, rawMcp] of Object.entries(agentConfig.skills.mcp)) {
|
|
232
|
+
const mcp = rawMcp as McpServerEntry;
|
|
233
|
+
const mapped: Record<string, any> = {
|
|
234
|
+
url: mcp.url,
|
|
235
|
+
command: mcp.command,
|
|
236
|
+
args: mcp.args,
|
|
237
|
+
headers: mcp.headers,
|
|
238
|
+
};
|
|
239
|
+
if (mcp.oauth) {
|
|
240
|
+
mapped.oauth = {
|
|
241
|
+
authUrl: mcp.oauth.auth_url,
|
|
242
|
+
tokenUrl: mcp.oauth.token_url,
|
|
243
|
+
clientId: resolveEnvVar(mcp.oauth.client_id || ""),
|
|
244
|
+
clientSecret: resolveEnvVar(mcp.oauth.client_secret || ""),
|
|
245
|
+
scopes: mcp.oauth.scopes,
|
|
246
|
+
tokenEndpointAuthMethod: mcp.oauth.token_endpoint_auth_method,
|
|
247
|
+
};
|
|
248
|
+
}
|
|
249
|
+
if (mcp.env) {
|
|
250
|
+
mapped.env = Object.fromEntries(
|
|
251
|
+
Object.entries(mcp.env).map(([k, v]) => [k, resolveEnvVar(v)])
|
|
252
|
+
);
|
|
253
|
+
}
|
|
254
|
+
mcpServers[id] = mapped;
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
|
|
258
|
+
// Merge skill-level frontmatter configs into agent settings
|
|
259
|
+
const allSkills = [...systemSkills, ...localSkills];
|
|
260
|
+
for (const skill of allSkills) {
|
|
261
|
+
if (skill.nixPackages?.length) {
|
|
262
|
+
mergedNixPackages.push(...skill.nixPackages);
|
|
263
|
+
}
|
|
264
|
+
if (skill.networkConfig?.allowedDomains?.length) {
|
|
265
|
+
mergedAllowedDomains.push(...skill.networkConfig.allowedDomains);
|
|
266
|
+
}
|
|
267
|
+
if (skill.networkConfig?.deniedDomains?.length) {
|
|
268
|
+
mergedDeniedDomains.push(...skill.networkConfig.deniedDomains);
|
|
269
|
+
}
|
|
270
|
+
if (skill.toolPermissions?.allow?.length) {
|
|
271
|
+
mergedToolAllow.push(...skill.toolPermissions.allow);
|
|
272
|
+
}
|
|
273
|
+
if (skill.toolPermissions?.deny?.length) {
|
|
274
|
+
mergedToolDeny.push(...skill.toolPermissions.deny);
|
|
275
|
+
}
|
|
276
|
+
// Also merge legacy permissions (domain allowlist) from skills
|
|
277
|
+
if (skill.permissions?.length) {
|
|
278
|
+
mergedAllowedDomains.push(...skill.permissions);
|
|
279
|
+
}
|
|
280
|
+
// Merge skill-level MCP servers
|
|
281
|
+
if (skill.mcpServers?.length) {
|
|
282
|
+
for (const mcp of skill.mcpServers) {
|
|
283
|
+
if (!mcpServers[mcp.id]) {
|
|
284
|
+
mcpServers[mcp.id] = {
|
|
285
|
+
url: mcp.url,
|
|
286
|
+
type: mcp.type,
|
|
287
|
+
command: mcp.command,
|
|
288
|
+
args: mcp.args,
|
|
289
|
+
};
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
|
|
295
|
+
// Apply merged network config
|
|
296
|
+
if (mergedAllowedDomains.length > 0 || mergedDeniedDomains.length > 0) {
|
|
297
|
+
settings.networkConfig = {
|
|
298
|
+
allowedDomains:
|
|
299
|
+
mergedAllowedDomains.length > 0
|
|
300
|
+
? [...new Set(mergedAllowedDomains)]
|
|
301
|
+
: undefined,
|
|
302
|
+
deniedDomains:
|
|
303
|
+
mergedDeniedDomains.length > 0
|
|
304
|
+
? [...new Set(mergedDeniedDomains)]
|
|
305
|
+
: undefined,
|
|
306
|
+
};
|
|
307
|
+
}
|
|
308
|
+
|
|
309
|
+
// Apply merged nix packages
|
|
310
|
+
if (mergedNixPackages.length > 0) {
|
|
311
|
+
settings.nixConfig = {
|
|
312
|
+
packages: [...new Set(mergedNixPackages)],
|
|
313
|
+
};
|
|
314
|
+
}
|
|
315
|
+
|
|
316
|
+
// Apply merged tool permissions
|
|
317
|
+
if (mergedToolAllow.length > 0 || mergedToolDeny.length > 0) {
|
|
318
|
+
settings.toolsConfig = {
|
|
319
|
+
...settings.toolsConfig,
|
|
320
|
+
allowedTools:
|
|
321
|
+
mergedToolAllow.length > 0
|
|
322
|
+
? [...new Set(mergedToolAllow)]
|
|
323
|
+
: settings.toolsConfig?.allowedTools,
|
|
324
|
+
deniedTools:
|
|
325
|
+
mergedToolDeny.length > 0
|
|
326
|
+
? [...new Set(mergedToolDeny)]
|
|
327
|
+
: settings.toolsConfig?.deniedTools,
|
|
328
|
+
};
|
|
329
|
+
}
|
|
330
|
+
|
|
331
|
+
// Apply merged MCP servers
|
|
332
|
+
if (Object.keys(mcpServers).length > 0) {
|
|
333
|
+
settings.mcpServers = mcpServers;
|
|
334
|
+
}
|
|
335
|
+
|
|
336
|
+
// Credentials
|
|
337
|
+
const credentials = agentConfig.providers
|
|
338
|
+
.filter((p) => p.key)
|
|
339
|
+
.map((p) => ({
|
|
340
|
+
provider: p.id,
|
|
341
|
+
key: resolveEnvVar(p.key!),
|
|
342
|
+
}))
|
|
343
|
+
.filter((c) => c.key);
|
|
344
|
+
|
|
345
|
+
// Connections
|
|
346
|
+
const connections = agentConfig.connections
|
|
347
|
+
.map((conn) => ({
|
|
348
|
+
type: conn.type,
|
|
349
|
+
config: Object.fromEntries(
|
|
350
|
+
Object.entries(conn.config).map(([k, v]) => [
|
|
351
|
+
k,
|
|
352
|
+
resolveEnvVar(v as string),
|
|
353
|
+
])
|
|
354
|
+
) as Record<string, string>,
|
|
355
|
+
}))
|
|
356
|
+
.filter((conn) => Object.values(conn.config).every((v) => v !== ""));
|
|
357
|
+
|
|
358
|
+
return {
|
|
359
|
+
agentId,
|
|
360
|
+
name: agentConfig.name,
|
|
361
|
+
description: agentConfig.description,
|
|
362
|
+
settings,
|
|
363
|
+
credentials,
|
|
364
|
+
connections,
|
|
365
|
+
};
|
|
366
|
+
}
|
|
367
|
+
|
|
368
|
+
// ── System Skills ─────────────────────────────────────────────────────────
|
|
369
|
+
|
|
370
|
+
function buildSystemSkills(
|
|
371
|
+
agentConfig: AgentEntry,
|
|
372
|
+
registrySkills: Map<string, SystemSkillEntry>
|
|
373
|
+
): SkillConfig[] {
|
|
374
|
+
return agentConfig.skills.enabled
|
|
375
|
+
.map((skillId) => registrySkills.get(skillId))
|
|
376
|
+
.filter((skill): skill is SystemSkillEntry => !!skill)
|
|
377
|
+
.map((skill) => ({
|
|
378
|
+
repo: `system/${skill.id}`,
|
|
379
|
+
name: skill.name,
|
|
380
|
+
description: skill.description,
|
|
381
|
+
instructions: skill.instructions,
|
|
382
|
+
enabled: true,
|
|
383
|
+
system: true,
|
|
384
|
+
mcpServers: skill.mcpServers?.map((mcp) => ({
|
|
385
|
+
id: mcp.id,
|
|
386
|
+
name: mcp.name,
|
|
387
|
+
url: mcp.url,
|
|
388
|
+
type: mcp.type,
|
|
389
|
+
command: mcp.command,
|
|
390
|
+
args: mcp.args,
|
|
391
|
+
})),
|
|
392
|
+
nixPackages: skill.nixPackages,
|
|
393
|
+
permissions: skill.permissions,
|
|
394
|
+
providers: skill.providers?.length ? [skill.id] : undefined,
|
|
395
|
+
}));
|
|
396
|
+
}
|
|
397
|
+
|
|
398
|
+
function buildLocalSkills(skillFiles: LoadedSkillFile[]): SkillConfig[] {
|
|
399
|
+
return skillFiles.map((skillFile) => {
|
|
400
|
+
const skill: SkillConfig = {
|
|
401
|
+
repo: `local/${skillFile.name}`,
|
|
402
|
+
name: skillFile.name,
|
|
403
|
+
content: skillFile.content,
|
|
404
|
+
enabled: true,
|
|
405
|
+
};
|
|
406
|
+
|
|
407
|
+
const fm = skillFile.frontmatter;
|
|
408
|
+
if (fm) {
|
|
409
|
+
if (fm.description) skill.description = fm.description;
|
|
410
|
+
if (fm.nixPackages?.length) skill.nixPackages = fm.nixPackages;
|
|
411
|
+
if (fm.network) {
|
|
412
|
+
skill.networkConfig = {
|
|
413
|
+
allowedDomains: fm.network.allow,
|
|
414
|
+
deniedDomains: fm.network.deny,
|
|
415
|
+
};
|
|
416
|
+
}
|
|
417
|
+
if (fm.permissions) {
|
|
418
|
+
skill.toolPermissions = {
|
|
419
|
+
allow: fm.permissions.allow,
|
|
420
|
+
deny: fm.permissions.deny,
|
|
421
|
+
};
|
|
422
|
+
}
|
|
423
|
+
if (fm.mcpServers && Object.keys(fm.mcpServers).length > 0) {
|
|
424
|
+
skill.mcpServers = Object.entries(fm.mcpServers).map(([id, mcp]) => ({
|
|
425
|
+
id,
|
|
426
|
+
url: mcp.url,
|
|
427
|
+
type: mcp.type as "sse" | "stdio" | undefined,
|
|
428
|
+
command: mcp.command,
|
|
429
|
+
args: mcp.args,
|
|
430
|
+
}));
|
|
431
|
+
}
|
|
432
|
+
}
|
|
433
|
+
|
|
434
|
+
return skill;
|
|
435
|
+
});
|
|
436
|
+
}
|
|
437
|
+
|
|
438
|
+
// ── Markdown Loading ──────────────────────────────────────────────────────
|
|
439
|
+
|
|
440
|
+
async function loadAgentMarkdown(
|
|
441
|
+
dir: string
|
|
442
|
+
): Promise<{ identityMd?: string; soulMd?: string; userMd?: string }> {
|
|
443
|
+
const result: { identityMd?: string; soulMd?: string; userMd?: string } = {};
|
|
444
|
+
|
|
445
|
+
const files = [
|
|
446
|
+
{ path: "IDENTITY.md", key: "identityMd" as const },
|
|
447
|
+
{ path: "SOUL.md", key: "soulMd" as const },
|
|
448
|
+
{ path: "USER.md", key: "userMd" as const },
|
|
449
|
+
];
|
|
450
|
+
|
|
451
|
+
for (const { path, key } of files) {
|
|
452
|
+
try {
|
|
453
|
+
const content = await readFile(join(dir, path), "utf-8");
|
|
454
|
+
if (content.trim()) {
|
|
455
|
+
result[key] = content.trim();
|
|
456
|
+
}
|
|
457
|
+
} catch {
|
|
458
|
+
// File doesn't exist, skip
|
|
459
|
+
}
|
|
460
|
+
}
|
|
461
|
+
|
|
462
|
+
return result;
|
|
463
|
+
}
|
|
464
|
+
|
|
465
|
+
// ── Skill File Loading ────────────────────────────────────────────────────
|
|
466
|
+
|
|
467
|
+
/** Parsed YAML frontmatter from a SKILL.md file. */
|
|
468
|
+
interface SkillFrontmatter {
|
|
469
|
+
name?: string;
|
|
470
|
+
description?: string;
|
|
471
|
+
nixPackages?: string[];
|
|
472
|
+
network?: { allow?: string[]; deny?: string[] };
|
|
473
|
+
permissions?: { allow?: string[]; deny?: string[] };
|
|
474
|
+
mcpServers?: Record<
|
|
475
|
+
string,
|
|
476
|
+
{
|
|
477
|
+
url?: string;
|
|
478
|
+
type?: string;
|
|
479
|
+
command?: string;
|
|
480
|
+
args?: string[];
|
|
481
|
+
env?: Record<string, string>;
|
|
482
|
+
}
|
|
483
|
+
>;
|
|
484
|
+
}
|
|
485
|
+
|
|
486
|
+
/** A loaded skill file with optional parsed frontmatter. */
|
|
487
|
+
interface LoadedSkillFile {
|
|
488
|
+
name: string;
|
|
489
|
+
content: string;
|
|
490
|
+
frontmatter?: SkillFrontmatter;
|
|
491
|
+
}
|
|
492
|
+
|
|
493
|
+
/**
|
|
494
|
+
* Parse YAML frontmatter from a markdown string.
|
|
495
|
+
* Returns the parsed frontmatter object and the remaining markdown body.
|
|
496
|
+
* If no frontmatter is found, returns null frontmatter and the full content as body.
|
|
497
|
+
*/
|
|
498
|
+
function parseFrontmatter(raw: string): {
|
|
499
|
+
frontmatter: SkillFrontmatter | null;
|
|
500
|
+
body: string;
|
|
501
|
+
} {
|
|
502
|
+
const match = raw.match(/^---\r?\n([\s\S]*?)\r?\n---\r?\n?([\s\S]*)$/);
|
|
503
|
+
if (!match?.[1]) {
|
|
504
|
+
return { frontmatter: null, body: raw };
|
|
505
|
+
}
|
|
506
|
+
|
|
507
|
+
try {
|
|
508
|
+
const parsed = parseYaml(match[1]) as SkillFrontmatter;
|
|
509
|
+
return {
|
|
510
|
+
frontmatter: parsed && typeof parsed === "object" ? parsed : null,
|
|
511
|
+
body: (match[2] || "").trim(),
|
|
512
|
+
};
|
|
513
|
+
} catch (err) {
|
|
514
|
+
logger.warn("Failed to parse YAML frontmatter in skill file", {
|
|
515
|
+
error: err instanceof Error ? err.message : String(err),
|
|
516
|
+
});
|
|
517
|
+
return { frontmatter: null, body: raw };
|
|
518
|
+
}
|
|
519
|
+
}
|
|
520
|
+
|
|
521
|
+
async function loadSkillFiles(dirs: string[]): Promise<LoadedSkillFile[]> {
|
|
522
|
+
const skillMap = new Map<string, LoadedSkillFile>();
|
|
523
|
+
|
|
524
|
+
for (const dir of dirs) {
|
|
525
|
+
const resolvedDir = resolve(dir);
|
|
526
|
+
let entries: string[];
|
|
527
|
+
try {
|
|
528
|
+
entries = await readdir(resolvedDir);
|
|
529
|
+
} catch {
|
|
530
|
+
continue;
|
|
531
|
+
}
|
|
532
|
+
|
|
533
|
+
for (const entry of entries) {
|
|
534
|
+
// Directory-based skill: entry is a directory containing SKILL.md
|
|
535
|
+
const entryPath = join(resolvedDir, entry);
|
|
536
|
+
let entryStat;
|
|
537
|
+
try {
|
|
538
|
+
entryStat = await stat(entryPath);
|
|
539
|
+
} catch {
|
|
540
|
+
continue;
|
|
541
|
+
}
|
|
542
|
+
|
|
543
|
+
if (entryStat.isDirectory()) {
|
|
544
|
+
const skillMdPath = join(entryPath, "SKILL.md");
|
|
545
|
+
try {
|
|
546
|
+
const raw = await readFile(skillMdPath, "utf-8");
|
|
547
|
+
if (raw.trim()) {
|
|
548
|
+
const { frontmatter, body } = parseFrontmatter(raw.trim());
|
|
549
|
+
const name = frontmatter?.name || entry;
|
|
550
|
+
skillMap.set(name, {
|
|
551
|
+
name,
|
|
552
|
+
content: body,
|
|
553
|
+
frontmatter: frontmatter || undefined,
|
|
554
|
+
});
|
|
555
|
+
}
|
|
556
|
+
} catch {
|
|
557
|
+
// No SKILL.md in directory, skip
|
|
558
|
+
}
|
|
559
|
+
continue;
|
|
560
|
+
}
|
|
561
|
+
|
|
562
|
+
// Flat .md file (backwards compat): no frontmatter parsing
|
|
563
|
+
if (!entry.endsWith(".md")) continue;
|
|
564
|
+
const name = entry.slice(0, -3);
|
|
565
|
+
try {
|
|
566
|
+
const content = await readFile(entryPath, "utf-8");
|
|
567
|
+
if (content.trim()) {
|
|
568
|
+
skillMap.set(name, { name, content: content.trim() });
|
|
569
|
+
}
|
|
570
|
+
} catch {
|
|
571
|
+
// Skip unreadable files
|
|
572
|
+
}
|
|
573
|
+
}
|
|
574
|
+
}
|
|
575
|
+
|
|
576
|
+
return Array.from(skillMap.values());
|
|
577
|
+
}
|
|
578
|
+
|
|
579
|
+
// ── System Skills Registry ────────────────────────────────────────────────
|
|
580
|
+
|
|
581
|
+
async function loadSystemSkillsRegistry(
|
|
582
|
+
projectPath: string
|
|
583
|
+
): Promise<Map<string, SystemSkillEntry>> {
|
|
584
|
+
const configPath = resolve(projectPath, "config/system-skills.json");
|
|
585
|
+
try {
|
|
586
|
+
const raw = await readFile(configPath, "utf-8");
|
|
587
|
+
const data = JSON.parse(raw) as { skills: SystemSkillEntry[] };
|
|
588
|
+
if (!Array.isArray(data.skills)) return new Map();
|
|
589
|
+
return new Map(data.skills.map((skill) => [skill.id, skill]));
|
|
590
|
+
} catch {
|
|
591
|
+
// Fallback: try relative to process.cwd() (Docker mounts config/ at repo root)
|
|
592
|
+
try {
|
|
593
|
+
const fallbackPath = resolve(process.cwd(), "config/system-skills.json");
|
|
594
|
+
if (fallbackPath === configPath) return new Map();
|
|
595
|
+
const raw = await readFile(fallbackPath, "utf-8");
|
|
596
|
+
const data = JSON.parse(raw) as { skills: SystemSkillEntry[] };
|
|
597
|
+
if (!Array.isArray(data.skills)) return new Map();
|
|
598
|
+
return new Map(data.skills.map((skill) => [skill.id, skill]));
|
|
599
|
+
} catch {
|
|
600
|
+
logger.debug("No system-skills.json found");
|
|
601
|
+
return new Map();
|
|
602
|
+
}
|
|
603
|
+
}
|
|
604
|
+
}
|
|
605
|
+
|
|
606
|
+
// ── Env Var Resolution ────────────────────────────────────────────────────
|
|
607
|
+
|
|
608
|
+
/**
|
|
609
|
+
* Resolve a value that may be a $ENV_VAR reference.
|
|
610
|
+
* Returns the resolved value, or empty string if the env var is not set.
|
|
611
|
+
*/
|
|
612
|
+
function resolveEnvVar(value: string): string {
|
|
613
|
+
if (value.startsWith("$")) {
|
|
614
|
+
const varName = value.slice(1);
|
|
615
|
+
return process.env[varName] || "";
|
|
616
|
+
}
|
|
617
|
+
return value;
|
|
618
|
+
}
|