npm - @iinm/plain-agent - Versions diffs - 1.10.28 → 1.11.1 - Mend

@iinm/plain-agent 1.10.28 → 1.11.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/README.md +15 -12
package/config/config.predefined.json +87 -119
package/package.json +6 -4
package/src/costTracker.mjs +9 -9
package/src/modelDefinition.d.ts +1 -1
package/src/providers/gemini.d.ts +2 -4
package/src/providers/gemini.mjs +5 -6

package/README.md CHANGED Viewed

@@ -1,18 +1,21 @@
 # Plain Agent
 [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/iinm/plain-agent)
-[![Socket Badge](https://badge.socket.dev/npm/package/@iinm/plain-agent/1.10.28)](https://socket.dev/npm/package/@iinm/plain-agent)
+[![npm version](https://img.shields.io/npm/v/@iinm/plain-agent)](https://www.npmjs.com/package/@iinm/plain-agent)
+[![install size](https://packagephobia.com/badge?p=@iinm/plain-agent)](https://packagephobia.com/result?p=@iinm/plain-agent)
+[![Socket Badge](https://badge.socket.dev/npm/package/@iinm/plain-agent/1.11.1)](https://socket.dev/npm/package/@iinm/plain-agent)
+[![CodeQL](https://github.com/iinm/plain-agent/actions/workflows/github-code-scanning/codeql/badge.svg)](https://github.com/iinm/plain-agent/actions/workflows/github-code-scanning/codeql)
 A lightweight terminal-based coding agent focused on safety and low token cost
 ## Table of Contents
 - [Design](#design)
-  - [Multi-provider support](#multi-provider-support)
-  - [Auto-approval](#auto-approval)
+  - [Multi-Provider Support](#multi-provider-support)
+  - [Auto-Approval](#auto-approval)
   - [Path Validation](#path-validation)
   - [Sandbox](#sandbox)
-  - [Memory file](#memory-file)
+  - [Memory File](#memory-file)
   - [Token Efficiency](#token-efficiency)
   - [Claude Code Compatibility](#claude-code-compatibility)
 - [Requirements](#requirements)
@@ -28,7 +31,7 @@ A lightweight terminal-based coding agent focused on safety and low token cost
 ## Design
-### Multi-provider support
+### Multi-Provider Support
 Supports Claude, OpenAI, Gemini, and any OpenAI-compatible provider. Bedrock, Vertex AI, and Azure are also supported for teams working in environments restricted to managed cloud providers.
@@ -83,10 +86,12 @@ Models are identified by `name+variant` (e.g., `claude-sonnet-4-6+thinking-high`
 You can also add entries to `platforms` and `models` to use any OpenAI-compatible endpoint, such as Ollama or Fireworks. See the Quick Start section for examples.
-### Auto-approval
+### Auto-Approval
 Configure what the agent can do automatically using a small DSL with regex matching. Below is an excerpt from the [default config](https://github.com/iinm/plain-agent/blob/main/config/config.predefined.json).
+**Note**: Commands are executed without a shell — shell operators like `&&`, `|`, `;`, and redirects are not interpreted unless the agent explicitly uses `bash -c`. This makes each argument a discrete token that can be validated individually.
 ```js
 {
   "autoApproval": {
@@ -162,8 +167,6 @@ String values in tool inputs are treated as file paths and validated against the
 - Symlinks are resolved to their real path before validation — a symlink inside the working directory that points outside is rejected. Broken and circular symlinks are also rejected.
 - The file must be tracked by Git (not ignored)
-Commands are executed without a shell — shell operators like `&&`, `|`, `;`, and redirects are not interpreted unless the agent explicitly uses `bash -c`. This makes each argument a discrete token that can be validated individually.
 Compound arguments are decomposed before validation — embedded paths are extracted and checked individually:
 | Pattern | Example | Extracted |
@@ -176,7 +179,7 @@ Compound arguments are decomposed before validation — embedded paths are extra
 `--opt=<val>`, `-X<val>`, and `VAR=<val>` are checked recursively, so chained patterns like `-DINSTALL_DIR=/etc` decompose fully (`-D` → `INSTALL_DIR=/etc` → `/etc`).
-**Note**: validation only applies when the agent explicitly passes file paths to tools. It cannot catch file access inside scripts the agent writes — something like `bash -c "rm -rf /"` is beyond its reach. Always use a sandbox when auto-approving script execution.
+**Note**: Validation only applies when the agent explicitly passes file paths to tools. It cannot catch file access inside scripts the agent writes — something like `bash -c "rm -rf /"` is beyond its reach. Always use a sandbox when auto-approving script execution.
 ### Sandbox
@@ -216,7 +219,7 @@ A Docker-based wrapper called `plain-sandbox` is included, but the interface is
 }
 ```
-### Memory file
+### Memory File
 The agent maintains a memory file (`.plain-agent/memory/`) for each session to:
@@ -450,7 +453,7 @@ Create a configuration file.
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 1.1,
           "output_tokens": 5.5,
           "cache_read_input_tokens": 0.11,
@@ -477,7 +480,7 @@ Create a configuration file.
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 3.3,
           "output_tokens": 16.5,
           "cache_read_input_tokens": 0.33,

package/config/config.predefined.json CHANGED Viewed

@@ -448,7 +448,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 1.0,
           "output_tokens": 5.0,
           "cache_read_input_tokens": 0.1,
@@ -475,7 +475,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 1.0,
           "output_tokens": 5.0,
           "cache_read_input_tokens": 0.1,
@@ -503,7 +503,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 3,
           "output_tokens": 15,
           "cache_read_input_tokens": 0.3,
@@ -531,7 +531,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 3,
           "output_tokens": 15,
           "cache_read_input_tokens": 0.3,
@@ -559,7 +559,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 5,
           "output_tokens": 25,
           "cache_read_input_tokens": 0.5,
@@ -587,7 +587,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 5,
           "output_tokens": 25,
           "cache_read_input_tokens": 0.5,
@@ -614,7 +614,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 1.0,
           "output_tokens": 5.0,
           "cache_read_input_tokens": 0.1,
@@ -640,7 +640,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 1.0,
           "output_tokens": 5.0,
           "cache_read_input_tokens": 0.1,
@@ -667,7 +667,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 3,
           "output_tokens": 15,
           "cache_read_input_tokens": 0.3,
@@ -694,7 +694,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 3,
           "output_tokens": 15,
           "cache_read_input_tokens": 0.3,
@@ -721,7 +721,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 5,
           "output_tokens": 25,
           "cache_read_input_tokens": 0.5,
@@ -748,7 +748,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 5,
           "output_tokens": 25,
           "cache_read_input_tokens": 0.5,
@@ -769,15 +769,11 @@
         "format": "gemini",
         "config": {
           "model": "gemini-3.5-flash",
-          "config": {
-            "requestConfig": {
-              "generationConfig": {
-                "maxOutputTokens": 32768,
-                "thinkingConfig": {
-                  "includeThoughts": true,
-                  "thinkingLevel": "medium"
-                }
-              }
+          "generationConfig": {
+            "maxOutputTokens": 32768,
+            "thinkingConfig": {
+              "includeThoughts": true,
+              "thinkingLevel": "medium"
             }
           }
         }
@@ -785,7 +781,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "promptTokenCount": 1.5,
           "cachedContentTokenCount": -1.35,
           "candidatesTokenCount": 9
@@ -804,15 +800,11 @@
         "format": "gemini",
         "config": {
           "model": "gemini-3.5-flash",
-          "config": {
-            "requestConfig": {
-              "generationConfig": {
-                "maxOutputTokens": 65536,
-                "thinkingConfig": {
-                  "includeThoughts": true,
-                  "thinkingLevel": "high"
-                }
-              }
+          "generationConfig": {
+            "maxOutputTokens": 65536,
+            "thinkingConfig": {
+              "includeThoughts": true,
+              "thinkingLevel": "high"
             }
           }
         }
@@ -820,7 +812,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "promptTokenCount": 1.5,
           "cachedContentTokenCount": -1.35,
           "candidatesTokenCount": 9
@@ -839,15 +831,11 @@
         "format": "gemini",
         "config": {
           "model": "gemini-3.1-pro-preview",
-          "config": {
-            "requestConfig": {
-              "generationConfig": {
-                "maxOutputTokens": 32768,
-                "thinkingConfig": {
-                  "includeThoughts": true,
-                  "thinkingLevel": "medium"
-                }
-              }
+          "generationConfig": {
+            "maxOutputTokens": 32768,
+            "thinkingConfig": {
+              "includeThoughts": true,
+              "thinkingLevel": "medium"
             }
           }
         }
@@ -855,7 +843,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "promptTokenCount": 2,
           "cachedContentTokenCount": -1.8,
           "candidatesTokenCount": 12
@@ -874,15 +862,11 @@
         "format": "gemini",
         "config": {
           "model": "gemini-3.1-pro-preview",
-          "config": {
-            "requestConfig": {
-              "generationConfig": {
-                "maxOutputTokens": 65536,
-                "thinkingConfig": {
-                  "includeThoughts": true,
-                  "thinkingLevel": "high"
-                }
-              }
+          "generationConfig": {
+            "maxOutputTokens": 65536,
+            "thinkingConfig": {
+              "includeThoughts": true,
+              "thinkingLevel": "high"
             }
           }
         }
@@ -890,7 +874,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "promptTokenCount": 2,
           "cachedContentTokenCount": -1.8,
           "candidatesTokenCount": 12
@@ -909,15 +893,11 @@
         "format": "gemini",
         "config": {
           "model": "gemini-3.5-flash",
-          "config": {
-            "requestConfig": {
-              "generationConfig": {
-                "maxOutputTokens": 32768,
-                "thinkingConfig": {
-                  "includeThoughts": true,
-                  "thinkingLevel": "medium"
-                }
-              }
+          "generationConfig": {
+            "maxOutputTokens": 32768,
+            "thinkingConfig": {
+              "includeThoughts": true,
+              "thinkingLevel": "medium"
             }
           }
         }
@@ -925,7 +905,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "promptTokenCount": 1.5,
           "cachedContentTokenCount": -1.35,
           "candidatesTokenCount": 9
@@ -943,15 +923,11 @@
         "format": "gemini",
         "config": {
           "model": "gemini-3.5-flash",
-          "config": {
-            "requestConfig": {
-              "generationConfig": {
-                "maxOutputTokens": 65536,
-                "thinkingConfig": {
-                  "includeThoughts": true,
-                  "thinkingLevel": "high"
-                }
-              }
+          "generationConfig": {
+            "maxOutputTokens": 65536,
+            "thinkingConfig": {
+              "includeThoughts": true,
+              "thinkingLevel": "high"
             }
           }
         }
@@ -959,7 +935,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "promptTokenCount": 1.5,
           "cachedContentTokenCount": -1.35,
           "candidatesTokenCount": 9
@@ -977,15 +953,11 @@
         "format": "gemini",
         "config": {
           "model": "gemini-3.1-pro-preview",
-          "config": {
-            "requestConfig": {
-              "generationConfig": {
-                "maxOutputTokens": 32768,
-                "thinkingConfig": {
-                  "includeThoughts": true,
-                  "thinkingLevel": "medium"
-                }
-              }
+          "generationConfig": {
+            "maxOutputTokens": 32768,
+            "thinkingConfig": {
+              "includeThoughts": true,
+              "thinkingLevel": "medium"
             }
           }
         }
@@ -993,7 +965,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "promptTokenCount": 2,
           "cachedContentTokenCount": -1.8,
           "candidatesTokenCount": 12
@@ -1011,15 +983,11 @@
         "format": "gemini",
         "config": {
           "model": "gemini-3.1-pro-preview",
-          "config": {
-            "requestConfig": {
-              "generationConfig": {
-                "maxOutputTokens": 65536,
-                "thinkingConfig": {
-                  "includeThoughts": true,
-                  "thinkingLevel": "high"
-                }
-              }
+          "generationConfig": {
+            "maxOutputTokens": 65536,
+            "thinkingConfig": {
+              "includeThoughts": true,
+              "thinkingLevel": "high"
             }
           }
         }
@@ -1027,7 +995,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "promptTokenCount": 2,
           "cachedContentTokenCount": -1.8,
           "candidatesTokenCount": 12
@@ -1055,7 +1023,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 0.75,
           "input_tokens_details.cached_tokens": -0.675,
           "output_tokens": 4.5
@@ -1082,7 +1050,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 0.75,
           "input_tokens_details.cached_tokens": -0.675,
           "output_tokens": 4.5
@@ -1109,7 +1077,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 0.75,
           "input_tokens_details.cached_tokens": -0.675,
           "output_tokens": 4.5
@@ -1136,7 +1104,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 5,
           "input_tokens_details.cached_tokens": -4.5,
           "output_tokens": 30
@@ -1163,7 +1131,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 5,
           "input_tokens_details.cached_tokens": -4.5,
           "output_tokens": 30
@@ -1190,7 +1158,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 5,
           "input_tokens_details.cached_tokens": -4.5,
           "output_tokens": 30
@@ -1217,7 +1185,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 0.75,
           "input_tokens_details.cached_tokens": -0.675,
           "output_tokens": 4.5
@@ -1243,7 +1211,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 0.75,
           "input_tokens_details.cached_tokens": -0.675,
           "output_tokens": 4.5
@@ -1269,7 +1237,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 0.75,
           "input_tokens_details.cached_tokens": -0.675,
           "output_tokens": 4.5
@@ -1295,7 +1263,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 5,
           "input_tokens_details.cached_tokens": -4.5,
           "output_tokens": 30
@@ -1321,7 +1289,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 5,
           "input_tokens_details.cached_tokens": -4.5,
           "output_tokens": 30
@@ -1347,7 +1315,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "input_tokens": 5,
           "input_tokens_details.cached_tokens": -4.5,
           "output_tokens": 30
@@ -1371,7 +1339,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "prompt_tokens": 0.15,
           "prompt_tokens_details.cached_tokens": -0.14,
           "completion_tokens": 0.6
@@ -1395,7 +1363,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "prompt_tokens": 1,
           "completion_tokens": 3.2,
           "prompt_tokens_details.cached_tokens": -0.9
@@ -1419,7 +1387,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "prompt_tokens": 1,
           "completion_tokens": 3.2
         }
@@ -1442,7 +1410,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "prompt_tokens": 1.4,
           "prompt_tokens_details.cached_tokens": -1.14,
           "completion_tokens": 4.4
@@ -1465,7 +1433,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "prompt_tokens": 1.4,
           "prompt_tokens_details.cached_tokens": -1.14,
           "completion_tokens": 4.4
@@ -1489,7 +1457,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "prompt_tokens": 0.95,
           "prompt_tokens_details.cached_tokens": -0.79,
           "completion_tokens": 4
@@ -1512,7 +1480,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "prompt_tokens": 0.95,
           "prompt_tokens_details.cached_tokens": -0.79,
           "completion_tokens": 4
@@ -1551,7 +1519,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "prompt_tokens": 1.74,
           "prompt_tokens_details.cached_tokens": -1.595,
           "completion_tokens": 3.48
@@ -1574,7 +1542,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "prompt_tokens": 1.74,
           "prompt_tokens_details.cached_tokens": -1.6,
           "completion_tokens": 3.48
@@ -1613,7 +1581,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "prompt_tokens": 0.3,
           "prompt_tokens_details.cached_tokens": -0.24,
           "completion_tokens": 1.2
@@ -1636,7 +1604,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "prompt_tokens": 0.3,
           "prompt_tokens_details.cached_tokens": -0.24,
           "completion_tokens": 1.2
@@ -1659,7 +1627,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "prompt_tokens": 0.3,
           "prompt_tokens_details.cached_tokens": -0.24,
           "completion_tokens": 1.2
@@ -1683,7 +1651,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "prompt_tokens": 0.5,
           "prompt_tokens_details.cached_tokens": -0.4,
           "completion_tokens": 3
@@ -1706,7 +1674,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "prompt_tokens": 0.6,
           "completion_tokens": 3.6
         }
@@ -1728,7 +1696,7 @@
       "cost": {
         "currency": "USD",
         "unit": "1M",
-        "costs": {
+        "prices": {
           "prompt_tokens": 1.5625,
           "prompt_tokens_details.cached_tokens": -1.4375,
           "completion_tokens": 3.75

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@iinm/plain-agent",
-  "version": "1.10.28",
+  "version": "1.11.1",
   "description": "A lightweight terminal-based coding agent focused on safety and low token cost",
   "license": "MIT",
   "type": "module",
@@ -32,9 +32,10 @@
     "node": ">=22"
   },
   "scripts": {
-    "check": "npm run lint && tsc && npm run test && npm run test:predefined-approval",
-    "test": "node --test",
-    "coverage": "node --experimental-test-coverage --test-coverage-exclude='src/**/*.test.mjs' --test",
+    "check": "npm run lint && tsc && npm run test && npm run test:e2e && npm run test:predefined-approval",
+    "test": "node --test 'src/**/*.test.mjs'",
+    "test:e2e": "node --test --test-timeout=30000 'e2e/**/*.test.mjs'",
+    "coverage": "c8 --exclude='src/**/*.test.mjs' --exclude='e2e/**' node --test --test-force-exit 'src/**/*.test.mjs' 'e2e/**/*.test.mjs'",
     "test:predefined-approval": "bash -c 'set -e; mkdir -p tmp; cd tmp; env HOME=. ../bin/plain test-approval'",
     "lint": "npx @biomejs/biome check",
     "fix": "npx @biomejs/biome check --fix",
@@ -44,6 +45,7 @@
   "devDependencies": {
     "@biomejs/biome": "^2.4.12",
     "@types/node": "^22.19.17",
+    "c8": "^11.0.0",
     "typescript": "^6.0.2"
   }
 }

package/src/costTracker.mjs CHANGED Viewed

@@ -20,7 +20,7 @@
  * @typedef {Object} CostConfig
  * @property {string} currency
  * @property {string} unit
- * @property {Record<string, number>} costs
+ * @property {Record<string, number>} prices
  */
 /**
@@ -49,15 +49,15 @@ function validateCostConfig(config) {
   if (typeof c.unit !== "string") {
     throw new TypeError("CostConfig.unit must be a string");
   }
-  if (typeof c.costs !== "object" || c.costs === null) {
-    throw new TypeError("CostConfig.costs must be an object");
+  if (typeof c.prices !== "object" || c.prices === null) {
+    throw new TypeError("CostConfig.prices must be an object");
   }
   for (const [key, value] of Object.entries(
-    /** @type {Record<string, unknown>} */ (c.costs),
+    /** @type {Record<string, unknown>} */ (c.prices),
   )) {
     if (typeof value !== "number") {
       throw new TypeError(
-        `CostConfig.costs["${key}"] must be a number, got ${typeof value}`,
+        `CostConfig.prices["${key}"] must be a number, got ${typeof value}`,
       );
     }
   }
@@ -200,16 +200,16 @@ function calculateCostFromConfig(aggregated, config) {
   for (const [key, tokens] of Object.entries(aggregated)) {
     breakdown[key] = Object.freeze({ tokens, cost: undefined });
-    if (!config?.costs?.[key]) {
+    if (!config?.prices?.[key]) {
       continue;
     }
-    const costValue = config.costs[key];
+    const costValue = config.prices[key];
     const unitSize = parseUnit(config.unit);
     if (typeof costValue !== "number") {
       throw new TypeError(
-        `config.costs["${key}"] must be a number, got ${typeof costValue}`,
+        `config.prices["${key}"] must be a number, got ${typeof costValue}`,
       );
     }
@@ -222,7 +222,7 @@ function calculateCostFromConfig(aggregated, config) {
     currency: config?.currency ?? "USD",
     unit: config?.unit ?? "1M",
     breakdown,
-    totalCost: config?.costs ? totalCost : undefined,
+    totalCost: config?.prices ? totalCost : undefined,
   });
 }

package/src/modelDefinition.d.ts CHANGED Viewed

@@ -88,5 +88,5 @@ export type ModelConfig =
 export type CostConfig = {
   currency: string;
   unit: string;
-  costs: Record<string, number>;
+  prices: Record<string, number>;
 };

package/src/providers/gemini.d.ts CHANGED Viewed

@@ -2,10 +2,8 @@
 export type GeminiModelConfig = {
   // https://ai.google.dev/gemini-api/docs/models
   model: string;
-  requestConfig?: {
-    generationConfig: GeminiGenerationConfig;
-    safetySettings?: GeminiSafetySetting[];
-  };
+  generationConfig?: GeminiGenerationConfig;
+  safetySettings?: GeminiSafetySetting[];
 };
 // https://ai.google.dev/api/generate-content

package/src/providers/gemini.mjs CHANGED Viewed

@@ -21,7 +21,7 @@ import { getGoogleCloudAccessToken } from "./platform/googleCloud.mjs";
  * - https://ai.google.dev/gemini-api/docs/caching
  * - https://ai.google.dev/api/caching
  * @param {import("../modelDefinition").PlatformConfig} platformConfig
- * @param {Pick<GeminiModelConfig, "model">} modelConfig
+ * @param {GeminiModelConfig} modelConfig
  * @returns {GeminiModelCaller}
  */
 export function createCacheEnabledGeminiModelCaller(
@@ -99,12 +99,11 @@ export function createCacheEnabledGeminiModelCaller(
         }
       })();
+      const { model, ...modelConfigWithoutName } = modelConfig;
       /** @type {Pick<GeminiGenerateContentInput, "generationConfig" | "safetySettings">} */
       const baseRequest = {
-        // default
-        generationConfig: {
-          temperature: 0,
-        },
+        generationConfig: {},
         safetySettings: [
           {
             category: "HARM_CATEGORY_SEXUALLY_EXPLICIT",
@@ -117,7 +116,7 @@ export function createCacheEnabledGeminiModelCaller(
             threshold: "BLOCK_NONE",
           },
         ],
-        ...config.requestConfig,
+        ...modelConfigWithoutName,
       };
       /** @type {GeminiGenerateContentInput} */