@oharness/engine 0.11.0 → 0.12.0

package/dist/foreign.js

@@ -0,0 +1,198 @@
+import { readFile } from "node:fs/promises";
+import path from "node:path";
+import { agentsHome, claudeHome, claudeStateFile, codexHome } from "./paths.js";
+import { claudeServer } from "./plugins.js";
+import { parseJson } from "./util/json.js";
+import { parseToml } from "./util/toml.js";
+/**
+ * Skill directories, split by level so each can sit beneath this harness's
+ * own directory at the same level: a skill in `~/.oharness/skills` overrides
+ * one of the same name in `~/.claude/skills`, and a project's own beats both.
+ */
+export function foreignSkillRoots(cwd, config = {}) {
+    const user = [];
+    const project = [];
+    if (config.codex !== false) {
+        user.push({ dir: path.join(agentsHome(), "skills"), source: "codex" });
+        user.push({ dir: path.join(codexHome(), "skills"), source: "codex" });
+        project.push({ dir: path.join(cwd, ".agents", "skills"), source: "codex" });
+    }
+    if (config.claudeCode !== false) {
+        user.push({ dir: path.join(claudeHome(), "skills"), source: "claude" });
+        project.push({ dir: path.join(cwd, ".claude", "skills"), source: "claude" });
+    }
+    return { user, project };
+}
+/** Agent directories, on the same terms. Codex has no agent files to read. */
+export function foreignAgentRoots(cwd, config = {}) {
+    if (config.claudeCode === false)
+        return { user: [], project: [] };
+    return {
+        user: [{ dir: path.join(claudeHome(), "agents"), source: "claude" }],
+        project: [{ dir: path.join(cwd, ".claude", "agents"), source: "claude" }],
+    };
+}
+/**
+ * Every server Claude Code and Codex declare for this project, in that order,
+ * then those inside their plugins. A plugin from either is loaded for its
+ * skills and agents, but its servers are never started on their own — see
+ * `pluginContributions` — so they are offered here like any other.
+ */
+export async function foreignMcpServers(cwd, config = {}, plugins = []) {
+    return [
+        ...(config.claudeCode === false ? [] : await claudeMcpServers(cwd)),
+        ...(config.codex === false ? [] : await codexMcpServers()),
+        ...pluginServers(plugins.filter((plugin) => plugin.source === "claude" ? config.claudeCode !== false : plugin.source === "codex" && config.codex !== false)),
+    ];
+}
+function pluginServers(plugins) {
+    return plugins.flatMap((plugin) => Object.entries(plugin.mcpServers ?? {}).map(([name, config]) => ({
+        name,
+        source: plugin.source,
+        scope: "plugin",
+        plugin: plugin.name,
+        ...(plugin.title ? { pluginTitle: plugin.title } : {}),
+        file: plugin.directory,
+        config,
+        ...secretFlag(config),
+    })));
+}
+/** Find one by the key the connector list sends back. */
+export async function findForeignServer(cwd, key, config = {}, plugins = []) {
+    return (await foreignMcpServers(cwd, config, plugins)).find((one) => one.source === key.source && one.scope === key.scope && one.name === key.name &&
+        (one.plugin ?? "") === (key.plugin ?? ""));
+}
+async function claudeMcpServers(cwd) {
+    const out = [];
+    const state = claudeStateFile();
+    const raw = await readJson(state);
+    if (isRecord(raw)) {
+        out.push(...fromClaude(raw.mcpServers, "user", state));
+        const projects = isRecord(raw.projects) ? raw.projects : {};
+        const here = projects[path.resolve(cwd)];
+        if (isRecord(here))
+            out.push(...fromClaude(here.mcpServers, "local", state));
+    }
+    const shared = path.join(cwd, ".mcp.json");
+    const checkedIn = await readJson(shared);
+    if (isRecord(checkedIn))
+        out.push(...fromClaude(checkedIn.mcpServers, "project", shared));
+    return out;
+}
+function fromClaude(servers, scope, file) {
+    if (!isRecord(servers))
+        return [];
+    return Object.entries(servers).map(([name, entry]) => {
+        const translated = claudeServer(entry);
+        return "config" in translated
+            ? { name, source: "claude", scope, file, config: translated.config, ...secretFlag(translated.config) }
+            : { name, source: "claude", scope, file, reason: translated.reason };
+    });
+}
+async function codexMcpServers() {
+    const file = path.join(codexHome(), "config.toml");
+    let table;
+    try {
+        table = parseToml(await readFile(file, "utf8"));
+    }
+    catch {
+        // Missing is the common case; a file Codex itself can read but this
+        // cannot is rarer, and either way there is nothing here to offer.
+        return [];
+    }
+    const servers = table["mcp_servers"];
+    if (!isTable(servers))
+        return [];
+    const out = [];
+    for (const [name, entry] of Object.entries(servers)) {
+        if (!isTable(entry))
+            continue;
+        // Switched off in Codex is a decision this list should not undo.
+        if (entry["enabled"] === false)
+            continue;
+        const config = codexServer(entry);
+        out.push(config
+            ? { name, source: "codex", scope: "user", file, config, ...secretFlag(config) }
+            : { name, source: "codex", scope: "user", file, reason: "malformed" });
+    }
+    return out;
+}
+/**
+ * One `[mcp_servers.<name>]` table in this harness's shape.
+ *
+ * Codex names environment variables rather than writing values in a few
+ * places — `bearer_token_env_var`, `env_http_headers` — and those become
+ * `${env:NAME}` references, so the token stays in the environment here too.
+ */
+function codexServer(entry) {
+    const timeout = typeof entry["tool_timeout_sec"] === "number" ? { timeoutMs: Math.round(entry["tool_timeout_sec"] * 1000) } : {};
+    const allowed = strings(entry["enabled_tools"]);
+    const tools = allowed ? { allowedTools: allowed } : {};
+    if (typeof entry["command"] === "string") {
+        const args = strings(entry["args"]);
+        const env = stringTable(entry["env"]);
+        return {
+            type: "stdio",
+            command: entry["command"],
+            ...(args ? { args } : {}),
+            ...(env ? { env } : {}),
+            ...(typeof entry["cwd"] === "string" ? { cwd: entry["cwd"] } : {}),
+            ...tools,
+            ...timeout,
+        };
+    }
+    if (typeof entry["url"] === "string") {
+        const headers = { ...stringTable(entry["http_headers"]) };
+        for (const [header, variable] of Object.entries(stringTable(entry["env_http_headers"]) ?? {})) {
+            headers[header] = `\${env:${variable}}`;
+        }
+        if (typeof entry["bearer_token_env_var"] === "string") {
+            headers["Authorization"] = `Bearer \${env:${entry["bearer_token_env_var"]}}`;
+        }
+        return {
+            type: "http",
+            url: entry["url"],
+            ...(Object.keys(headers).length ? { headers } : {}),
+            ...tools,
+            ...timeout,
+        };
+    }
+    return undefined;
+}
+/**
+ * Whether a credential is written out rather than referenced: any header, or
+ * an environment variable whose name says it is one. Only those: they are
+ * where credentials go, and `NODE_ENV=production` is not worth a warning.
+ */
+function secretFlag(config) {
+    const entries = Object.entries((config.type === "http" ? config.headers : config.env) ?? {});
+    const credential = (name) => config.type === "http" || /key|token|secret|pass|auth|credential/i.test(name);
+    const literal = (value) => value !== "" && !/^(Bearer )?\$\{(env|auth):[^}]+\}$/.test(value);
+    return entries.some(([name, value]) => credential(name) && literal(value)) ? { inlineSecret: true } : {};
+}
+// ---------------------------------------------------------------------------
+async function readJson(file) {
+    try {
+        const parsed = parseJson(await readFile(file, "utf8"));
+        return parsed.ok ? parsed.value : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function strings(value) {
+    return Array.isArray(value) ? value.filter((item) => typeof item === "string") : undefined;
+}
+function stringTable(value) {
+    if (!isTable(value))
+        return undefined;
+    const out = Object.fromEntries(Object.entries(value).filter(([, v]) => typeof v === "string"));
+    return Object.keys(out).length ? out : undefined;
+}
+function isTable(value) {
+    return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function isRecord(value) {
+    return !!value && typeof value === "object" && !Array.isArray(value);
+}
+//# sourceMappingURL=foreign.js.map

package/dist/foreign.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"foreign.js","sourceRoot":"","sources":["../src/foreign.ts"],"names":[],"mappings":"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"}

package/dist/harness.d.ts

@@ -441,6 +441,33 @@ export declare class Harness {
      * which breaks the one loop that would let the agent improve itself.
      */
     reloadSkills(): Promise<number>;
+    /**
+     * Switch one skill off or back on, now and for later launches.
+     *
+     * Off rather than deleted: most skills in the list are files another tool
+     * put there — Claude Code's, Codex's, a plugin's — and removing someone
+     * else's file to hide it from this harness would take it from that tool
+     * too.
+     */
+    setSkillEnabled(name: string, on: boolean): Promise<void>;
+    /**
+     * Every markdown agent this harness reads, with the dialect each was
+     * written in: a Claude Code plugin's names tools and models the way
+     * Claude Code does, and is translated on the way in.
+     */
+    private markdownAgents;
+    /**
+     * Take in a plugin that arrived while the harness was running.
+     *
+     * What `create` does for every plugin at launch, for one: its skills and
+     * agents join the registries, its servers connect. Without this an install
+     * from the menu would sit inert until a restart, which reads as a broken
+     * install. A server name the config already has is left to the config, the
+     * same precedence a launch gives it.
+     */
+    adoptPlugin(directory: string): Promise<PluginDefinition | undefined>;
+    /** Undo `adoptPlugin` for a plugin whose directory is gone. */
+    dropPlugin(directory: string): Promise<void>;
     /** Providers declared by the catalog, for `/models` and login hints. */
     listCatalogProviders(): CatalogProvider[];
     listModels(configuredOnly?: boolean): ModelSpec[];

package/dist/harness.js

@@ -6,6 +6,7 @@ import { HookRegistry } from "./agent/hooks.js";
 import { Session } from "./agent/session.js";
 import { SessionStore } from "./agent/store.js";
 import { BUILTIN_SUBAGENTS, SubagentRegistry, loadMarkdownSubagents } from "./agent/subagent.js";
+import { foreignAgentRoots, foreignSkillRoots } from "./foreign.js";
 import { claudeAgent } from "./acp/claude.js";
 import { SkillRegistry } from "./agent/skills.js";
 import { SettingsStore } from "./agent/settings.js";
@@ -205,7 +206,14 @@ export class Harness {
                 ...(config.skillDirs ?? []),
                 ...(config.agentDirs ?? []),
             ],
-            ...(config.readableRoots !== undefined ? { readableRoots: config.readableRoots } : {}),
+            // Claude Code's and Codex's skill and agent directories are read, so
+            // the agent can open a skill's scripts/, but not written: those belong
+            // to the user's other tools, not to anything this harness installed.
+            readableRoots: [
+                ...(config.readableRoots ?? []),
+                ...Object.values(foreignSkillRoots(this.cwd, config.imports)).flat().map((root) => root.dir),
+                ...Object.values(foreignAgentRoots(this.cwd, config.imports)).flat().map((root) => root.dir),
+            ],
         });
         this.mcp = new McpManager(this.logger, this.auth.store, (id) => this.auth.secret(id));
         this.store = new SessionStore(config.sessionDir);
@@ -241,7 +249,7 @@ export class Harness {
             : (await ensureProjectManifest(cwd)).id;
         opts = { ...opts, cwd };
         const baseConfig = opts.config ?? (await loadConfig(cwd));
-        const plugins = await discoverPlugins(cwd, baseConfig.plugins);
+        const plugins = await discoverPlugins(cwd, pluginOptions(baseConfig));
         // Explicit user/project config is applied after plugins, so it can always
         // tighten policy or replace a plugin's MCP server declaration.
         const config = mergeConfig(pluginContributions(plugins), baseConfig);
@@ -269,7 +277,8 @@ export class Harness {
                 })
                     .catch((err) => harness.logger.warn("session pruning failed", { error: String(err) }));
             }
-            await harness.skills.discover(cwd, config.skillDirs ?? []);
+            harness.skills.setDisabled(config.disabledSkills ?? []);
+            await harness.skills.discover(cwd, config.skillDirs ?? [], config.imports ?? {});
             // Claude Agent, when the user turned it on and this machine has their
             // own Claude Code to hand work to. Before the markdown ones, so a
             // project can redefine it.
@@ -277,7 +286,7 @@ export class Harness {
                 await harness.registerClaudeAgent();
             // Markdown definitions layer over the JSON ones, so a repo can drop in an
             // agent file without editing config.
-            for (const definition of await loadMarkdownSubagents(cwd, config.agentDirs ?? [])) {
+            for (const definition of await harness.markdownAgents()) {
                 harness.subagents.register(definition);
             }
             if (config.mcpServers && Object.keys(config.mcpServers).length > 0) {
@@ -939,9 +948,109 @@ export class Harness {
      * which breaks the one loop that would let the agent improve itself.
      */
     async reloadSkills() {
-        await this.skills.discover(this.cwd, this.config.skillDirs ?? []);
+        await this.skills.discover(this.cwd, this.config.skillDirs ?? [], this.config.imports ?? {});
         return this.skills.size;
     }
+    /**
+     * Switch one skill off or back on, now and for later launches.
+     *
+     * Off rather than deleted: most skills in the list are files another tool
+     * put there — Claude Code's, Codex's, a plugin's — and removing someone
+     * else's file to hide it from this harness would take it from that tool
+     * too.
+     */
+    async setSkillEnabled(name, on) {
+        await updateUserConfig((current) => {
+            const off = new Set(current.disabledSkills ?? []);
+            if (on)
+                off.delete(name);
+            else
+                off.add(name);
+            return { ...current, disabledSkills: [...off].sort() };
+        });
+        const off = new Set(this.config.disabledSkills ?? []);
+        if (on)
+            off.delete(name);
+        else
+            off.add(name);
+        this.config.disabledSkills = [...off];
+        this.skills.setDisabled(off);
+    }
+    /**
+     * Every markdown agent this harness reads, with the dialect each was
+     * written in: a Claude Code plugin's names tools and models the way
+     * Claude Code does, and is translated on the way in.
+     */
+    async markdownAgents() {
+        const claude = new Set(this.plugins.filter((plugin) => plugin.claudeFormat).map((plugin) => plugin.agentDir));
+        const roots = (this.config.agentDirs ?? []).map((dir) => claude.has(dir) ? { dir, dialect: "claude" } : { dir });
+        return loadMarkdownSubagents(this.cwd, roots, this.config.imports ?? {});
+    }
+    /**
+     * Take in a plugin that arrived while the harness was running.
+     *
+     * What `create` does for every plugin at launch, for one: its skills and
+     * agents join the registries, its servers connect. Without this an install
+     * from the menu would sit inert until a restart, which reads as a broken
+     * install. A server name the config already has is left to the config, the
+     * same precedence a launch gives it.
+     */
+    async adoptPlugin(directory) {
+        const plugin = (await discoverPlugins(this.cwd, pluginOptions(this.config))).find((one) => one.directory === directory);
+        if (!plugin)
+            return undefined;
+        const known = this.plugins.findIndex((one) => one.name === plugin.name);
+        if (known >= 0)
+            this.plugins.splice(known, 1, plugin);
+        else
+            this.plugins.push(plugin);
+        const contributed = pluginContributions([plugin]);
+        this.config.skillDirs = [...new Set([...(this.config.skillDirs ?? []), ...contributed.skillDirs])];
+        this.config.agentDirs = [...new Set([...(this.config.agentDirs ?? []), ...contributed.agentDirs])];
+        await this.reloadSkills();
+        for (const definition of contributed.subagents)
+            this.subagents.register(definition);
+        for (const definition of await this.markdownAgents()) {
+            this.subagents.register(definition);
+        }
+        for (const [name, server] of Object.entries(contributed.mcpServers)) {
+            if (this.config.mcpServers?.[name] || this.mcp.configFor(name))
+                continue;
+            this.config.mcpServers = { ...(this.config.mcpServers ?? {}), [name]: server };
+            // One server that will not start is not a failed install; its row says
+            // why, as any connector's does.
+            await this.addMcpServer(name, server).catch((err) => this.logger.warn("plugin server unavailable", { server: name, error: String(err) }));
+        }
+        return plugin;
+    }
+    /** Undo `adoptPlugin` for a plugin whose directory is gone. */
+    async dropPlugin(directory) {
+        const index = this.plugins.findIndex((one) => one.directory === directory);
+        if (index < 0)
+            return;
+        const [plugin] = this.plugins.splice(index, 1);
+        const contributed = pluginContributions([plugin]);
+        const before = await this.markdownAgents();
+        this.config.skillDirs = (this.config.skillDirs ?? []).filter((dir) => !contributed.skillDirs.includes(dir));
+        this.config.agentDirs = (this.config.agentDirs ?? []).filter((dir) => !contributed.agentDirs.includes(dir));
+        await this.reloadSkills();
+        const after = new Set((await this.markdownAgents()).map((one) => one.name));
+        for (const definition of [...before, ...contributed.subagents]) {
+            if (after.has(definition.name))
+                continue;
+            const registered = this.subagents.get(definition.name);
+            if (registered)
+                this.subagents.unregister(registered);
+        }
+        for (const name of Object.keys(contributed.mcpServers)) {
+            const mine = this.config.mcpServers?.[name] === contributed.mcpServers[name];
+            if (!mine)
+                continue;
+            const { [name]: _gone, ...rest } = this.config.mcpServers ?? {};
+            this.config.mcpServers = rest;
+            await this.removeMcpServer(name);
+        }
+    }
     /** Providers declared by the catalog, for `/models` and login hints. */
     listCatalogProviders() {
         return this.providers.listCatalogProviders();
@@ -1361,4 +1470,18 @@ export class Harness {
         return first.id;
     }
 }
+/**
+ * Plugin discovery, with `imports` deciding for the two other tools' caches
+ * where `plugins` does not: switching Codex off is switching off its skills,
+ * servers and plugins together.
+ */
+function pluginOptions(config) {
+    const claudeCode = config.plugins?.claudeCode ?? config.imports?.claudeCode;
+    const codex = config.plugins?.codex ?? config.imports?.codex;
+    return {
+        ...config.plugins,
+        ...(claudeCode !== undefined ? { claudeCode } : {}),
+        ...(codex !== undefined ? { codex } : {}),
+    };
+}
 //# sourceMappingURL=harness.js.map