mu-harness 0.16.11 → 0.16.12

package/esm/harness/npm/src/agents/index.d.ts

@@ -1,4 +1,4 @@
-export type { Agent, ToolDecision, ToolGrants } from './types.js';
-export { type AgentRegistry, createAgentRegistry, toolDecision, toolNames } from './registry.js';
+export type { Agent, GrantValue, ToolDecision, ToolGrants } from './types.js';
+export { type AgentRegistry, createAgentRegistry, grantArg, toolDecision, toolNames } from './registry.js';
 export { parseAgent } from './parser.js';
 export { loadAgents } from './loader.js';

package/esm/harness/npm/src/agents/index.js

@@ -1,3 +1,3 @@
-export { createAgentRegistry, toolDecision, toolNames } from './registry.js';
+export { createAgentRegistry, grantArg, toolDecision, toolNames } from './registry.js';
 export { parseAgent } from './parser.js';
 export { loadAgents } from './loader.js';

package/esm/harness/npm/src/agents/parser.js

@@ -1,9 +1,17 @@
 import { parseFrontmatter, str } from '../common/index.js';
 const DECISIONS = new Set(['allow', 'ask', 'deny']);
+const isDecision = (value) => typeof value === 'string' && DECISIONS.has(value);
 const parseStringList = (raw) => (Array.isArray(raw) ? raw : raw.split(','))
     .filter((entry) => typeof entry === 'string')
     .map((entry) => entry.trim())
     .filter(Boolean);
+const parseDecisionMap = (raw) => {
+    const out = {};
+    for (const [key, value] of Object.entries(raw))
+        if (isDecision(value))
+            out[key] = value;
+    return Object.keys(out).length > 0 ? out : undefined;
+};
 const parseTools = (raw) => {
     if (Array.isArray(raw) || typeof raw === 'string') {
         const list = parseStringList(raw);
@@ -11,9 +19,14 @@ const parseTools = (raw) => {
     }
     if (raw && typeof raw === 'object') {
         const out = {};
-        for (const [tool, decision] of Object.entries(raw)) {
-            if (typeof decision === 'string' && DECISIONS.has(decision))
-                out[tool] = decision;
+        for (const [tool, value] of Object.entries(raw)) {
+            if (isDecision(value))
+                out[tool] = value;
+            else if (value && typeof value === 'object' && !Array.isArray(value)) {
+                const nested = parseDecisionMap(value);
+                if (nested)
+                    out[tool] = nested;
+            }
         }
         return Object.keys(out).length > 0 ? out : undefined;
     }

package/esm/harness/npm/src/agents/registry.d.ts

@@ -3,6 +3,7 @@ export interface AgentRegistry {
     list(): Agent[];
     get(name: string): Agent | undefined;
 }
-export declare const toolDecision: (agent: Agent, tool: string) => ToolDecision;
+export declare const grantArg: (tool: string, input: unknown) => string | undefined;
+export declare const toolDecision: (agent: Agent, tool: string, arg?: string) => ToolDecision;
 export declare const toolNames: (agent: Agent) => string[] | undefined;
 export declare const createAgentRegistry: (agents?: Agent[]) => AgentRegistry;

package/esm/harness/npm/src/agents/registry.js

@@ -1,24 +1,59 @@
-const asMap = (tools) => {
-    if (!tools)
+import { matchesGlob } from 'node:path';
+const asMap = (grants) => {
+    if (!grants)
         return undefined;
-    if (Array.isArray(tools))
-        return Object.fromEntries(tools.map((tool) => [tool, 'allow']));
-    return tools;
+    if (Array.isArray(grants))
+        return Object.fromEntries(grants.map((name) => [name, 'allow']));
+    return grants;
 };
-export const toolDecision = (agent, tool) => {
-    const map = asMap(agent.tools);
+const matchKey = (keys, name) => {
+    if (keys.includes(name))
+        return name;
+    let glob;
+    for (const key of keys) {
+        if (key === '*' || key === name)
+            continue;
+        if (matchesGlob(name, key) && (glob === undefined || key.length > glob.length))
+            glob = key;
+    }
+    if (glob !== undefined)
+        return glob;
+    return keys.includes('*') ? '*' : undefined;
+};
+const resolveGrant = (grants, tool, arg) => {
+    const map = asMap(grants);
     if (!map)
         return 'allow';
-    return map[tool] ?? map['*'] ?? 'deny';
+    const key = matchKey(Object.keys(map), tool);
+    if (key === undefined)
+        return 'deny';
+    const value = map[key];
+    if (typeof value === 'string')
+        return value;
+    if (arg === undefined)
+        return 'allow';
+    const inner = matchKey(Object.keys(value), arg);
+    return inner === undefined ? 'deny' : value[inner];
 };
-export const toolNames = (agent) => {
-    const map = asMap(agent.tools);
+const grantNames = (grants) => {
+    const map = asMap(grants);
     if (!map)
         return undefined;
-    if (map['*'] && map['*'] !== 'deny')
+    const wildcard = map['*'];
+    if (wildcard !== undefined && wildcard !== 'deny')
         return ['*'];
-    return Object.entries(map).filter(([, decision]) => decision !== 'deny').map(([tool]) => tool);
+    return Object.entries(map).filter(([, value]) => value !== 'deny').map(([name]) => name);
+};
+const GRANT_ARG = { skill: 'name', bash: 'command' };
+export const grantArg = (tool, input) => {
+    const field = GRANT_ARG[tool];
+    if (!field || typeof input !== 'object' || input === null)
+        return undefined;
+    const value = input[field];
+    return typeof value === 'string' ? value : undefined;
 };
+export const toolDecision = (agent, tool, arg) => resolveGrant(agent.tools, tool, arg);
+export const toolNames = (agent) => grantNames(agent.tools);
 const merge = (base, child) => ({
     name: child.name,
     description: child.description || base.description,

package/esm/harness/npm/src/agents/types.d.ts

@@ -1,5 +1,6 @@
 export type ToolDecision = 'allow' | 'ask' | 'deny';
-export type ToolGrants = string[] | Record<string, ToolDecision>;
+export type GrantValue = ToolDecision | Record<string, ToolDecision>;
+export type ToolGrants = string[] | Record<string, GrantValue>;
 export interface Agent {
     name: string;
     description: string;

package/esm/harness/npm/src/harness/create.js

@@ -1,6 +1,6 @@
 import { join } from 'node:path';
 import process from 'node:process';
-import { createAgentRegistry, loadAgents, toolDecision, toolNames } from '../agents/index.js';
+import { createAgentRegistry, grantArg, loadAgents, toolDecision, toolNames } from '../agents/index.js';
 import { createAgentsCommand, createCommandRegistry, createHelpCommand, createSessionsCommand, createSkillsCommand, } from '../commands/index.js';
 import { createHarnessConfig } from '../config/index.js';
 import { mergeHooks } from '../hooks/index.js';
@@ -33,22 +33,35 @@ export const createHarness = async (options) => {
     const cwdSkills = await loadSkills(cwdSkillsDir);
     const diskSkills = await loadSkills(skillsDir);
     const skills = createSkillRegistry([...hostSkills, ...pluginSkills, ...cwdSkills, ...diskSkills]);
-    const skillTools = [
-        createSkillTool(skills),
-        createSkillWriterTool({ dirs: { local: cwdSkillsDir, config: skillsDir }, registry: skills }),
-    ];
+    const skillWriterTool = createSkillWriterTool({
+        dirs: { local: cwdSkillsDir, config: skillsDir },
+        registry: skills,
+    });
+    const scopeSkills = (agent) => {
+        if (!agent)
+            return skills;
+        return skills.select(skills.list().map((s) => s.name).filter((name) => toolDecision(agent, 'skill', name) !== 'deny'));
+    };
     const tasks = enableScheduler ? createTaskStore({ dir: join(config.configDir, 'tasks') }) : undefined;
     let schedulerTools = [];
     const runs = createSubAgentRegistry();
     const store = createSessionStore({ dir: join(config.dataDir, 'sessions') });
-    const sessionTools = (extra = []) => [...(sessionDefaults.tools ?? []), ...extra, ...skillTools, ...schedulerTools];
+    const sessionTools = (agent, extra = []) => [
+        ...(sessionDefaults.tools ?? []),
+        ...extra,
+        createSkillTool(scopeSkills(agent)),
+        skillWriterTool,
+        ...schedulerTools,
+    ];
     const approvalHook = (getAgent) => approvals
         ? approvals.manager.hooksFor({
             decide: (call) => {
                 const agent = getAgent();
                 if (!agent)
                     return 'allow';
-                return approvals.decide ? approvals.decide(agent, call) : toolDecision(agent, call.name);
+                if (approvals.decide)
+                    return approvals.decide(agent, call);
+                return toolDecision(agent, call.name, grantArg(call.name, call.input));
             },
             agent: () => getAgent()?.name,
         })
@@ -62,7 +75,7 @@ export const createHarness = async (options) => {
         id: newId(),
     });
     const spawn = (agent) => persistTo(store, persona(agent, {
-        tools: sessionTools(),
+        tools: sessionTools(agent),
         hooks: mergeHooks([sessionDefaults.hooks, allowList(toolNames(agent)), approvalHook(() => agent)]),
     }));
     const scheduler = enableScheduler && tasks
@@ -112,7 +125,7 @@ export const createHarness = async (options) => {
         revive: ({ id, model: ref, messages }) => createAgentSession({
             ...sessionDefaults,
             hooks: mergeHooks([sessionDefaults.hooks, approvalHook(() => approvals?.activeAgent())]),
-            tools: sessionTools([createSubAgentTool({ registry: agents, spawn, runs, parentId: id })]),
+            tools: sessionTools(undefined, [createSubAgentTool({ registry: agents, spawn, runs, parentId: id })]),
             ...models.resolve(ref),
             id,
             messages,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mu-harness",
-  "version": "0.16.11",
+  "version": "0.16.12",
   "description": "Agent harness: createHarness wires mu-core into a host — XDG paths, model registry, plugins, disk-loaded agents & skills, sub-agents, sessions (JSONL + SQLite catalog), slash commands, permission/approval hooks, an optional scheduler, and a composable TUI chat app",
   "license": "MIT",
   "main": "./script/index.js",
@@ -16,8 +16,8 @@
   "dependencies": {
     "@swc/wasm-typescript": "^1.15.0",
     "croner": "^9.0.0",
-    "mu-core": "^0.16.11",
-    "mu-tui": "^0.16.11"
+    "mu-core": "^0.16.12",
+    "mu-tui": "^0.16.12"
   },
   "_generatedBy": "dnt@dev"
 }

package/script/harness/npm/src/agents/index.d.ts

@@ -1,4 +1,4 @@
-export type { Agent, ToolDecision, ToolGrants } from './types.js';
-export { type AgentRegistry, createAgentRegistry, toolDecision, toolNames } from './registry.js';
+export type { Agent, GrantValue, ToolDecision, ToolGrants } from './types.js';
+export { type AgentRegistry, createAgentRegistry, grantArg, toolDecision, toolNames } from './registry.js';
 export { parseAgent } from './parser.js';
 export { loadAgents } from './loader.js';

package/script/harness/npm/src/agents/index.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadAgents = exports.parseAgent = exports.toolNames = exports.toolDecision = exports.createAgentRegistry = void 0;
+exports.loadAgents = exports.parseAgent = exports.toolNames = exports.toolDecision = exports.grantArg = exports.createAgentRegistry = void 0;
 var registry_js_1 = require("./registry.js");
 Object.defineProperty(exports, "createAgentRegistry", { enumerable: true, get: function () { return registry_js_1.createAgentRegistry; } });
+Object.defineProperty(exports, "grantArg", { enumerable: true, get: function () { return registry_js_1.grantArg; } });
 Object.defineProperty(exports, "toolDecision", { enumerable: true, get: function () { return registry_js_1.toolDecision; } });
 Object.defineProperty(exports, "toolNames", { enumerable: true, get: function () { return registry_js_1.toolNames; } });
 var parser_js_1 = require("./parser.js");

package/script/harness/npm/src/agents/parser.js

@@ -3,10 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseAgent = void 0;
 const index_js_1 = require("../common/index.js");
 const DECISIONS = new Set(['allow', 'ask', 'deny']);
+const isDecision = (value) => typeof value === 'string' && DECISIONS.has(value);
 const parseStringList = (raw) => (Array.isArray(raw) ? raw : raw.split(','))
     .filter((entry) => typeof entry === 'string')
     .map((entry) => entry.trim())
     .filter(Boolean);
+const parseDecisionMap = (raw) => {
+    const out = {};
+    for (const [key, value] of Object.entries(raw))
+        if (isDecision(value))
+            out[key] = value;
+    return Object.keys(out).length > 0 ? out : undefined;
+};
 const parseTools = (raw) => {
     if (Array.isArray(raw) || typeof raw === 'string') {
         const list = parseStringList(raw);
@@ -14,9 +22,14 @@ const parseTools = (raw) => {
     }
     if (raw && typeof raw === 'object') {
         const out = {};
-        for (const [tool, decision] of Object.entries(raw)) {
-            if (typeof decision === 'string' && DECISIONS.has(decision))
-                out[tool] = decision;
+        for (const [tool, value] of Object.entries(raw)) {
+            if (isDecision(value))
+                out[tool] = value;
+            else if (value && typeof value === 'object' && !Array.isArray(value)) {
+                const nested = parseDecisionMap(value);
+                if (nested)
+                    out[tool] = nested;
+            }
         }
         return Object.keys(out).length > 0 ? out : undefined;
     }

package/script/harness/npm/src/agents/registry.d.ts

@@ -3,6 +3,7 @@ export interface AgentRegistry {
     list(): Agent[];
     get(name: string): Agent | undefined;
 }
-export declare const toolDecision: (agent: Agent, tool: string) => ToolDecision;
+export declare const grantArg: (tool: string, input: unknown) => string | undefined;
+export declare const toolDecision: (agent: Agent, tool: string, arg?: string) => ToolDecision;
 export declare const toolNames: (agent: Agent) => string[] | undefined;
 export declare const createAgentRegistry: (agents?: Agent[]) => AgentRegistry;

package/script/harness/npm/src/agents/registry.js

@@ -1,28 +1,64 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAgentRegistry = exports.toolNames = exports.toolDecision = void 0;
-const asMap = (tools) => {
-    if (!tools)
+exports.createAgentRegistry = exports.toolNames = exports.toolDecision = exports.grantArg = void 0;
+const node_path_1 = require("node:path");
+const asMap = (grants) => {
+    if (!grants)
         return undefined;
-    if (Array.isArray(tools))
-        return Object.fromEntries(tools.map((tool) => [tool, 'allow']));
-    return tools;
+    if (Array.isArray(grants))
+        return Object.fromEntries(grants.map((name) => [name, 'allow']));
+    return grants;
 };
-const toolDecision = (agent, tool) => {
-    const map = asMap(agent.tools);
+const matchKey = (keys, name) => {
+    if (keys.includes(name))
+        return name;
+    let glob;
+    for (const key of keys) {
+        if (key === '*' || key === name)
+            continue;
+        if ((0, node_path_1.matchesGlob)(name, key) && (glob === undefined || key.length > glob.length))
+            glob = key;
+    }
+    if (glob !== undefined)
+        return glob;
+    return keys.includes('*') ? '*' : undefined;
+};
+const resolveGrant = (grants, tool, arg) => {
+    const map = asMap(grants);
     if (!map)
         return 'allow';
-    return map[tool] ?? map['*'] ?? 'deny';
+    const key = matchKey(Object.keys(map), tool);
+    if (key === undefined)
+        return 'deny';
+    const value = map[key];
+    if (typeof value === 'string')
+        return value;
+    if (arg === undefined)
+        return 'allow';
+    const inner = matchKey(Object.keys(value), arg);
+    return inner === undefined ? 'deny' : value[inner];
 };
-exports.toolDecision = toolDecision;
-const toolNames = (agent) => {
-    const map = asMap(agent.tools);
+const grantNames = (grants) => {
+    const map = asMap(grants);
     if (!map)
         return undefined;
-    if (map['*'] && map['*'] !== 'deny')
+    const wildcard = map['*'];
+    if (wildcard !== undefined && wildcard !== 'deny')
         return ['*'];
-    return Object.entries(map).filter(([, decision]) => decision !== 'deny').map(([tool]) => tool);
+    return Object.entries(map).filter(([, value]) => value !== 'deny').map(([name]) => name);
 };
+const GRANT_ARG = { skill: 'name', bash: 'command' };
+const grantArg = (tool, input) => {
+    const field = GRANT_ARG[tool];
+    if (!field || typeof input !== 'object' || input === null)
+        return undefined;
+    const value = input[field];
+    return typeof value === 'string' ? value : undefined;
+};
+exports.grantArg = grantArg;
+const toolDecision = (agent, tool, arg) => resolveGrant(agent.tools, tool, arg);
+exports.toolDecision = toolDecision;
+const toolNames = (agent) => grantNames(agent.tools);
 exports.toolNames = toolNames;
 const merge = (base, child) => ({
     name: child.name,

package/script/harness/npm/src/agents/types.d.ts

@@ -1,5 +1,6 @@
 export type ToolDecision = 'allow' | 'ask' | 'deny';
-export type ToolGrants = string[] | Record<string, ToolDecision>;
+export type GrantValue = ToolDecision | Record<string, ToolDecision>;
+export type ToolGrants = string[] | Record<string, GrantValue>;
 export interface Agent {
     name: string;
     description: string;

package/script/harness/npm/src/harness/create.js

@@ -39,22 +39,35 @@ const createHarness = async (options) => {
     const cwdSkills = await (0, index_js_9.loadSkills)(cwdSkillsDir);
     const diskSkills = await (0, index_js_9.loadSkills)(skillsDir);
     const skills = (0, index_js_9.createSkillRegistry)([...hostSkills, ...pluginSkills, ...cwdSkills, ...diskSkills]);
-    const skillTools = [
-        (0, index_js_9.createSkillTool)(skills),
-        (0, index_js_9.createSkillWriterTool)({ dirs: { local: cwdSkillsDir, config: skillsDir }, registry: skills }),
-    ];
+    const skillWriterTool = (0, index_js_9.createSkillWriterTool)({
+        dirs: { local: cwdSkillsDir, config: skillsDir },
+        registry: skills,
+    });
+    const scopeSkills = (agent) => {
+        if (!agent)
+            return skills;
+        return skills.select(skills.list().map((s) => s.name).filter((name) => (0, index_js_1.toolDecision)(agent, 'skill', name) !== 'deny'));
+    };
     const tasks = enableScheduler ? (0, index_js_7.createTaskStore)({ dir: (0, node_path_1.join)(config.configDir, 'tasks') }) : undefined;
     let schedulerTools = [];
     const runs = (0, index_js_10.createSubAgentRegistry)();
     const store = (0, index_js_8.createSessionStore)({ dir: (0, node_path_1.join)(config.dataDir, 'sessions') });
-    const sessionTools = (extra = []) => [...(sessionDefaults.tools ?? []), ...extra, ...skillTools, ...schedulerTools];
+    const sessionTools = (agent, extra = []) => [
+        ...(sessionDefaults.tools ?? []),
+        ...extra,
+        (0, index_js_9.createSkillTool)(scopeSkills(agent)),
+        skillWriterTool,
+        ...schedulerTools,
+    ];
     const approvalHook = (getAgent) => approvals
         ? approvals.manager.hooksFor({
             decide: (call) => {
                 const agent = getAgent();
                 if (!agent)
                     return 'allow';
-                return approvals.decide ? approvals.decide(agent, call) : (0, index_js_1.toolDecision)(agent, call.name);
+                if (approvals.decide)
+                    return approvals.decide(agent, call);
+                return (0, index_js_1.toolDecision)(agent, call.name, (0, index_js_1.grantArg)(call.name, call.input));
             },
             agent: () => getAgent()?.name,
         })
@@ -68,7 +81,7 @@ const createHarness = async (options) => {
         id: newId(),
     });
     const spawn = (agent) => (0, index_js_8.persistTo)(store, persona(agent, {
-        tools: sessionTools(),
+        tools: sessionTools(agent),
         hooks: (0, index_js_4.mergeHooks)([sessionDefaults.hooks, (0, index_js_5.allowList)((0, index_js_1.toolNames)(agent)), approvalHook(() => agent)]),
     }));
     const scheduler = enableScheduler && tasks
@@ -118,7 +131,7 @@ const createHarness = async (options) => {
         revive: ({ id, model: ref, messages }) => (0, index_js_8.createAgentSession)({
             ...sessionDefaults,
             hooks: (0, index_js_4.mergeHooks)([sessionDefaults.hooks, approvalHook(() => approvals?.activeAgent())]),
-            tools: sessionTools([(0, index_js_10.createSubAgentTool)({ registry: agents, spawn, runs, parentId: id })]),
+            tools: sessionTools(undefined, [(0, index_js_10.createSubAgentTool)({ registry: agents, spawn, runs, parentId: id })]),
             ...models.resolve(ref),
             id,
             messages,