@qduc/term2 0.9.4 → 0.10.0

package/dist/services/subagents/runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../source/services/subagents/runtime.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAuB,MAAM,oBAAoB,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAqBlD,MAAM,UAAU,qBAAqB,CAAC,IAAyB;IAC7D,MAAM,UAAU,GAAG,IAAI,kBAAkB,CAAC;QACxC,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;QACjD,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,WAAW,EAAE,IAAI,CAAC,WAAW;KAC9B,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,IAAI,mBAAmB,CAAC;QAC1C,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,UAAU;KACX,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,IAAI,GAAG,EAAyC,CAAC;IAEvE,MAAM,YAAY,GAAG,IAAI,oBAAoB,CAAC;QAC5C,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;QACjD,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,WAAW;QACX,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,aAAa;KACd,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,IAAI,uBAAuB,CAAC;QAClD,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;QACjD,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,WAAW;QACX,OAAO,EAAE,IAAI,CAAC,OAAO;KACtB,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC;QACpC,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;QACjD,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,OAAO,EAAE,IAAI,CAAC,OAAO;KACtB,CAAC,CAAC;IAEH,OAAO;QACL,UAAU;QACV,WAAW;QACX,YAAY;QACZ,eAAe;QACf,YAAY;KACb,CAAC;AACJ,CAAC"}
+{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../source/services/subagents/runtime.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAuB,MAAM,oBAAoB,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAuBlD,MAAM,UAAU,qBAAqB,CAAC,IAAyB;IAC7D,MAAM,UAAU,GAAG,IAAI,kBAAkB,CAAC;QACxC,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;QACjD,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,WAAW,EAAE,IAAI,CAAC,WAAW;KAC9B,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,IAAI,mBAAmB,CAAC;QAC1C,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,UAAU;QACV,aAAa,EAAE,IAAI,CAAC,aAAa;KAClC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,IAAI,GAAG,EAAyC,CAAC;IAEvE,MAAM,YAAY,GAAG,IAAI,oBAAoB,CAAC;QAC5C,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;QACjD,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,WAAW;QACX,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,aAAa;QACb,aAAa,EAAE,IAAI,CAAC,aAAa;KAClC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,IAAI,uBAAuB,CAAC;QAClD,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;QACjD,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,WAAW;QACX,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,aAAa,EAAE,IAAI,CAAC,aAAa;KAClC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC;QACpC,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;QACjD,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;QACvC,OAAO,EAAE,IAAI,CAAC,OAAO;KACtB,CAAC,CAAC;IAEH,OAAO;QACL,UAAU;QACV,WAAW;QACX,YAAY;QACZ,eAAe;QACf,YAAY;KACb,CAAC;AACJ,CAAC"}

package/dist/services/subagents/subagent-manager.d.ts

@@ -5,6 +5,8 @@ import type { SubagentRequest, SubagentResult, SupportedSubagentRole } from './t
 import type { ConversationEvent } from '../conversation/conversation-events.js';
 import type { ISubagentClient, ISubagentClientFactory } from './subagent-client-types.js';
 import type { SubagentRunContext } from './tool-policy.js';
+import type { AgentRuntime } from '../agent-runtime/agent-runtime.js';
+import type { SkillsService } from '../skills/skills-service.js';
 export declare class SubagentManager {
     #private;
     constructor(deps: {
@@ -15,12 +17,21 @@ export declare class SubagentManager {
         onEvent?: (event: ConversationEvent) => void;
         agentClient?: ISubagentClient;
         createClient?: ISubagentClientFactory['createClient'];
+        skillsService?: SkillsService;
     });
     resetMentorSession(): void;
     clearCache(): void;
     getRoleAgentTool(role: SupportedSubagentRole): Tool<SubagentRunContext>;
     getRoleAgent(role: SupportedSubagentRole): Agent<SubagentRunContext>;
     runAsTool(request: SubagentRequest, context?: unknown, details?: unknown): Promise<SubagentResult>;
+    /**
+     * Obtain an AgentRuntime backed by this manager's existing subagent
+     * infrastructure (shared tool policy, execution runner, mentor runner).
+     * Avoids creating duplicate independent tool policies. The returned
+     * runtime's handles execute through the same ExecutionSubagentRunner
+     * and MentorRunner used by this manager.
+     */
+    getAgentRuntime(): AgentRuntime;
     run(request: SubagentRequest): Promise<SubagentResult>;
 }
 //# sourceMappingURL=subagent-manager.d.ts.map

package/dist/services/subagents/subagent-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-manager.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/subagent-manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAC1G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACzF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAK1F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,qBAAa,eAAe;;IAM1B,YAAY,IAAI,EAAE;QAChB,MAAM,EAAE,eAAe,CAAC;QACxB,QAAQ,EAAE,gBAAgB,CAAC;QAC3B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,qBAAqB,EAAE,sBAAsB,CAAC;QAC9C,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;QAC7C,WAAW,CAAC,EAAE,eAAe,CAAC;QAC9B,YAAY,CAAC,EAAE,sBAAsB,CAAC,cAAc,CAAC,CAAC;KACvD,EAKA;IAED,kBAAkB,IAAI,IAAI,CAEzB;IAED,UAAU,IAAI,IAAI,CAEjB;IAED,gBAAgB,CAAC,IAAI,EAAE,qBAAqB,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAEtE;IAED,YAAY,CAAC,IAAI,EAAE,qBAAqB,GAAG,KAAK,CAAC,kBAAkB,CAAC,CAEnE;IAEK,SAAS,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC,CAEvG;IAEK,GAAG,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CA2C3D;CACF"}
+{"version":3,"file":"subagent-manager.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/subagent-manager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAC1G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,qBAAqB,EAAsB,MAAM,YAAY,CAAC;AAC7G,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAI1F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAG3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAEjE,qBAAa,eAAe;;IAM1B,YAAY,IAAI,EAAE;QAChB,MAAM,EAAE,eAAe,CAAC;QACxB,QAAQ,EAAE,gBAAgB,CAAC;QAC3B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,qBAAqB,EAAE,sBAAsB,CAAC;QAC9C,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;QAC7C,WAAW,CAAC,EAAE,eAAe,CAAC;QAC9B,YAAY,CAAC,EAAE,sBAAsB,CAAC,cAAc,CAAC,CAAC;QACtD,aAAa,CAAC,EAAE,aAAa,CAAC;KAC/B,EAKA;IAED,kBAAkB,IAAI,IAAI,CAEzB;IAED,UAAU,IAAI,IAAI,CAEjB;IAED,gBAAgB,CAAC,IAAI,EAAE,qBAAqB,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAEtE;IAED,YAAY,CAAC,IAAI,EAAE,qBAAqB,GAAG,KAAK,CAAC,kBAAkB,CAAC,CAEnE;IAEK,SAAS,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC,CAEvG;IAED;;;;;;OAMG;IACH,eAAe,IAAI,YAAY,CAQ9B;IAaK,GAAG,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CA2C3D;CACF"}

package/dist/services/subagents/subagent-manager.js

@@ -1,8 +1,9 @@
 import { randomUUID } from 'node:crypto';
 import { createSubagentRuntime } from './runtime.js';
-import { loadRoleDefinition } from './role-loader.js';
 import { isAbortLike, safeEmit } from './utils.js';
 import { normalizeAgentRunUsage, extractUsage } from '../../utils/ai/token-usage.js';
+import { adaptLegacyRole, adaptLegacyDefinition } from '../agent-runtime/legacy-adapter.js';
+import { createAgentRuntimeFromSubagentRuntime } from '../agent-runtime/compose-agent-runtime.js';
 export class SubagentManager {
     #logger;
     #settings;
@@ -29,6 +30,32 @@ export class SubagentManager {
     async runAsTool(request, context, details) {
         return this.#runtime.nestedRunner.runAsTool(request, context, details);
     }
+    /**
+     * Obtain an AgentRuntime backed by this manager's existing subagent
+     * infrastructure (shared tool policy, execution runner, mentor runner).
+     * Avoids creating duplicate independent tool policies. The returned
+     * runtime's handles execute through the same ExecutionSubagentRunner
+     * and MentorRunner used by this manager.
+     */
+    getAgentRuntime() {
+        return createAgentRuntimeFromSubagentRuntime({
+            settings: this.#settings,
+            logger: this.#logger,
+            executionRunner: this.#runtime.executionRunner,
+            mentorRunner: this.#runtime.mentorRunner,
+            onEvent: this.#onEvent,
+        });
+    }
+    /**
+     * Resolve a role to a legacy SubagentDefinition through the shared
+     * ResolvedAgentDefinition adaptation path. This ensures all role
+     * definitions (explorer/worker/researcher/mentor) pass through the
+     * same resolution before execution.
+     */
+    #resolveRoleDefinition(role) {
+        const resolved = adaptLegacyRole(role, this.#settings);
+        return adaptLegacyDefinition(resolved);
+    }
     async run(request) {
         const agentId = randomUUID();
         this.#logger.debug('SubagentManager.run', { agentId, role: request.role, taskLength: request.task.length });
@@ -42,7 +69,7 @@ export class SubagentManager {
         try {
             const result = request.role === 'mentor'
                 ? await this.#runtime.mentorRunner.run(agentId, request.task, request.signal)
-                : await this.#runtime.executionRunner.run(agentId, request, loadRoleDefinition(request.role, this.#settings));
+                : await this.#runtime.executionRunner.run(agentId, request, this.#resolveRoleDefinition(request.role));
             safeEmit(this.#logger, this.#onEvent, { type: 'subagent_completed', result });
             return result;
         }

package/dist/services/subagents/subagent-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-manager.js","sourceRoot":"","sources":["../../../source/services/subagents/subagent-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"subagent-manager.js","sourceRoot":"","sources":["../../../source/services/subagents/subagent-manager.ts"],"names":[],"mappings":"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"}

package/dist/services/subagents/test-helpers/subagent-manager-fixtures.d.ts

@@ -29,6 +29,7 @@ export declare class TestSubagentManager extends RealSubagentManager {
         onEvent?: (event: any) => void;
         agentClient?: ISubagentClient;
         createClient?: ISubagentClientFactory['createClient'];
+        skillsService?: any;
     });
 }
 export { ROLE_MENTOR, ROLE_EXPLORER, ROLE_WORKER, ROLE_RESEARCHER };

package/dist/services/subagents/test-helpers/subagent-manager-fixtures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-manager-fixtures.d.ts","sourceRoot":"","sources":["../../../../source/services/subagents/test-helpers/subagent-manager-fixtures.ts"],"names":[],"mappings":"AAMA,OAAO,EAAwC,KAAK,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAC/G,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC7G,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC3F,OAAO,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAEhF,QAAA,MAAM,WAAW,WAAW,CAAC;AAC7B,QAAA,MAAM,aAAa,aAAa,CAAC;AACjC,QAAA,MAAM,WAAW,WAAW,CAAC;AAC7B,QAAA,MAAM,eAAe,eAAe,CAAC;AAerC,MAAM,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,KAAK,GAAG,CAAC;AAEvE,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC,GAAG;IACjD,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,GACA,MAAM,CAWR;AAED,wBAAgB,gBAAgB,IAAI,eAAe,CAWlD;AAED,wBAAgB,kBAAkB,CAAC,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAAG,gBAAgB,CAQzF;AAED,wBAAgB,2BAA2B,IAAI,sBAAsB,CAKpE;AAED,wBAAgB,0BAA0B,CAAC,GAAG,SAAmB,GAAG,gBAAgB,CAMnF;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,GAAG,CAE1D;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,CA2CxD;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,GAAG,GAAG,GAAG,CAoBtD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAI/C;AAED,qBAAa,mBAAoB,SAAQ,mBAAmB;IAC1D,YAAY,IAAI,EAAE;QAChB,MAAM,CAAC,EAAE,eAAe,CAAC;QACzB,QAAQ,EAAE,gBAAgB,CAAC;QAC3B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,qBAAqB,CAAC,EAAE,sBAAsB,CAAC;QAC/C,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;QAC/B,WAAW,CAAC,EAAE,eAAe,CAAC;QAC9B,YAAY,CAAC,EAAE,sBAAsB,CAAC,cAAc,CAAC,CAAC;KACvD,EA2BA;CACF;AAED,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC"}
+{"version":3,"file":"subagent-manager-fixtures.d.ts","sourceRoot":"","sources":["../../../../source/services/subagents/test-helpers/subagent-manager-fixtures.ts"],"names":[],"mappings":"AAMA,OAAO,EAAwC,KAAK,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAC/G,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC7G,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC3F,OAAO,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAEhF,QAAA,MAAM,WAAW,WAAW,CAAC;AAC7B,QAAA,MAAM,aAAa,aAAa,CAAC;AACjC,QAAA,MAAM,WAAW,WAAW,CAAC;AAC7B,QAAA,MAAM,eAAe,eAAe,CAAC;AAerC,MAAM,MAAM,UAAU,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,KAAK,GAAG,CAAC;AAEvE,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC,GAAG;IACjD,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,GACA,MAAM,CAWR;AAED,wBAAgB,gBAAgB,IAAI,eAAe,CAWlD;AAED,wBAAgB,kBAAkB,CAAC,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAAG,gBAAgB,CAQzF;AAED,wBAAgB,2BAA2B,IAAI,sBAAsB,CAKpE;AAED,wBAAgB,0BAA0B,CAAC,GAAG,SAAmB,GAAG,gBAAgB,CAMnF;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,GAAG,CAE1D;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,CA2CxD;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,GAAG,GAAG,GAAG,CAoBtD;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAI/C;AAED,qBAAa,mBAAoB,SAAQ,mBAAmB;IAC1D,YAAY,IAAI,EAAE;QAChB,MAAM,CAAC,EAAE,eAAe,CAAC;QACzB,QAAQ,EAAE,gBAAgB,CAAC;QAC3B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,qBAAqB,CAAC,EAAE,sBAAsB,CAAC;QAC/C,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;QAC/B,WAAW,CAAC,EAAE,eAAe,CAAC;QAC9B,YAAY,CAAC,EAAE,sBAAsB,CAAC,cAAc,CAAC,CAAC;QACtD,aAAa,CAAC,EAAE,GAAG,CAAC;KACrB,EA6BA;CACF;AAED,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC"}

package/dist/services/subagents/test-helpers/subagent-manager-fixtures.js

@@ -153,6 +153,7 @@ export class TestSubagentManager extends RealSubagentManager {
             sessionContextService,
             onEvent: deps.onEvent,
             agentClient: deps.agentClient,
+            skillsService: deps.skillsService,
             createClient: deps.createClient ??
                 (({ agent, provider, maxTurns, retryAttempts }) => new AgentClient({
                     model: agent.model,
@@ -163,6 +164,7 @@ export class TestSubagentManager extends RealSubagentManager {
                         settings: deps.settings,
                         executionContext: deps.executionContext,
                         sessionContextService,
+                        skillsService: deps.skillsService,
                     },
                     agentOverride: agent,
                     providerOverride: provider,

package/dist/services/subagents/test-helpers/subagent-manager-fixtures.js.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-manager-fixtures.js","sourceRoot":"","sources":["../../../../source/services/subagents/test-helpers/subagent-manager-fixtures.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"subagent-manager-fixtures.js","sourceRoot":"","sources":["../../../../source/services/subagents/test-helpers/subagent-manager-fixtures.ts"],"names":[],"mappings":"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"}

package/dist/services/subagents/tool-policy.d.ts

@@ -3,6 +3,7 @@ import type { ILoggingService, ISettingsService, ISessionContextService } from '
 import type { ExecutionContext } from '../execution-context.js';
 import type { SubagentDefinition, SupportedSubagentRole } from './types.js';
 import type { CommandMessage, ToolDefinition } from '../../tools/types.js';
+import type { SkillsService } from '../skills/skills-service.js';
 import type { ISubagentClient } from './subagent-client-types.js';
 export type SubagentRunContext = {
     agentId: string;
@@ -34,6 +35,50 @@ export declare class SubagentToolPolicy {
     wrapNestedShellTool(definition: ToolDefinition, cwd: string): ToolDefinition;
     wrapReadOnlyShellTool(definition: ToolDefinition): ToolDefinition;
     wrapWriteTool(definition: ToolDefinition, cwd: string, filesChanged: string[], extractPaths: (params: any) => string[], nestedApprovals?: boolean): ToolDefinition;
+    /**
+     * Wrap a read tool with filesystem scope enforcement.
+     * When `scopePatterns` is defined (non-undefined), every path read must
+     * match at least one pattern. Undefined scope = no restriction.
+     * Uses symlink-safe realpath resolution.
+     */
+    wrapReadToolWithScope(definition: ToolDefinition, scopePatterns: string[] | undefined, extractPath: (params: any) => string | undefined): ToolDefinition;
+    /**
+     * Wrap a write tool with filesystem scope enforcement.
+     * When `scopePatterns` is defined (non-undefined), every path written must
+     * match at least one pattern. Undefined scope = no restriction.
+     * Uses symlink-safe realpath resolution: resolves existing paths with
+     * realpath, and for nonexistent targets resolves the nearest existing
+     * ancestor to detect symlink escapes.
+     */
+    wrapWriteToolWithScope(definition: ToolDefinition, scopePatterns: string[] | undefined, extractPaths: (params: any) => string[]): ToolDefinition;
+    /**
+     * Wrap a shell tool with filesystem scope enforcement.
+     *
+     * Shell commands cannot be safely scoped to a subset of the filesystem
+     * because any command can access the entire workspace through symlinks,
+     * absolute paths, environment variables, and other means. When any
+     * finite filesystem scope is defined, the shell tool is rejected with
+     * a typed permission error.
+     */
+    wrapShellToolWithScope(definition: ToolDefinition, scopePatterns: string[] | undefined): ToolDefinition;
+    /**
+     * Wrap a network tool (web_search, web_fetch) with host scope enforcement.
+     * When `hostPatterns` is defined (non-undefined), the target URL must
+     * match at least one allowed host. Empty array = no network authority.
+     * Undefined = no restriction (legacy coarse behavior).
+     *
+     * web_search has no target host — it searches broadly. To allow
+     * web_search under host scopes, the scope must contain the literal
+     * wildcard `'*'` (meaning "all hosts").
+     *
+     * web_fetch validates the initial URL host including case and port,
+     * but the underlying HTTP library may follow redirects transparently to
+     * a different host. Because redirect targets are not observable or
+     * enforceable by the current fetch tool, web_fetch is REJECTED at
+     * definition time when host scopes are set to anything other than
+     * `['*']` (all hosts). The caller receives a typed permission error.
+     */
+    wrapNetworkToolWithScope(definition: ToolDefinition, hostPatterns: string[] | undefined, extractUrl: (params: any) => string | undefined): ToolDefinition;
 }
 export declare class SubagentToolFactory {
     #private;
@@ -42,6 +87,7 @@ export declare class SubagentToolFactory {
         logger: ILoggingService;
         executionContext?: ExecutionContext;
         toolPolicy: SubagentToolPolicy;
+        skillsService?: SkillsService;
     });
     buildToolDefinitions(definition: SubagentDefinition, filesChanged: string[], taskContext: string, searchViaShell: boolean, nestedApprovals?: boolean): ToolDefinition[];
     buildAgentTools(toolDefinitions: ToolDefinition[], options: {

package/dist/services/subagents/tool-policy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-policy.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/tool-policy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tool-policy.d.ts","sourceRoot":"","sources":["../../../source/services/subagents/tool-policy.ts"],"names":[],"mappings":"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"}

package/dist/services/subagents/tool-policy.js

@@ -1,6 +1,7 @@
 import { randomUUID } from 'node:crypto';
 import path from 'node:path';
 import { tool as createTool } from '@openai/agents';
+import { isPathInScopeSafe, isHostInScope } from '../agent-runtime/scope-resolver.js';
 import { getProvider } from '../../providers/index.js';
 import { wrapToolInvoke, wrapNeedsApproval } from '../../lib/tool-invoke.js';
 import { toOpenAIStrictToolSchema } from '../../lib/openai-strict-tool-schema.js';
@@ -15,12 +16,15 @@ import { createApplyPatchToolDefinition } from '../../tools/file/apply-patch.js'
 import { createSearchReplaceToolDefinition } from '../../tools/file/search-replace.js';
 import { createCreateFileToolDefinition } from '../../tools/file/create-file.js';
 import { createShellToolDefinition } from '../../tools/system/shell.js';
+import { createActivateSkillToolDefinition } from '../../tools/agent/activate-skill.js';
 import { registerToolFormatters } from '../../tools/command-message-formatters.js';
 import { trimToolOutput } from '../../utils/output/trim-tool-output.js';
 import { injectTurnLimitWarning } from '../../utils/inject-warning-into-tool-output.js';
 import { tryAcquireFileLock } from '../../tools/file/file-locks.js';
 import { classifyCommand, SafetyStatus } from '../../utils/shell/command-safety/index.js';
 import { evaluateShellAutoApprovalAdvisories } from '../approval/shell-auto-approval-evaluator.js';
+import { MemoryCapabilityBuilder } from '../memory/memory-capabilities.js';
+const MODEL_FACING_EDITOR_TOOLS = new Set(['apply_patch', 'search_replace', 'create_file']);
 export function getSubagentRunContext(context) {
     const candidate = context?.context;
     if (candidate &&
@@ -342,41 +346,196 @@ export class SubagentToolPolicy {
             },
         };
     }
+    /**
+     * Wrap a read tool with filesystem scope enforcement.
+     * When `scopePatterns` is defined (non-undefined), every path read must
+     * match at least one pattern. Undefined scope = no restriction.
+     * Uses symlink-safe realpath resolution.
+     */
+    wrapReadToolWithScope(definition, scopePatterns, extractPath) {
+        // No scope defined — no fine-grained restriction
+        if (scopePatterns === undefined)
+            return definition;
+        const originalExecute = definition.execute.bind(definition);
+        return {
+            ...definition,
+            execute: async (params, context, details) => {
+                const filePath = extractPath(params);
+                if (filePath) {
+                    const safe = await isPathInScopeSafe(filePath, scopePatterns);
+                    if (!safe) {
+                        return `Error: Path "${filePath}" is outside the allowed filesystem read scope.`;
+                    }
+                }
+                return originalExecute(params, context, details);
+            },
+        };
+    }
+    /**
+     * Wrap a write tool with filesystem scope enforcement.
+     * When `scopePatterns` is defined (non-undefined), every path written must
+     * match at least one pattern. Undefined scope = no restriction.
+     * Uses symlink-safe realpath resolution: resolves existing paths with
+     * realpath, and for nonexistent targets resolves the nearest existing
+     * ancestor to detect symlink escapes.
+     */
+    wrapWriteToolWithScope(definition, scopePatterns, extractPaths) {
+        if (scopePatterns === undefined)
+            return definition;
+        const originalExecute = definition.execute.bind(definition);
+        return {
+            ...definition,
+            execute: async (params, context, details) => {
+                const paths = extractPaths(params);
+                for (const filePath of paths) {
+                    const safe = await isPathInScopeSafe(filePath, scopePatterns);
+                    if (!safe) {
+                        return `Error: Path "${filePath}" is outside the allowed filesystem write scope.`;
+                    }
+                }
+                return originalExecute(params, context, details);
+            },
+        };
+    }
+    /**
+     * Wrap a shell tool with filesystem scope enforcement.
+     *
+     * Shell commands cannot be safely scoped to a subset of the filesystem
+     * because any command can access the entire workspace through symlinks,
+     * absolute paths, environment variables, and other means. When any
+     * finite filesystem scope is defined, the shell tool is rejected with
+     * a typed permission error.
+     */
+    wrapShellToolWithScope(definition, scopePatterns) {
+        if (scopePatterns !== undefined) {
+            return {
+                ...definition,
+                execute: async () => 'Error: Shell access is not permitted when filesystem scopes are configured. ' +
+                    'Filesystem scopes cannot safely restrict shell commands because the shell ' +
+                    'can bypass path-based restrictions through symlinks, absolute paths, ' +
+                    'environment variables, and arbitrary command execution. ' +
+                    'Remove filesystem scopes to use shell, or use scoped read/write tools instead.',
+            };
+        }
+        return definition;
+    }
+    /**
+     * Wrap a network tool (web_search, web_fetch) with host scope enforcement.
+     * When `hostPatterns` is defined (non-undefined), the target URL must
+     * match at least one allowed host. Empty array = no network authority.
+     * Undefined = no restriction (legacy coarse behavior).
+     *
+     * web_search has no target host — it searches broadly. To allow
+     * web_search under host scopes, the scope must contain the literal
+     * wildcard `'*'` (meaning "all hosts").
+     *
+     * web_fetch validates the initial URL host including case and port,
+     * but the underlying HTTP library may follow redirects transparently to
+     * a different host. Because redirect targets are not observable or
+     * enforceable by the current fetch tool, web_fetch is REJECTED at
+     * definition time when host scopes are set to anything other than
+     * `['*']` (all hosts). The caller receives a typed permission error.
+     */
+    wrapNetworkToolWithScope(definition, hostPatterns, extractUrl) {
+        if (hostPatterns === undefined)
+            return definition;
+        // Empty host patterns = explicitly no network authority
+        if (hostPatterns.length === 0) {
+            return {
+                ...definition,
+                execute: async () => `Error: Network access denied: no allowed hosts configured.`,
+            };
+        }
+        // ── Redirect safety guard for fetch-style tools ──
+        // If the tool follows redirects and we can't observe them, reject
+        // any finite host scope that isn't the wildcard '*'.
+        if (definition.name === 'web_fetch' && hostPatterns.length > 0 && !hostPatterns.includes('*')) {
+            return {
+                ...definition,
+                execute: async () => `Error: Permission denied: web_fetch cannot be used with finite host scopes ` +
+                    `because the underlying HTTP library may follow redirects transparently ` +
+                    `to hosts outside the allowed scope. To allow web_fetch under network ` +
+                    `restrictions, use hosts: ['*'] (all hosts). Otherwise, remove ` +
+                    `web_fetch from the tool set or omit network host scopes entirely.`,
+            };
+        }
+        const originalExecute = definition.execute.bind(definition);
+        return {
+            ...definition,
+            execute: async (params, context, details) => {
+                const url = extractUrl(params);
+                if (url) {
+                    // Host-specific validation: check the exact URL host
+                    if (!isHostInScope(url, hostPatterns)) {
+                        return `Error: Host "${url}" is not in the allowed network hosts.`;
+                    }
+                }
+                else {
+                    // No extractable URL (e.g., web_search with only a query).
+                    // This tool has no target host; it requires the wildcard scope.
+                    if (!hostPatterns.includes('*')) {
+                        return (`Error: Network access denied: the "${definition.name}" tool has no target host ` +
+                            `and requires the '*' wildcard host scope to operate under network restrictions.`);
+                    }
+                }
+                return originalExecute(params, context, details);
+            },
+        };
+    }
 }
 export class SubagentToolFactory {
     #settings;
     #logger;
     #executionContext;
     #toolPolicy;
+    #skillsService;
+    #memoryCapabilities;
     constructor(deps) {
         this.#settings = deps.settings;
         this.#logger = deps.logger;
         this.#executionContext = deps.executionContext;
         this.#toolPolicy = deps.toolPolicy;
+        this.#skillsService = deps.skillsService;
+        this.#memoryCapabilities = new MemoryCapabilityBuilder(deps.settings);
     }
     buildToolDefinitions(definition, filesChanged, taskContext, searchViaShell, nestedApprovals = false) {
         const tools = [];
         const cwd = this.#executionContext?.getCwd() ?? process.cwd();
         const isRemote = this.#executionContext?.isRemote() ?? false;
+        // Mentor is advisory-only; it must never inherit incidental capabilities.
+        if (definition.role === 'mentor')
+            return tools;
+        if (this.#skillsService && this.#skillsService.getAvailableSkillsForModel().length > 0) {
+            tools.push(createActivateSkillToolDefinition(this.#skillsService));
+        }
+        tools.push(...this.#memoryCapabilities.build({ kind: 'subagent', role: definition.role }, { projectPath: cwd }).tools);
+        // Extract resolved scopes from definition
+        const fsReadScope = definition.filesystemScope?.read;
+        const fsWriteScope = definition.filesystemScope?.write;
+        const netScope = definition.networkScope;
         if (definition.canRead) {
-            tools.push(createReadFileToolDefinition({ executionContext: this.#executionContext, allowOutsideWorkspace: false }));
+            tools.push(this.#toolPolicy.wrapReadToolWithScope(createReadFileToolDefinition({ executionContext: this.#executionContext, allowOutsideWorkspace: false }), fsReadScope, (params) => params?.path ?? params?.filePath));
             if (!searchViaShell) {
-                tools.push(createGrepToolDefinition({ executionContext: this.#executionContext }), createFindFilesToolDefinition({ executionContext: this.#executionContext }));
+                tools.push(this.#toolPolicy.wrapReadToolWithScope(createGrepToolDefinition({ executionContext: this.#executionContext }), fsReadScope, (params) => params?.path), this.#toolPolicy.wrapReadToolWithScope(createFindFilesToolDefinition({ executionContext: this.#executionContext }), fsReadScope, (params) => 
+                // When path is omitted, the tool defaults to searching from the
+                // workspace root (CWD). Use the workspace root as the base path
+                // for scope validation. Never treat the glob pattern as a path.
+                params?.path ?? '.'));
             }
             if (!isRemote) {
-                tools.push(createReadCodeOutlineToolDefinition({ executionContext: this.#executionContext }), createCodeContextSearchToolDefinition({ executionContext: this.#executionContext }));
+                tools.push(this.#toolPolicy.wrapReadToolWithScope(createReadCodeOutlineToolDefinition({ executionContext: this.#executionContext }), fsReadScope, (params) => params?.path), this.#toolPolicy.wrapReadToolWithScope(createCodeContextSearchToolDefinition({ executionContext: this.#executionContext }), fsReadScope, (params) => params?.path));
             }
         }
         if (definition.canSearchWeb) {
-            tools.push(createWebSearchToolDefinition({ settingsService: this.#settings, loggingService: this.#logger }), createWebFetchToolDefinition({ settingsService: this.#settings, loggingService: this.#logger }));
+            tools.push(this.#toolPolicy.wrapNetworkToolWithScope(createWebSearchToolDefinition({ settingsService: this.#settings, loggingService: this.#logger }), netScope, (params) => (params?.query ? undefined : params?.url)), this.#toolPolicy.wrapNetworkToolWithScope(createWebFetchToolDefinition({ settingsService: this.#settings, loggingService: this.#logger }), netScope, (params) => params?.url));
         }
         if (definition.canRunShell) {
-            const shellDef = createShellToolDefinition({
+            const shellDef = this.#toolPolicy.wrapShellToolWithScope(createShellToolDefinition({
                 settingsService: this.#settings,
                 loggingService: this.#logger,
                 executionContext: this.#executionContext,
                 searchViaShell,
-            });
+            }), fsReadScope);
             if (definition.canWrite) {
                 tools.push(nestedApprovals
                     ? this.#toolPolicy.wrapNestedShellTool(shellDef, cwd)
@@ -389,7 +548,7 @@ export class SubagentToolFactory {
         if (definition.canWrite) {
             const isGpt5 = shouldPreferPatchEditingModel(definition.model);
             if (isGpt5) {
-                tools.push(this.#toolPolicy.wrapWriteTool(createApplyPatchToolDefinition({
+                tools.push(this.#toolPolicy.wrapWriteToolWithScope(this.#toolPolicy.wrapWriteTool(createApplyPatchToolDefinition({
                     settingsService: this.#settings,
                     loggingService: this.#logger,
                     executionContext: this.#executionContext,
@@ -398,21 +557,45 @@ export class SubagentToolFactory {
                         return params.operations.map((op) => op?.path).filter(Boolean);
                     }
                     return params?.path ? [params.path] : [];
-                }, nestedApprovals));
+                }, nestedApprovals), fsWriteScope, (params) => {
+                    if (Array.isArray(params?.operations)) {
+                        return params.operations.map((op) => op?.path).filter(Boolean);
+                    }
+                    return params?.path ? [params.path] : [];
+                }));
             }
             else {
-                tools.push(this.#toolPolicy.wrapWriteTool(createSearchReplaceToolDefinition({
+                tools.push(this.#toolPolicy.wrapWriteToolWithScope(this.#toolPolicy.wrapWriteTool(createSearchReplaceToolDefinition({
                     settingsService: this.#settings,
                     loggingService: this.#logger,
                     executionContext: this.#executionContext,
-                }), cwd, filesChanged, (params) => (params?.path ? [params.path] : []), nestedApprovals), this.#toolPolicy.wrapWriteTool(createCreateFileToolDefinition({
+                }), cwd, filesChanged, (params) => (params?.path ? [params.path] : []), nestedApprovals), fsWriteScope, (params) => (params?.path ? [params.path] : [])), this.#toolPolicy.wrapWriteToolWithScope(this.#toolPolicy.wrapWriteTool(createCreateFileToolDefinition({
                     settingsService: this.#settings,
                     loggingService: this.#logger,
                     executionContext: this.#executionContext,
-                }), cwd, filesChanged, (params) => (params?.path ? [params.path] : []), nestedApprovals));
+                }), cwd, filesChanged, (params) => (params?.path ? [params.path] : []), nestedApprovals), fsWriteScope, (params) => (params?.path ? [params.path] : [])));
             }
         }
         registerToolFormatters(tools);
+        // Honor explicit tool allowlist from the definition.
+        // When a non-empty allowlist is present, only provision tools
+        // whose names appear in it. This lets AgentRuntime pass resolved
+        // tool lists through to ExecutionSubagentRunner.
+        if (definition.tools && definition.tools.length > 0) {
+            const allowed = new Set(definition.tools);
+            // The three editor names represent one capability, while models expose
+            // different concrete editing interfaces. An explicit request for any
+            // editor therefore admits the compatible editor set selected above,
+            // rather than requiring the requested spelling to match it exactly.
+            // `canWrite` remains the sole authority grant for editor tools.
+            const editorRequested = definition.canWrite && [...allowed].some((name) => MODEL_FACING_EDITOR_TOOLS.has(name));
+            return tools.filter((tool) => {
+                if (tool.name === 'activate_skill') {
+                    return true;
+                }
+                return MODEL_FACING_EDITOR_TOOLS.has(tool.name) ? editorRequested : allowed.has(tool.name);
+            });
+        }
         return tools;
     }
     buildAgentTools(toolDefinitions, options) {