diff --git a/packages/core/src/tools/activate-skill.ts b/packages/core/src/tools/activate-skill.ts
index cf6a33f3e6..88b32a4431 100644
--- a/packages/core/src/tools/activate-skill.ts
+++ b/packages/core/src/tools/activate-skill.ts
@@ -201,6 +201,6 @@ export class ActivateSkillTool extends BaseDeclarativeTool<
     return resolveToolDeclaration(
       getActivateSkillDefinition(skillNames),
       modelId,
-    );
+    ).declaration;
   }
 }
diff --git a/packages/core/src/tools/ask-user.ts b/packages/core/src/tools/ask-user.ts
index 6dbec43dda..aaf809ca0d 100644
--- a/packages/core/src/tools/ask-user.ts
+++ b/packages/core/src/tools/ask-user.ts
@@ -111,7 +111,7 @@ export class AskUserTool extends BaseDeclarativeTool<
   }
 
   override getSchema(modelId?: string) {
-    return resolveToolDeclaration(ASK_USER_DEFINITION, modelId);
+    return resolveToolDeclaration(ASK_USER_DEFINITION, modelId).declaration;
   }
 }
 
diff --git a/packages/core/src/tools/enter-plan-mode.ts b/packages/core/src/tools/enter-plan-mode.ts
index feccb81089..b5cfc4a6e9 100644
--- a/packages/core/src/tools/enter-plan-mode.ts
+++ b/packages/core/src/tools/enter-plan-mode.ts
@@ -57,7 +57,8 @@ export class EnterPlanModeTool extends BaseDeclarativeTool<
   }
 
   override getSchema(modelId?: string) {
-    return resolveToolDeclaration(ENTER_PLAN_MODE_DEFINITION, modelId);
+    return resolveToolDeclaration(ENTER_PLAN_MODE_DEFINITION, modelId)
+      .declaration;
   }
 }
 
diff --git a/packages/core/src/tools/exit-plan-mode.ts b/packages/core/src/tools/exit-plan-mode.ts
index a0540b11e3..ad6045e856 100644
--- a/packages/core/src/tools/exit-plan-mode.ts
+++ b/packages/core/src/tools/exit-plan-mode.ts
@@ -112,7 +112,8 @@ export class ExitPlanModeTool extends BaseDeclarativeTool<
 
   override getSchema(modelId?: string) {
     const plansDir = this.config.storage.getProjectTempPlansDir();
-    return resolveToolDeclaration(getExitPlanModeDefinition(plansDir), modelId);
+    return resolveToolDeclaration(getExitPlanModeDefinition(plansDir), modelId)
+      .declaration;
   }
 }
 
diff --git a/packages/core/src/tools/get-internal-docs.ts b/packages/core/src/tools/get-internal-docs.ts
index 23bda8f4dd..5cf1259d5a 100644
--- a/packages/core/src/tools/get-internal-docs.ts
+++ b/packages/core/src/tools/get-internal-docs.ts
@@ -183,6 +183,7 @@ export class GetInternalDocsTool extends BaseDeclarativeTool<
   }
 
   override getSchema(modelId?: string) {
-    return resolveToolDeclaration(GET_INTERNAL_DOCS_DEFINITION, modelId);
+    return resolveToolDeclaration(GET_INTERNAL_DOCS_DEFINITION, modelId)
+      .declaration;
   }
 }
diff --git a/packages/core/src/tools/glob.ts b/packages/core/src/tools/glob.ts
index 78b445e762..ed38b0ce6b 100644
--- a/packages/core/src/tools/glob.ts
+++ b/packages/core/src/tools/glob.ts
@@ -339,6 +339,6 @@ export class GlobTool extends BaseDeclarativeTool<GlobToolParams, ToolResult> {
   }
 
   override getSchema(modelId?: string) {
-    return resolveToolDeclaration(GLOB_DEFINITION, modelId);
+    return resolveToolDeclaration(GLOB_DEFINITION, modelId).declaration;
   }
 }
diff --git a/packages/core/src/tools/grep.ts b/packages/core/src/tools/grep.ts
index b1fdb9474c..bd65a4fad4 100644
--- a/packages/core/src/tools/grep.ts
+++ b/packages/core/src/tools/grep.ts
@@ -743,6 +743,6 @@ export class GrepTool extends BaseDeclarativeTool<GrepToolParams, ToolResult> {
   }
 
   override getSchema(modelId?: string) {
-    return resolveToolDeclaration(GREP_DEFINITION, modelId);
+    return resolveToolDeclaration(GREP_DEFINITION, modelId).declaration;
   }
 }
diff --git a/packages/core/src/tools/ls.ts b/packages/core/src/tools/ls.ts
index 9ca2918b2c..76e77c67c5 100644
--- a/packages/core/src/tools/ls.ts
+++ b/packages/core/src/tools/ls.ts
@@ -322,6 +322,6 @@ export class LSTool extends BaseDeclarativeTool<LSToolParams, ToolResult> {
   }
 
   override getSchema(modelId?: string) {
-    return resolveToolDeclaration(LS_DEFINITION, modelId);
+    return resolveToolDeclaration(LS_DEFINITION, modelId).declaration;
   }
 }
diff --git a/packages/core/src/tools/memoryTool.ts b/packages/core/src/tools/memoryTool.ts
index 31cc35077d..a7213d686f 100644
--- a/packages/core/src/tools/memoryTool.ts
+++ b/packages/core/src/tools/memoryTool.ts
@@ -313,7 +313,7 @@ export class MemoryTool
   }
 
   override getSchema(modelId?: string) {
-    return resolveToolDeclaration(MEMORY_DEFINITION, modelId);
+    return resolveToolDeclaration(MEMORY_DEFINITION, modelId).declaration;
   }
 
   getModifyContext(_abortSignal: AbortSignal): ModifyContext<SaveMemoryParams> {
diff --git a/packages/core/src/tools/ripGrep.ts b/packages/core/src/tools/ripGrep.ts
index d4478fffee..a81358c47d 100644
--- a/packages/core/src/tools/ripGrep.ts
+++ b/packages/core/src/tools/ripGrep.ts
@@ -660,6 +660,6 @@ export class RipGrepTool extends BaseDeclarativeTool<
   }
 
   override getSchema(modelId?: string) {
-    return resolveToolDeclaration(RIP_GREP_DEFINITION, modelId);
+    return resolveToolDeclaration(RIP_GREP_DEFINITION, modelId).declaration;
   }
 }
diff --git a/packages/core/src/tools/web-fetch.ts b/packages/core/src/tools/web-fetch.ts
index 396b99a6de..485a604edc 100644
--- a/packages/core/src/tools/web-fetch.ts
+++ b/packages/core/src/tools/web-fetch.ts
@@ -461,6 +461,6 @@ export class WebFetchTool extends BaseDeclarativeTool<
   }
 
   override getSchema(modelId?: string) {
-    return resolveToolDeclaration(WEB_FETCH_DEFINITION, modelId);
+    return resolveToolDeclaration(WEB_FETCH_DEFINITION, modelId).declaration;
   }
 }
diff --git a/packages/core/src/tools/web-search.ts b/packages/core/src/tools/web-search.ts
index b4a064c768..cb0d53acb8 100644
--- a/packages/core/src/tools/web-search.ts
+++ b/packages/core/src/tools/web-search.ts
@@ -239,6 +239,6 @@ export class WebSearchTool extends BaseDeclarativeTool<
   }
 
   override getSchema(modelId?: string) {
-    return resolveToolDeclaration(WEB_SEARCH_DEFINITION, modelId);
+    return resolveToolDeclaration(WEB_SEARCH_DEFINITION, modelId).declaration;
   }
 }
diff --git a/packages/core/src/tools/write-file.ts b/packages/core/src/tools/write-file.ts
index 9f4abfdf55..6684bf71cf 100644
--- a/packages/core/src/tools/write-file.ts
+++ b/packages/core/src/tools/write-file.ts
@@ -502,7 +502,7 @@ export class WriteFileTool
   }
 
   override getSchema(modelId?: string) {
-    return resolveToolDeclaration(WRITE_FILE_DEFINITION, modelId);
+    return resolveToolDeclaration(WRITE_FILE_DEFINITION, modelId).declaration;
   }
 
   getModifyContext(