fix(task): respect agent task permission for nested sub-agents (#8111)
This commit is contained in:
committed by
GitHub
parent
20088a87b0
commit
5d37e58d34
@@ -56,6 +56,9 @@ export const TaskTool = Tool.define("task", async (ctx) => {
|
|||||||
|
|
||||||
const agent = await Agent.get(params.subagent_type)
|
const agent = await Agent.get(params.subagent_type)
|
||||||
if (!agent) throw new Error(`Unknown agent type: ${params.subagent_type} is not a valid agent type`)
|
if (!agent) throw new Error(`Unknown agent type: ${params.subagent_type} is not a valid agent type`)
|
||||||
|
|
||||||
|
const hasTaskPermission = agent.permission.some((rule) => rule.permission === "task")
|
||||||
|
|
||||||
const session = await iife(async () => {
|
const session = await iife(async () => {
|
||||||
if (params.session_id) {
|
if (params.session_id) {
|
||||||
const found = await Session.get(params.session_id).catch(() => {})
|
const found = await Session.get(params.session_id).catch(() => {})
|
||||||
@@ -76,11 +79,15 @@ export const TaskTool = Tool.define("task", async (ctx) => {
|
|||||||
pattern: "*",
|
pattern: "*",
|
||||||
action: "deny",
|
action: "deny",
|
||||||
},
|
},
|
||||||
{
|
...(hasTaskPermission
|
||||||
permission: "task",
|
? []
|
||||||
pattern: "*",
|
: [
|
||||||
action: "deny",
|
{
|
||||||
},
|
permission: "task" as const,
|
||||||
|
pattern: "*" as const,
|
||||||
|
action: "deny" as const,
|
||||||
|
},
|
||||||
|
]),
|
||||||
...(config.experimental?.primary_tools?.map((t) => ({
|
...(config.experimental?.primary_tools?.map((t) => ({
|
||||||
pattern: "*",
|
pattern: "*",
|
||||||
action: "allow" as const,
|
action: "allow" as const,
|
||||||
@@ -146,7 +153,7 @@ export const TaskTool = Tool.define("task", async (ctx) => {
|
|||||||
tools: {
|
tools: {
|
||||||
todowrite: false,
|
todowrite: false,
|
||||||
todoread: false,
|
todoread: false,
|
||||||
task: false,
|
...(hasTaskPermission ? {} : { task: false }),
|
||||||
...Object.fromEntries((config.experimental?.primary_tools ?? []).map((t) => [t, false])),
|
...Object.fromEntries((config.experimental?.primary_tools ?? []).map((t) => [t, false])),
|
||||||
},
|
},
|
||||||
parts: promptParts,
|
parts: promptParts,
|
||||||
|
|||||||
Reference in New Issue
Block a user