@xingular/harness 1.3.1-unstable.2 → 1.3.1-unstable.3

package/dist/sdk/tools/dispatch.js

@@ -8,7 +8,7 @@ import * as recall from "../history/recall.js";
 import * as trajectory from "../history/trajectory.js";
 import * as notes from "../wiki/notes.js";
 import * as proposals from "../plugins/proposals.js";
-import { defaultSkillPaths } from "./defaultSkills.js";
+import { defaultSkillPaths, readSkillFile, SKILL_NAME } from "./defaultSkills.js";
 function str(params, key) {
     const value = params[key];
     return typeof value === 'string' ? value : '';
@@ -60,20 +60,19 @@ export function dispatch(env, context, call, params, options = {}) {
 /** A skill's text from the run's variant, or the list of its skills. */
 export function loadSkill(variantDir, name) {
     const skills = variantDir && existsSync(join(variantDir, 'skills')) ? readdirSync(join(variantDir, 'skills'), { withFileTypes: true }).filter((entry) => entry.isDirectory() && existsSync(join(variantDir, 'skills', entry.name, 'SKILL.md'))).map((entry) => entry.name).sort() : [];
-    const defaults = defaultSkillPaths(variantDir);
-    if (defaults.length)
+    if (!skills.includes('plugin-authoring') && defaultSkillPaths(variantDir).length)
         skills.push('plugin-authoring');
     skills.sort();
     const wanted = name.trim().replace(/^skills\//, '').replace(/`/g, '');
     if (!wanted)
         return skills.length ? `Your skills: ${skills.join(', ')}. Load one with skill_load and its name.` : 'You have no skills.';
-    if (!/^[a-z0-9][a-z0-9_-]*$/.test(wanted))
+    if (!SKILL_NAME.test(wanted))
         throw invalid('A skill name is lowercase letters, digits, _ or -.');
     if (!skills.includes(wanted))
         return `There is no skill named ${wanted}.${skills.length ? ` Your skills: ${skills.join(', ')}.` : ''}`;
-    if (wanted === 'plugin-authoring' && defaults.length)
-        return readFileSync(defaults[0], 'utf8');
-    const dir = join(variantDir, 'skills', wanted);
-    const helpers = existsSync(join(dir, 'scripts')) ? readdirSync(join(dir, 'scripts')) : [];
-    return `${readFileSync(join(dir, 'SKILL.md'), 'utf8')}${helpers.length ? `\n\n(This skill's helpers are in ${join(dir, 'scripts')}: ${helpers.join(', ')}.)` : ''}`;
+    const skill = readSkillFile(variantDir, wanted);
+    if (!skill)
+        return `There is no skill named ${wanted}.${skills.length ? ` Your skills: ${skills.join(', ')}.` : ''}`;
+    const helperNote = skill.helpers.length ? `\n\n(This skill's helpers are in ${join(skill.baseDir, 'scripts')}: ${skill.helpers.join(', ')}.)` : '';
+    return `${readFileSync(skill.path, 'utf8')}${helperNote}`;
 }

package/dist/sdk/tools/spawnSubagent.d.ts

@@ -1,4 +1,4 @@
 import type { Subagents } from "../sessions/subagentService.js";
 import type { ToolSpec } from "./types.js";
-export { SPAWN_SUBAGENT, SUBAGENT_RELATION, DEFAULT_SUBAGENT_DEPTH, MAX_SUBAGENT_DEPTH, subagentDepth, subagentReport, type SubagentOptions } from "../sessions/subagents.js";
+export { SPAWN_SUBAGENT, SUBAGENT_RELATION, DEFAULT_SUBAGENT_CHILDREN, DEFAULT_SUBAGENT_DEPTH, MAX_SUBAGENT_CHILDREN, MAX_SUBAGENT_DEPTH, subagentDepth, subagentQuota, subagentReport, type SubagentOptions, type SubagentQuota } from "../sessions/subagents.js";
 export declare function subagentTools(service: Subagents, parentRunId: string): ToolSpec[];

package/dist/sdk/tools/spawnSubagent.js

@@ -1,6 +1,6 @@
 import { HarnessError, invalid } from "../core/errors.js";
 import { SPAWN_SUBAGENT, WAIT_SUBAGENTS, SUBAGENT_RECEIPT, MAX_SUBAGENT_TITLE_WORDS, subagentTitle } from "../sessions/subagents.js";
-export { SPAWN_SUBAGENT, SUBAGENT_RELATION, DEFAULT_SUBAGENT_DEPTH, MAX_SUBAGENT_DEPTH, subagentDepth, subagentReport } from "../sessions/subagents.js";
+export { SPAWN_SUBAGENT, SUBAGENT_RELATION, DEFAULT_SUBAGENT_CHILDREN, DEFAULT_SUBAGENT_DEPTH, MAX_SUBAGENT_CHILDREN, MAX_SUBAGENT_DEPTH, subagentDepth, subagentQuota, subagentReport } from "../sessions/subagents.js";
 function reported(parentRunId, results, spawned) {
     const included = [];
     let length = 0;
@@ -14,6 +14,8 @@ function reported(parentRunId, results, spawned) {
     return { text: JSON.stringify({ results: included, ...(results.length > included.length ? { remaining: results.slice(included.length).map((result) => result.runId) } : {}) }), details: { [SUBAGENT_RECEIPT]: receipt } };
 }
 export function subagentTools(service, parentRunId) {
+    const quota = service.quota(parentRunId);
+    const budget = `This run allows at most ${quota.children} children: ${Object.entries(quota.profiles).map(([name, value]) => `${value} ${name}`).join(', ')}, ${quota.other} of any other profile and ${quota.unprofiled} unprofiled; a refused spawn means do the work yourself.`;
     const execute = (fn) => async (input) => {
         try {
             return await fn(input);
@@ -27,7 +29,7 @@ export function subagentTools(service, parentRunId) {
     return [{
             name: SPAWN_SUBAGENT,
             label: 'Start a subagent',
-            description: 'Start a fresh child run for independent work. Delegate substantial, bounded tasks that benefit from a separate context, not simple lookups, tiny edits or tightly coupled steps. Prefer a named specialist profile; omit agent only when no profile fits. Plan mode permits only eligible read-only research profiles. Give a short title and a self-contained brief: the child has no conversation history and no more capabilities than you. The optional tools field only narrows the profile and parent intersection; in plan mode, omit it unless you need a stricter subset. Returns its run ID immediately by default so you can continue other useful work. Results arrive automatically before you finish. Use wait_subagents when you need results before proceeding, or wait: true for an inline result. Avoid overlapping write assignments. Stopping you stops your children. To resume a child that stopped before finishing (interrupted or failed), pass continue with its run ID and no title, agent or tools: it reopens that child\'s own conversation with the same profile and tools, and brief becomes an optional extra instruction.',
+            description: 'Start a fresh child run for independent work. Delegate substantial, bounded tasks that benefit from a separate context, not simple lookups, tiny edits or tightly coupled steps. Prefer a named specialist profile; omit agent only when no profile fits. Plan mode permits only eligible read-only research profiles. Give a short title and a self-contained brief: the child has no conversation history and no more capabilities than you. The optional tools field only narrows the profile and parent intersection; in plan mode, omit it unless you need a stricter subset. Returns its run ID immediately by default so you can continue other useful work. Results arrive automatically before you finish. Use wait_subagents when you need results before proceeding, or wait: true for an inline result. Avoid overlapping write assignments. Stopping you stops your children. To resume a child that stopped before finishing (interrupted or failed), pass continue with its run ID and no title, agent or tools: it reopens that child\'s own conversation with the same profile and tools, and brief becomes an optional extra instruction. ' + budget,
             planModeSafe: input => service.planSpawnRefusal(parentRunId, input) === null,
             parameters: (Type) => Type.Object({
                 title: Type.Optional(Type.String({ description: `Required for a new child: a short imperative title for the roster, at most ${MAX_SUBAGENT_TITLE_WORDS} words, such as "Map the auth flow"` })),