Fix type errors and update tests for tokenCache implementation

Author: bhouston

packages/agent/src/core/toolAgent/toolAgentCore.ts

@@ -64,7 +64,13 @@ export const toolAgent = async (
             createCacheControlMessageFromSystemPrompt(systemPrompt),
             ...addCacheControlToMessages(messages),
           ]
-        : [{ role: 'system', content: systemPrompt }, ...messages];
+        : [
+            {
+              role: 'system',
+              content: systemPrompt,
+            } as CoreMessage,
+            ...messages,
+          ];
 
     const generateTextProps = {
       model: config.model,

packages/cli/src/commands/$default.ts

@@ -88,13 +88,14 @@ export const command: CommandModule<SharedOptions, DefaultArgs> = {
       undefined,
       argv.tokenUsage ? LogLevel.info : LogLevel.debug,
     );
-    // Use command line option if provided, otherwise use config value
-    tokenTracker.tokenCache =
-      argv.tokenCache !== undefined ? argv.tokenCache : userConfig.tokenCache;
 
     try {
       // Get configuration for model provider and name
       const userConfig = getConfig();
+      // Use command line option if provided, otherwise use config value
+      tokenTracker.tokenCache =
+        argv.tokenCache !== undefined ? argv.tokenCache : userConfig.tokenCache;
+
       const userModelProvider = argv.modelProvider || userConfig.modelProvider;
       const userModelName = argv.modelName || userConfig.modelName;
 

packages/cli/tests/settings/config.test.ts

@@ -46,6 +46,7 @@ describe('Config', () => {
         ollamaBaseUrl: 'http://localhost:11434/api',
         profile: false,
         customPrompt: '',
+        tokenCache: true,
       });
       expect(fs.existsSync).toHaveBeenCalledWith(mockConfigFile);
     });
@@ -80,6 +81,7 @@ describe('Config', () => {
         ollamaBaseUrl: 'http://localhost:11434/api',
         profile: false,
         customPrompt: '',
+        tokenCache: true,
       });
     });
   });