diff --git a/packages/core/src/tools/read-file.ts b/packages/core/src/tools/read-file.ts
index dbed3b7220..27b13f1f9a 100644
--- a/packages/core/src/tools/read-file.ts
+++ b/packages/core/src/tools/read-file.ts
@@ -24,6 +24,7 @@ import { FileOperationEvent } from '../telemetry/types.js';
 import { READ_FILE_TOOL_NAME } from './tool-names.js';
 import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
 import { READ_FILE_DEFINITION } from './definitions/coreTools.js';
+import { resolveToolDeclaration } from './definitions/resolver.js';
 
 /**
  * Parameters for the ReadFile tool
@@ -235,9 +236,10 @@ export class ReadFileTool extends BaseDeclarativeTool<
     );
   }
 
-  override getSchema(_modelId?: string) {
-    // Pure refactor: maintain existing behavior.
-    // getSchema(modelId) is now available for future model-specific overrides.
-    return super.getSchema();
+  override getSchema(modelId?: string) {
+    if (!modelId) {
+      return super.getSchema();
+    }
+    return resolveToolDeclaration(READ_FILE_DEFINITION, modelId);
   }
 }
diff --git a/packages/core/src/tools/shell.ts b/packages/core/src/tools/shell.ts
index acda68b7c0..87c8912fde 100644
--- a/packages/core/src/tools/shell.ts
+++ b/packages/core/src/tools/shell.ts
@@ -44,6 +44,7 @@ import {
 import { SHELL_TOOL_NAME } from './tool-names.js';
 import type { MessageBus } from '../confirmation-bus/message-bus.js';
 import { SHELL_DEFINITION } from './definitions/coreTools.js';
+import { resolveToolDeclaration } from './definitions/resolver.js';
 
 export const OUTPUT_UPDATE_INTERVAL_MS = 1000;
 
@@ -544,9 +545,19 @@ export class ShellTool extends BaseDeclarativeTool<
     );
   }
 
-  override getSchema(_modelId?: string) {
-    // Pure refactor: maintain existing behavior.
-    // getSchema(modelId) is now available for future model-specific overrides.
-    return super.getSchema();
+  override getSchema(modelId?: string) {
+    if (!modelId) {
+      return super.getSchema();
+    }
+
+    const declaration = resolveToolDeclaration(SHELL_DEFINITION, modelId);
+    const schema = super.getSchema();
+
+    // We use the resolved declaration but preserve the dynamic platform-specific description
+    // from the tool instance to ensure behavior remains 100% identical for now.
+    return {
+      ...declaration,
+      description: schema.description,
+    };
   }
 }