@voltagent/core 2.3.5 → 2.3.6

package/dist/index.d.mts

@@ -6757,6 +6757,7 @@ type WorkspaceSandboxExecuteOptions = {
     signal?: AbortSignal;
     onStdout?: (chunk: string) => void;
     onStderr?: (chunk: string) => void;
+    operationContext?: OperationContext;
 };
 type WorkspaceSandboxStatus = "idle" | "ready" | "destroyed" | "error";
 type WorkspaceSandboxResult = {
@@ -6878,6 +6879,7 @@ type WorkspaceSearchOptions = {
     snippetLength?: number;
     lexicalWeight?: number;
     vectorWeight?: number;
+    context?: WorkspaceFilesystemCallContext;
 };
 type WorkspaceSearchResult = {
     id: string;
@@ -6912,6 +6914,7 @@ type WorkspaceSkillSearchHybridWeights = {
 type WorkspaceSkillsRootResolverContext = {
     workspace: WorkspaceIdentity;
     filesystem: WorkspaceFilesystem;
+    operationContext?: OperationContext;
 };
 type WorkspaceSkillsRootResolver = (context?: WorkspaceSkillsRootResolverContext) => string[] | undefined | null | Promise<string[] | undefined | null>;
 type WorkspaceSkillsConfig = {
@@ -6950,6 +6953,7 @@ type WorkspaceSkillSearchOptions = {
     snippetLength?: number;
     lexicalWeight?: number;
     vectorWeight?: number;
+    context?: WorkspaceFilesystemCallContext;
 };
 type WorkspaceSkillSearchResult = {
     id: string;
@@ -7302,9 +7306,12 @@ declare class WorkspaceSearch {
     private ensureAutoIndex;
     indexPaths(paths?: Array<WorkspaceSearchIndexPath | string>, options?: {
         maxFileBytes?: number;
+        context?: WorkspaceFilesystemCallContext;
     }): Promise<WorkspaceSearchIndexSummary>;
     indexDocuments(docs: WorkspaceSearchDocument[]): Promise<WorkspaceSearchIndexSummary>;
-    indexContent(path: string, content: string, metadata?: Record<string, unknown>): Promise<WorkspaceSearchIndexSummary>;
+    indexContent(path: string, content: string, metadata?: Record<string, unknown>, _options?: {
+        context?: WorkspaceFilesystemCallContext;
+    }): Promise<WorkspaceSearchIndexSummary>;
     search(query: string, options?: WorkspaceSearchOptions): Promise<WorkspaceSearchResult[]>;
     private resolveMode;
     private searchVector;
@@ -7509,6 +7516,9 @@ type WorkspaceSkillsToolName = "workspace_list_skills" | "workspace_search_skill
 type WorkspaceSkillsPromptHookContext = {
     skills?: WorkspaceSkills;
 };
+type WorkspaceSkillsOperationOptions = {
+    context?: WorkspaceFilesystemCallContext;
+};
 declare class WorkspaceSkills {
     private readonly filesystem;
     private readonly workspaceIdentity;
@@ -7548,22 +7558,25 @@ declare class WorkspaceSkills {
     private ensureIndexed;
     discoverSkills(options?: {
         refresh?: boolean;
+        context?: WorkspaceFilesystemCallContext;
     }): Promise<WorkspaceSkillMetadata[]>;
-    loadSkill(identifier: string): Promise<WorkspaceSkill | null>;
-    activateSkill(identifier: string): Promise<WorkspaceSkillMetadata | null>;
-    deactivateSkill(identifier: string): Promise<boolean>;
+    loadSkill(identifier: string, options?: WorkspaceSkillsOperationOptions): Promise<WorkspaceSkill | null>;
+    activateSkill(identifier: string, options?: WorkspaceSkillsOperationOptions): Promise<WorkspaceSkillMetadata | null>;
+    deactivateSkill(identifier: string, options?: WorkspaceSkillsOperationOptions): Promise<boolean>;
     getActiveSkills(): WorkspaceSkillMetadata[];
-    indexSkills(): Promise<WorkspaceSkillIndexSummary>;
+    indexSkills(options?: WorkspaceSkillsOperationOptions): Promise<WorkspaceSkillIndexSummary>;
     search(query: string, options?: WorkspaceSkillSearchOptions): Promise<WorkspaceSkillSearchResult[]>;
-    buildPrompt(options?: WorkspaceSkillsPromptOptions): Promise<string | null>;
+    buildPrompt(options?: WorkspaceSkillsPromptOptions & {
+        context?: WorkspaceFilesystemCallContext;
+    }): Promise<string | null>;
     private resolveMode;
     private searchVector;
     private formatResults;
     private resolveSkillId;
     resolveSkillFilePath(skill: WorkspaceSkillMetadata, relativePath: string, allowed: string[] | undefined): string | null;
-    readFileContent(filePath: string): Promise<string>;
+    readFileContent(filePath: string, options?: WorkspaceSkillsOperationOptions): Promise<string>;
 }
-declare const createWorkspaceSkillsPromptHook: (context: WorkspaceSkillsPromptHookContext, options?: WorkspaceSkillsPromptOptions) => AgentHooks;
+declare const createWorkspaceSkillsPromptHook: (hookContext: WorkspaceSkillsPromptHookContext, options?: WorkspaceSkillsPromptOptions) => AgentHooks;
 declare const createWorkspaceSkillsToolkit: (context: WorkspaceSkillsToolkitContext, options?: WorkspaceSkillsToolkitOptions) => Toolkit;
 
 declare class Workspace {

package/dist/index.d.ts

@@ -6757,6 +6757,7 @@ type WorkspaceSandboxExecuteOptions = {
     signal?: AbortSignal;
     onStdout?: (chunk: string) => void;
     onStderr?: (chunk: string) => void;
+    operationContext?: OperationContext;
 };
 type WorkspaceSandboxStatus = "idle" | "ready" | "destroyed" | "error";
 type WorkspaceSandboxResult = {
@@ -6878,6 +6879,7 @@ type WorkspaceSearchOptions = {
     snippetLength?: number;
     lexicalWeight?: number;
     vectorWeight?: number;
+    context?: WorkspaceFilesystemCallContext;
 };
 type WorkspaceSearchResult = {
     id: string;
@@ -6912,6 +6914,7 @@ type WorkspaceSkillSearchHybridWeights = {
 type WorkspaceSkillsRootResolverContext = {
     workspace: WorkspaceIdentity;
     filesystem: WorkspaceFilesystem;
+    operationContext?: OperationContext;
 };
 type WorkspaceSkillsRootResolver = (context?: WorkspaceSkillsRootResolverContext) => string[] | undefined | null | Promise<string[] | undefined | null>;
 type WorkspaceSkillsConfig = {
@@ -6950,6 +6953,7 @@ type WorkspaceSkillSearchOptions = {
     snippetLength?: number;
     lexicalWeight?: number;
     vectorWeight?: number;
+    context?: WorkspaceFilesystemCallContext;
 };
 type WorkspaceSkillSearchResult = {
     id: string;
@@ -7302,9 +7306,12 @@ declare class WorkspaceSearch {
     private ensureAutoIndex;
     indexPaths(paths?: Array<WorkspaceSearchIndexPath | string>, options?: {
         maxFileBytes?: number;
+        context?: WorkspaceFilesystemCallContext;
     }): Promise<WorkspaceSearchIndexSummary>;
     indexDocuments(docs: WorkspaceSearchDocument[]): Promise<WorkspaceSearchIndexSummary>;
-    indexContent(path: string, content: string, metadata?: Record<string, unknown>): Promise<WorkspaceSearchIndexSummary>;
+    indexContent(path: string, content: string, metadata?: Record<string, unknown>, _options?: {
+        context?: WorkspaceFilesystemCallContext;
+    }): Promise<WorkspaceSearchIndexSummary>;
     search(query: string, options?: WorkspaceSearchOptions): Promise<WorkspaceSearchResult[]>;
     private resolveMode;
     private searchVector;
@@ -7509,6 +7516,9 @@ type WorkspaceSkillsToolName = "workspace_list_skills" | "workspace_search_skill
 type WorkspaceSkillsPromptHookContext = {
     skills?: WorkspaceSkills;
 };
+type WorkspaceSkillsOperationOptions = {
+    context?: WorkspaceFilesystemCallContext;
+};
 declare class WorkspaceSkills {
     private readonly filesystem;
     private readonly workspaceIdentity;
@@ -7548,22 +7558,25 @@ declare class WorkspaceSkills {
     private ensureIndexed;
     discoverSkills(options?: {
         refresh?: boolean;
+        context?: WorkspaceFilesystemCallContext;
     }): Promise<WorkspaceSkillMetadata[]>;
-    loadSkill(identifier: string): Promise<WorkspaceSkill | null>;
-    activateSkill(identifier: string): Promise<WorkspaceSkillMetadata | null>;
-    deactivateSkill(identifier: string): Promise<boolean>;
+    loadSkill(identifier: string, options?: WorkspaceSkillsOperationOptions): Promise<WorkspaceSkill | null>;
+    activateSkill(identifier: string, options?: WorkspaceSkillsOperationOptions): Promise<WorkspaceSkillMetadata | null>;
+    deactivateSkill(identifier: string, options?: WorkspaceSkillsOperationOptions): Promise<boolean>;
     getActiveSkills(): WorkspaceSkillMetadata[];
-    indexSkills(): Promise<WorkspaceSkillIndexSummary>;
+    indexSkills(options?: WorkspaceSkillsOperationOptions): Promise<WorkspaceSkillIndexSummary>;
     search(query: string, options?: WorkspaceSkillSearchOptions): Promise<WorkspaceSkillSearchResult[]>;
-    buildPrompt(options?: WorkspaceSkillsPromptOptions): Promise<string | null>;
+    buildPrompt(options?: WorkspaceSkillsPromptOptions & {
+        context?: WorkspaceFilesystemCallContext;
+    }): Promise<string | null>;
     private resolveMode;
     private searchVector;
     private formatResults;
     private resolveSkillId;
     resolveSkillFilePath(skill: WorkspaceSkillMetadata, relativePath: string, allowed: string[] | undefined): string | null;
-    readFileContent(filePath: string): Promise<string>;
+    readFileContent(filePath: string, options?: WorkspaceSkillsOperationOptions): Promise<string>;
 }
-declare const createWorkspaceSkillsPromptHook: (context: WorkspaceSkillsPromptHookContext, options?: WorkspaceSkillsPromptOptions) => AgentHooks;
+declare const createWorkspaceSkillsPromptHook: (hookContext: WorkspaceSkillsPromptHookContext, options?: WorkspaceSkillsPromptOptions) => AgentHooks;
 declare const createWorkspaceSkillsToolkit: (context: WorkspaceSkillsToolkitContext, options?: WorkspaceSkillsToolkitOptions) => Toolkit;
 
 declare class Workspace {

package/dist/index.js

@@ -19985,7 +19985,8 @@ var createWorkspaceSandboxToolkit = /* @__PURE__ */ __name((context8, options =
             timeoutMs: input.timeout_ms,
             maxOutputBytes: input.max_output_bytes,
             stdin: input.stdin,
-            signal: operationContext.abortController?.signal
+            signal: operationContext.abortController?.signal,
+            operationContext
           });
           setWorkspaceSpanAttributes2(operationContext, {
             "workspace.sandbox.exit_code": result.exitCode ?? void 0
@@ -20345,12 +20346,12 @@ var WorkspaceSearch = class {
   getInstructions() {
     return WORKSPACE_SEARCH_SYSTEM_PROMPT;
   }
-  async ensureAutoIndex() {
+  async ensureAutoIndex(context8) {
     if (!this.autoIndexPaths || this.autoIndexPaths.length === 0) {
       return;
     }
     if (!this.autoIndexPromise) {
-      this.autoIndexPromise = this.indexPaths(this.autoIndexPaths).then(() => void 0).catch((error) => {
+      this.autoIndexPromise = this.indexPaths(this.autoIndexPaths, { context: context8 }).then(() => void 0).catch((error) => {
         console.error("Workspace search auto-index failed:", error);
         return void 0;
       });
@@ -20375,7 +20376,9 @@ var WorkspaceSearch = class {
       const glob = target.glob ?? "**/*";
       let infos;
       try {
-        infos = await this.filesystem.globInfo(glob, basePath);
+        infos = await this.filesystem.globInfo(glob, basePath, {
+          context: options?.context
+        });
       } catch (error) {
         summary.errors.push(
           `Failed to glob ${basePath}: ${error?.message ? String(error.message) : "unknown error"}`
@@ -20389,7 +20392,9 @@ var WorkspaceSearch = class {
           continue;
         }
         try {
-          const data = await this.filesystem.readRaw(info.path);
+          const data = await this.filesystem.readRaw(info.path, {
+            context: options?.context
+          });
           const content = data.content.join("\n");
           const contentBytes = Buffer.byteLength(content, "utf-8");
           if (maxFileBytes > 0 && contentBytes > maxFileBytes) {
@@ -20461,7 +20466,7 @@ var WorkspaceSearch = class {
     }
     return summary;
   }
-  async indexContent(path6, content, metadata) {
+  async indexContent(path6, content, metadata, _options) {
     const normalizedPath = normalizeDocumentPath(path6);
     return this.indexDocuments([
       {
@@ -20473,7 +20478,7 @@ var WorkspaceSearch = class {
     ]);
   }
   async search(query, options = {}) {
-    await this.ensureAutoIndex();
+    await this.ensureAutoIndex(options.context);
     const mode = this.resolveMode(options.mode);
     const topK = options.topK ?? DEFAULT_TOP_K;
     const basePath = normalizePath(options.path);
@@ -20728,7 +20733,10 @@ var createWorkspaceSearchToolkit = /* @__PURE__ */ __name((context8, options = {
         }
         const summary = await context8.search.indexPaths(
           [{ path: input.path || "/", glob: input.glob }],
-          { maxFileBytes: input.max_file_bytes }
+          {
+            maxFileBytes: input.max_file_bytes,
+            context: { agent: context8.agent, operationContext }
+          }
         );
         setWorkspaceSpanAttributes3(operationContext, {
           "workspace.search.results": summary.indexed
@@ -20763,7 +20771,8 @@ var createWorkspaceSearchToolkit = /* @__PURE__ */ __name((context8, options = {
         const summary = await context8.search.indexContent(
           input.path,
           input.content,
-          input.metadata
+          input.metadata,
+          { context: { agent: context8.agent, operationContext } }
         );
         setWorkspaceSpanAttributes3(operationContext, {
           "workspace.search.results": summary.indexed
@@ -20826,7 +20835,8 @@ var createWorkspaceSearchToolkit = /* @__PURE__ */ __name((context8, options = {
             glob: input.glob,
             snippetLength: input.snippet_length,
             lexicalWeight: input.lexical_weight,
-            vectorWeight: input.vector_weight
+            vectorWeight: input.vector_weight,
+            context: { agent: context8.agent, operationContext }
           });
           setWorkspaceSpanAttributes3(operationContext, {
             "workspace.search.results": results.length
@@ -21191,12 +21201,12 @@ var WorkspaceSkills = class {
   getInstructions() {
     return SKILLS_SYSTEM_PROMPT;
   }
-  async ensureDiscovered() {
+  async ensureDiscovered(options = {}) {
     if (this.discovered) {
       return;
     }
     if (!this.autoDiscoverPromise) {
-      const promise2 = this.discoverSkills().then(() => void 0);
+      const promise2 = this.discoverSkills({ context: options.context }).then(() => void 0);
       this.autoDiscoverPromise = promise2;
       promise2.catch(() => {
         if (this.autoDiscoverPromise === promise2) {
@@ -21214,7 +21224,7 @@ var WorkspaceSkills = class {
       throw error;
     }
   }
-  async ensureRootPaths() {
+  async ensureRootPaths(options = {}) {
     if (this.rootResolved) {
       return;
     }
@@ -21230,7 +21240,8 @@ var WorkspaceSkills = class {
         try {
           const resolved = await this.rootResolver?.({
             workspace: this.workspaceIdentity,
-            filesystem: this.filesystem
+            filesystem: this.filesystem,
+            operationContext: options.context?.operationContext
           });
           const normalized = normalizeStringArray2(resolved) ?? DEFAULT_SKILL_ROOTS;
           this.rootPaths = normalized.map(normalizeRootPath);
@@ -21243,12 +21254,12 @@ var WorkspaceSkills = class {
     }
     await this.rootResolvePromise;
   }
-  async ensureIndexed() {
+  async ensureIndexed(options = {}) {
     if (this.indexed) {
       return;
     }
     if (!this.autoIndexPromise) {
-      const promise2 = this.indexSkills().then(() => void 0);
+      const promise2 = this.indexSkills({ context: options.context }).then(() => void 0);
       this.autoIndexPromise = promise2;
       promise2.catch(() => {
         if (this.autoIndexPromise === promise2) {
@@ -21270,7 +21281,7 @@ var WorkspaceSkills = class {
     if (this.discovered && !options.refresh) {
       return Array.from(this.skillsById.values());
     }
-    await this.ensureRootPaths();
+    await this.ensureRootPaths({ context: options.context });
     this.skillsById.clear();
     this.skillNameMap.clear();
     this.skillCache.clear();
@@ -21281,7 +21292,9 @@ var WorkspaceSkills = class {
     for (const root of this.rootPaths) {
       let infos;
       try {
-        infos = await this.filesystem.globInfo(this.glob, root);
+        infos = await this.filesystem.globInfo(this.glob, root, {
+          context: options.context
+        });
       } catch {
         continue;
       }
@@ -21291,7 +21304,9 @@ var WorkspaceSkills = class {
           continue;
         }
         try {
-          const data = await this.filesystem.readRaw(skillPath);
+          const data = await this.filesystem.readRaw(skillPath, {
+            context: options.context
+          });
           const content = data.content.join("\n");
           const contentBytes = Buffer.byteLength(content, "utf-8");
           if (this.maxFileBytes > 0 && contentBytes > this.maxFileBytes) {
@@ -21336,8 +21351,8 @@ var WorkspaceSkills = class {
     this.discovered = true;
     return Array.from(this.skillsById.values());
   }
-  async loadSkill(identifier) {
-    await this.ensureDiscovered();
+  async loadSkill(identifier, options = {}) {
+    await this.ensureDiscovered({ context: options.context });
     const id = this.resolveSkillId(identifier);
     if (!id) {
       return null;
@@ -21350,7 +21365,9 @@ var WorkspaceSkills = class {
     if (!metadata) {
       return null;
     }
-    const data = await this.filesystem.readRaw(metadata.path);
+    const data = await this.filesystem.readRaw(metadata.path, {
+      context: options.context
+    });
     const content = data.content.join("\n");
     const { data: frontmatter, instructions } = parseSkillFile(content);
     const detail = {
@@ -21366,8 +21383,8 @@ var WorkspaceSkills = class {
     this.skillCache.set(id, detail);
     return detail;
   }
-  async activateSkill(identifier) {
-    await this.ensureDiscovered();
+  async activateSkill(identifier, options = {}) {
+    await this.ensureDiscovered({ context: options.context });
     const id = this.resolveSkillId(identifier);
     if (!id) {
       return null;
@@ -21375,8 +21392,8 @@ var WorkspaceSkills = class {
     this.activeSkills.add(id);
     return this.skillsById.get(id) ?? null;
   }
-  async deactivateSkill(identifier) {
-    await this.ensureDiscovered();
+  async deactivateSkill(identifier, options = {}) {
+    await this.ensureDiscovered({ context: options.context });
     const id = this.resolveSkillId(identifier);
     if (!id) {
       return false;
@@ -21386,8 +21403,8 @@ var WorkspaceSkills = class {
   getActiveSkills() {
     return Array.from(this.activeSkills).map((id) => this.skillsById.get(id)).filter((skill) => Boolean(skill));
   }
-  async indexSkills() {
-    await this.ensureDiscovered();
+  async indexSkills(options = {}) {
+    await this.ensureDiscovered({ context: options.context });
     const summary = {
       indexed: 0,
       skipped: 0,
@@ -21413,7 +21430,7 @@ var WorkspaceSkills = class {
     const docs = [];
     for (const metadata of this.skillsById.values()) {
       try {
-        const skill = await this.loadSkill(metadata.id);
+        const skill = await this.loadSkill(metadata.id, { context: options.context });
         if (!skill) {
           summary.skipped += 1;
           continue;
@@ -21486,7 +21503,7 @@ var WorkspaceSkills = class {
     return summary;
   }
   async search(query, options = {}) {
-    await this.ensureIndexed();
+    await this.ensureIndexed({ context: options.context });
     const mode = this.resolveMode(options.mode);
     const topK = options.topK ?? DEFAULT_TOP_K2;
     const snippetLength = options.snippetLength ?? DEFAULT_SNIPPET_LENGTH2;
@@ -21546,7 +21563,7 @@ var WorkspaceSkills = class {
     );
   }
   async buildPrompt(options = {}) {
-    await this.ensureDiscovered();
+    await this.ensureDiscovered({ context: options.context });
     const includeAvailable = options.includeAvailable ?? true;
     const includeActivated = options.includeActivated ?? true;
     const maxAvailable = options.maxAvailable ?? DEFAULT_MAX_AVAILABLE;
@@ -21570,7 +21587,7 @@ ${lines.join("\n")}`);
       if (activeIds.length > 0) {
         const entries = [];
         for (const id of activeIds) {
-          const skill = await this.loadSkill(id);
+          const skill = await this.loadSkill(id, { context: options.context });
           if (!skill) {
             continue;
           }
@@ -21669,17 +21686,26 @@ ${sections.join("\n\n")}
     }
     return joinPaths(skill.root, cleaned);
   }
-  async readFileContent(filePath) {
-    const data = await this.filesystem.readRaw(filePath);
+  async readFileContent(filePath, options = {}) {
+    const data = await this.filesystem.readRaw(filePath, {
+      context: options.context
+    });
     return data.content.join("\n");
   }
 };
-var createWorkspaceSkillsPromptHook = /* @__PURE__ */ __name((context8, options = {}) => ({
-  onPrepareMessages: /* @__PURE__ */ __name(async ({ messages }) => {
-    if (!context8.skills) {
+var createWorkspaceSkillsPromptHook = /* @__PURE__ */ __name((hookContext, options = {}) => ({
+  onPrepareMessages: /* @__PURE__ */ __name(async ({
+    messages,
+    context: operationContext,
+    agent
+  }) => {
+    if (!hookContext.skills) {
       return { messages };
     }
-    const prompt = await context8.skills.buildPrompt(options);
+    const prompt = await hookContext.skills.buildPrompt({
+      ...options,
+      context: { agent, operationContext }
+    });
     if (!prompt) {
       return { messages };
     }
@@ -21727,7 +21753,10 @@ var createWorkspaceSkillsToolkit = /* @__PURE__ */ __name((context8, options = {
         if (!context8.skills) {
           return "Workspace skills are not configured.";
         }
-        const skills = await context8.skills.discoverSkills({ refresh: Boolean(input.refresh) });
+        const skills = await context8.skills.discoverSkills({
+          refresh: Boolean(input.refresh),
+          context: { agent: context8.agent, operationContext }
+        });
         const activeIds = new Set(context8.skills.getActiveSkills().map((skill) => skill.id));
         const listed = input.active_only ? skills.filter((skill) => activeIds.has(skill.id)) : skills;
         return formatSkillList(listed, activeIds);
@@ -21768,7 +21797,8 @@ var createWorkspaceSkillsToolkit = /* @__PURE__ */ __name((context8, options = {
             topK: input.top_k,
             snippetLength: input.snippet_length,
             lexicalWeight: input.lexical_weight,
-            vectorWeight: input.vector_weight
+            vectorWeight: input.vector_weight,
+            context: { agent: context8.agent, operationContext }
           });
           setWorkspaceSpanAttributes4(operationContext, {
             "workspace.search.results": results.length
@@ -21802,7 +21832,9 @@ var createWorkspaceSkillsToolkit = /* @__PURE__ */ __name((context8, options = {
         if (!context8.skills) {
           return "Workspace skills are not configured.";
         }
-        const skill = await context8.skills.loadSkill(input.skill_id);
+        const skill = await context8.skills.loadSkill(input.skill_id, {
+          context: { agent: context8.agent, operationContext }
+        });
         if (!skill) {
           return `Skill not found: ${input.skill_id}`;
         }
@@ -21835,7 +21867,9 @@ var createWorkspaceSkillsToolkit = /* @__PURE__ */ __name((context8, options = {
         if (!context8.skills) {
           return "Workspace skills are not configured.";
         }
-        const skill = await context8.skills.activateSkill(input.skill_id);
+        const skill = await context8.skills.activateSkill(input.skill_id, {
+          context: { agent: context8.agent, operationContext }
+        });
         if (!skill) {
           return `Skill not found: ${input.skill_id}`;
         }
@@ -21868,7 +21902,9 @@ var createWorkspaceSkillsToolkit = /* @__PURE__ */ __name((context8, options = {
         if (!context8.skills) {
           return "Workspace skills are not configured.";
         }
-        const success = await context8.skills.deactivateSkill(input.skill_id);
+        const success = await context8.skills.deactivateSkill(input.skill_id, {
+          context: { agent: context8.agent, operationContext }
+        });
         if (!success) {
           return `Skill not found: ${input.skill_id}`;
         }
@@ -21888,7 +21924,9 @@ var createWorkspaceSkillsToolkit = /* @__PURE__ */ __name((context8, options = {
     if (!context8.skills) {
       return "Workspace skills are not configured.";
     }
-    const skill = await context8.skills.loadSkill(skillId);
+    const skill = await context8.skills.loadSkill(skillId, {
+      context: { agent: context8.agent, operationContext }
+    });
     if (!skill) {
       return `Skill not found: ${skillId}`;
     }
@@ -21904,7 +21942,9 @@ var createWorkspaceSkillsToolkit = /* @__PURE__ */ __name((context8, options = {
       "workspace.fs.path": resolvedPath
     });
     try {
-      const content = await context8.skills.readFileContent(resolvedPath);
+      const content = await context8.skills.readFileContent(resolvedPath, {
+        context: { agent: context8.agent, operationContext }
+      });
       return content || "(empty)";
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
@@ -27607,7 +27647,8 @@ Context: ${(0, import_utils32.safeStringify)(contextObj, { indentation: 2 })}`;
       currentHistoryEntryId,
       maxSteps,
       conversationId,
-      userId
+      userId,
+      parentToolSpan
     } = options;
     return createTool({
       id: "delegate_task",
@@ -27618,8 +27659,8 @@ Context: ${(0, import_utils32.safeStringify)(contextObj, { indentation: 2 })}`;
         targetAgents: import_zod6.z.array(import_zod6.z.string()).describe("List of agent names to delegate the task to"),
         context: import_zod6.z.record(import_zod6.z.string(), import_zod6.z.any()).optional().describe("Additional context for the task")
       }),
-      execute: /* @__PURE__ */ __name(async ({ task, targetAgents, context: context8 = {} }, options2) => {
-        const currentOperationContext = options2;
+      execute: /* @__PURE__ */ __name(async ({ task, targetAgents, context: context8 = {} }, executeOptions) => {
+        const currentOperationContext = executeOptions;
         const effectiveOperationContext = currentOperationContext || operationContext;
         const logger = effectiveOperationContext?.logger || getGlobalLogger().child({ component: "subagent-manager" });
         try {
@@ -27664,7 +27705,7 @@ Context: ${(0, import_utils32.safeStringify)(contextObj, { indentation: 2 })}`;
             // Pass maxSteps from parent to subagents
             maxSteps,
             // Pass the parentToolSpan from executeOptions for proper span hierarchy
-            parentSpan: effectiveOperationContext?.systemContext?.get("parentToolSpan")
+            parentSpan: executeOptions?.parentToolSpan || parentToolSpan || effectiveOperationContext?.systemContext?.get("parentToolSpan")
           });
           const structuredResults = results.map((result, index) => {
             return {
@@ -31429,7 +31470,7 @@ ${retrieverContext}`;
       });
       oc.systemContext.set("agentId", this.id);
       oc.systemContext.set("historyEntryId", oc.operationId);
-      oc.systemContext.set("parentToolSpan", toolSpan);
+      executionOptions.parentToolSpan = toolSpan;
       const hasOutputOverride = /* @__PURE__ */ __name((value) => {
         if (!value || typeof value !== "object") {
           return false;
@@ -31798,7 +31839,7 @@ ${retrieverContext}`;
           topK ?? toolRouting?.topK ?? embeddingTopK ?? DEFAULT_TOOL_SEARCH_TOP_K
         );
         const candidates = this.buildToolSearchCandidates();
-        const parentToolSpan = oc.systemContext.get("parentToolSpan");
+        const parentToolSpan = options.parentToolSpan || oc.systemContext.get("parentToolSpan");
         const selectionSpanAttributes = {
           "tool.name": TOOL_ROUTING_SEARCH_TOOL_NAME,
           "tool.search.name": TOOL_ROUTING_SEARCH_TOOL_NAME,
@@ -33709,7 +33750,7 @@ function createPlanningToolkit(agent, options = {}) {
       });
       await resolvedBackend.setTodos(guardedTodos);
       operationContext.systemContext.set(PLAN_PROGRESS_CONTEXT_KEY, false);
-      const toolSpan = operationContext.systemContext.get("parentToolSpan");
+      const toolSpan = executeOptions.parentToolSpan || operationContext.systemContext.get("parentToolSpan");
       if (toolSpan) {
         const pendingCount = guardedTodos.filter((todo) => todo.status === "pending").length;
         const inProgressCount = guardedTodos.filter((todo) => todo.status === "in_progress").length;
@@ -34275,7 +34316,7 @@ function createTaskToolkit(options) {
     }),
     execute: /* @__PURE__ */ __name(async (input, executeOptions) => {
       const operationContext = executeOptions;
-      const toolSpan = operationContext.systemContext.get("parentToolSpan");
+      const toolSpan = executeOptions.parentToolSpan || operationContext.systemContext.get("parentToolSpan");
       if (toolSpan) {
         toolSpan.setAttribute("voltagent.label", `task:${input.subagent_type}`);
         toolSpan.setAttribute("planagent.task.subagent_type", input.subagent_type);
@@ -34295,7 +34336,7 @@ function createTaskToolkit(options) {
         conversationId: operationContext.conversationId,
         parentOperationContext: operationContext,
         maxSteps: taskOptions?.maxSteps,
-        parentSpan: operationContext.systemContext.get("parentToolSpan")
+        parentSpan: toolSpan
       });
       if (toolSpan) {
         const responsePreview = typeof result.result === "string" ? truncateText3(result.result, 500) : truncateText3((0, import_utils38.safeStringify)(result.result), 500);
@@ -36482,7 +36523,7 @@ var createRetrieverTool = /* @__PURE__ */ __name((retriever, options = {}) => {
     }),
     execute: /* @__PURE__ */ __name(async ({ query }, options2) => {
       const startTime = Date.now();
-      const toolSpan = options2?.systemContext?.get("parentToolSpan");
+      const toolSpan = options2?.parentToolSpan || options2?.systemContext?.get("parentToolSpan");
       const normalizeAttributeValue3 = /* @__PURE__ */ __name((value) => {
         if (value === null || value === void 0) return null;
         if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {