@johnowennixon/diffdash 1.7.0 → 1.9.0

package/README.md

@@ -1,5 +1,10 @@
 # DiffDash
 
+![npm version](https://img.shields.io/npm/v/@johnowennixon/diffdash.svg)
+![NPM License](https://img.shields.io/npm/l/@johnowennixon/diffdash)
+![Downloads](https://img.shields.io/npm/dm/@johnowennixon/diffdash.svg)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/johnowennixon/diffdash)
+
 A command-line tool to generate Git commit messages using AI.
 
 ## Demonstration
@@ -8,15 +13,15 @@ A command-line tool to generate Git commit messages using AI.
 
 ## Features
 
-* Generate Git commit messages in natural English
+* Generate Git commit messages in **natural English**
 * Add a footer to the generated commit messages
 * Add a prefix or suffix to the summary line
 * Select from a choice of LLM models
 * Compare messages generated from all configured models
 * Disable or auto-approve various stages
-* Just output the commit message for use in scripts
+* Option to output just the commit message for use in scripts
 * Configuration using standard API provider environment variables
-* Uses the Vercel AI SDK
+* Uses the Vercel AI SDK (version 5)
 * Uses structured JSON with compatible models
 * Substantially written using AI coding (Claude Code, Roo Code, and Amp)
 
@@ -28,24 +33,21 @@ npm install -g @johnowennixon/diffdash
 
 ## LLM Models
 
-Currently, for this application, the best LLM model by far is **gpt-4.1-mini** from OpenAI.
+Currently, for this application, the best LLM model is **gpt-4.1-mini** from OpenAI.
 It is set as the default model.
 I can only presume they have done a ton of training on diffs.
 
+I am now testing the GPT-5 models and **gpt-5-mini-minimal** (GPT-5 Mini with reasoning disabled) is behaving much the same.
+It will probably become the default model soon.
+
 ## API Keys
 
 DiffDash requires at least one API key for an LLM provider. These must be provided as environment variables.
 
 ```bash
-# For OpenAI (recommended)
+# For OpenAI (strongly recommended)
 export OPENAI_API_KEY=your-api-key
 
-# For Requesty
-export REQUESTY_API_KEY=your-api-key
-
-# For OpenRouter
-export OPENROUTER_API_KEY=your-api-key
-
 # For Anthropic
 export ANTHROPIC_API_KEY=your-api-key
 
@@ -54,6 +56,9 @@ export DEEPSEEK_API_KEY=your-api-key
 
 # For Google Gemini
 export GEMINI_API_KEY=your-api-key
+
+# For OpenRouter (all other models)
+export OPENROUTER_API_KEY=your-api-key
 ```
 
 ## Usage
@@ -98,9 +103,6 @@ diffdash --add-suffix "(closes #123)"
 # Display commit messages generated by all models
 diffdash --llm-compare
 
-# Use the fallback LLM model
-diffdash --llm-fallback
-
 # Specify the LLM model by name
 diffdash --llm-model claude-3.5-haiku
 
@@ -127,14 +129,12 @@ All command-line arguments are optional.
 | `--disable-preview` | disable previewing the generated message|
 | `--disable-commit` | disable committing changes - exit after generating the message |
 | `--disable-push` | disable pushing changes - exit after making the commit |
-| `--push-no-verify` | bypass git hooks when pushing to Git |
-| `--push-force` | apply force when pushing to Git |
 | `--add-prefix PREFIX` | add a prefix to the commit message summary line |
 | `--add-suffix SUFFIX` | add a suffix to the commit message summary line |
+| `--no-verify` | bypass git hooks when committing or pushing to Git |
+| `--force` | apply force when pushing to Git |
 | `--llm-list` | display a list of available Large Language Models and exit |
 | `--llm-compare` | compare the generated messages from all models - but do not commit |
-| `--llm-router` | prefer to access the LLM via a router rather than direct |
-| `--llm-fallback` | use the fallback LLM model instead of the default |
 | `--llm-model MODEL` | choose the LLM model by name (the default is normally best) |
 | `--llm-excludes MODELS` | models to exclude from comparison (comma separated) |
 | `--just-output` | just output the commit message for use in scripts |

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@johnowennixon/diffdash",
-    "version": "1.7.0",
+    "version": "1.9.0",
     "description": "A command-line tool to generate Git commit messages using AI",
     "license": "0BSD",
     "author": "John Owen Nixon",
@@ -24,49 +24,51 @@
         "build:clean": "echo 'Removing dist' && rimraf dist",
         "build:shebang": "echo 'Fixing the shebangs' && add-shebangs --node --exclude 'dist/**/lib_*.js' 'dist/**/*.js'",
         "build:tsc": "echo 'Transpiling TypeScript to dist (using tsc)' && tsc --erasableSyntaxOnly --libReplacement false",
+        "build:tsgo": "echo 'Transpiling TypeScript to dist (using tsgo)' && tsgo || (rimraf dist && false)",
         "fix": "run-s -ls fix:biome fix:markdownlint",
         "fix:biome": "echo 'Fixing with Biome' && biome check --write",
-        "fix:docbot": "echo 'Fixing with DocBot' && docbot --remove --generate",
+        "fix:docbot": "echo 'Fixing with DocBot' && docbot --prune --generate",
         "fix:markdownlint": "echo 'Fixing with markdownlint' && markdownlint-cli2 '**/*.md' --fix",
-        "fix:oxlint": "echo 'Fixing with oxlint' && oxlint --fix",
+        "fix:oxlint": "echo 'Fixing with Oxlint' && oxlint --fix",
         "lint": "run-s -ls lint:biome lint:oxlint lint:tsgolint lint:knip lint:markdownlint",
         "lint:biome": "echo 'Linting with Biome' && biome check",
         "lint:docbot": "echo 'Linting with DocBot' && docbot",
         "lint:knip": "echo 'Linting with Knip' && knip",
-        "lint:markdownlint": "echo 'Linting with markdownlint' && markdownlint-cli2 '**/*.md'",
-        "lint:oxlint": "echo 'Linting with oxlint' && oxlint",
+        "lint:markdownlint": "echo 'Linting with Markdownlint' && markdownlint-cli2 '**/*.md'",
+        "lint:oxlint": "echo 'Linting with Oxlint' && oxlint",
         "lint:tsc": "echo 'Linting with tsc' && tsc --noEmit --erasableSyntaxOnly --libReplacement false",
-        "lint:tsgolint": "echo 'Linting with tsgolint' && (tsgolint | grep -A5 no-floating-promises) 2>&1 | pipe-exit",
+        "lint:tsgo": "echo 'Linting with tsgo' && tsgo --noEmit",
+        "lint:tsgolint": "echo 'Linting with tsgolint' && candide-tsgolint",
         "test": "run-s -ls lint build"
     },
     "dependencies": {
-        "@ai-sdk/anthropic": "1.2.12",
-        "@ai-sdk/deepseek": "0.2.16",
-        "@ai-sdk/google": "1.2.22",
-        "@ai-sdk/openai": "1.3.23",
-        "@openrouter/ai-sdk-provider": "0.7.3",
-        "@requesty/ai-sdk": "0.0.9",
-        "ai": "4.3.19",
+        "@ai-sdk/anthropic": "2.0.9",
+        "@ai-sdk/deepseek": "1.0.13",
+        "@ai-sdk/google": "2.0.11",
+        "@ai-sdk/openai": "2.0.23",
+        "@inquirer/prompts": "7.8.4",
+        "@openrouter/ai-sdk-provider": "1.1.2",
+        "ai": "5.0.29",
         "ansis": "4.1.0",
         "argparse": "2.0.1",
         "cli-table3": "0.6.5",
         "json5": "2.2.3",
         "simple-git": "3.28.0",
-        "zod": "3.25.76"
+        "zod": "4.1.5"
     },
     "devDependencies": {
-        "@biomejs/biome": "2.1.2",
+        "@biomejs/biome": "2.2.2",
+        "@candide/tsgolint": "1.3.0",
         "@johnowennixon/add-shebangs": "1.1.0",
-        "@johnowennixon/chmodx": "2.0.0",
-        "@johnowennixon/pipe-exit": "1.0.1",
+        "@johnowennixon/chmodx": "2.1.0",
         "@types/argparse": "2.0.17",
-        "@types/node": "24.1.0",
-        "knip": "5.62.0",
+        "@types/node": "24.3.0",
+        "@typescript/native-preview": "7.0.0-dev.20250902.1",
+        "knip": "5.63.0",
         "markdownlint-cli2": "0.18.1",
         "npm-run-all2": "8.0.4",
-        "oxlint": "1.8.0",
-        "oxlint-tsgolint": "0.0.0-8",
+        "oxlint": "1.14.0",
         "rimraf": "6.0.1",
-        "typescript": "5.8.3"
+        "typescript": "5.9.2"
     }
 }

package/dist/src/lib_datetime.js

@@ -25,6 +25,9 @@ export function datetime_parse_timestamp(timestamp) {
 export function datetime_format_utc_iso_ymdthms(date) {
     return date.toISOString().slice(0, 19);
 }
+export function datetime_format_utc_iso_ymd_hms(date) {
+    return date.toISOString().slice(0, 19).replace("T", SPACE);
+}
 export function datetime_format_utc_iso_ymd(date) {
     return date.toISOString().slice(0, 10);
 }
@@ -44,7 +47,7 @@ export function datetime_format_local_iso_ymdthms(date) {
     return datetime_format_utc_iso_ymdthms(datetime_localize(date));
 }
 export function datetime_format_local_iso_ymd_hms(date) {
-    return datetime_format_utc_iso_ymdthms(datetime_localize(date)).replace("T", SPACE);
+    return datetime_format_utc_iso_ymd_hms(datetime_localize(date));
 }
 export function datetime_format_local_iso_ymd(date) {
     return datetime_format_utc_iso_ymd(datetime_localize(date));

package/dist/src/lib_debug.js

@@ -29,6 +29,7 @@ export const debug_channels = {
     path: false,
     kubectl: false,
     postgresql: false,
+    regex: false,
     rejects: false,
     retries: false,
     sql: false,

package/dist/src/lib_diffdash_cli.js

@@ -1,5 +1,5 @@
 import { cli_boolean, cli_choice_default, cli_make_parser, cli_string } from "./lib_cli.js";
-import { diffdash_llm_model_choices, diffdash_llm_model_default, diffdash_llm_model_fallback, } from "./lib_diffdash_llm.js";
+import { diffdash_llm_model_choices, diffdash_llm_model_default } from "./lib_diffdash_llm.js";
 const diffdash_cli_schema = {
     version: cli_boolean({ help: "show program version information and exit" }),
     auto_add: cli_boolean({ help: "automatically stage all changes without confirmation" }),
@@ -10,14 +10,12 @@ const diffdash_cli_schema = {
     disable_preview: cli_boolean({ help: "disable previewing the generated message" }),
     disable_commit: cli_boolean({ help: "disable committing changes - exit after generating the message" }),
     disable_push: cli_boolean({ help: "disable pushing changes - exit after making the commit" }),
-    push_no_verify: cli_boolean({ help: "bypass git hooks when pushing to Git" }),
-    push_force: cli_boolean({ help: "apply force when pushing to Git" }),
+    no_verify: cli_boolean({ help: "bypass git hooks when committing or pushing to Git" }),
+    force: cli_boolean({ help: "apply force when pushing to Git" }),
     add_prefix: cli_string({ help: "add a prefix to the commit message summary line", metavar: "PREFIX" }),
     add_suffix: cli_string({ help: "add a suffix to the commit message summary line", metavar: "SUFFIX" }),
     llm_list: cli_boolean({ help: "display a list of available Large Language Models and exit" }),
     llm_compare: cli_boolean({ help: "compare the generated messages from all models - but do not commit" }),
-    llm_router: cli_boolean({ help: "prefer to access the LLM via a router rather than direct" }),
-    llm_fallback: cli_boolean({ help: `use the fallback model (${diffdash_llm_model_fallback})` }),
     llm_model: cli_choice_default({
         help: `choose the Large Language Model by name (defaults to ${diffdash_llm_model_default})`,
         choices: diffdash_llm_model_choices,

package/dist/src/lib_diffdash_config.js

@@ -2,7 +2,7 @@ import { z } from "zod";
 import { abort_with_error } from "./lib_abort.js";
 import { debug_channels, debug_inspect_when } from "./lib_debug.js";
 import { diffdash_cli_parsed_args } from "./lib_diffdash_cli.js";
-import { diffdash_llm_model_details, diffdash_llm_model_fallback } from "./lib_diffdash_llm.js";
+import { diffdash_llm_model_details } from "./lib_diffdash_llm.js";
 import { file_io_read_text } from "./lib_file_io.js";
 import { file_is_file } from "./lib_file_is.js";
 import { json5_parse } from "./lib_json5.js";
@@ -33,7 +33,7 @@ function diffdash_config_file_read(config) {
     }
 }
 export function diffdash_config_get() {
-    const { version, auto_add, auto_commit, auto_push, disable_add, disable_commit, disable_preview, disable_status, disable_push, push_no_verify, push_force, add_prefix, add_suffix, llm_list, llm_compare, llm_router, llm_fallback, llm_model, llm_excludes, just_output, silent, debug_llm_prompts, debug_llm_inputs, debug_llm_outputs, } = diffdash_cli_parsed_args;
+    const { version, auto_add, auto_commit, auto_push, disable_add, disable_commit, disable_preview, disable_status, disable_push, no_verify, force, add_prefix, add_suffix, llm_list, llm_compare, llm_model, llm_excludes, just_output, silent, debug_llm_prompts, debug_llm_inputs, debug_llm_outputs, } = diffdash_cli_parsed_args;
     if (version) {
         tell_plain(`${PACKAGE_NAME} v${PACKAGE_VERSION}`);
         process.exit(0);
@@ -42,17 +42,8 @@ export function diffdash_config_get() {
         llm_list_models({ llm_model_details: diffdash_llm_model_details });
         process.exit(0);
     }
-    const llm_model_name = llm_fallback ? diffdash_llm_model_fallback : llm_model;
-    const llm_config = llm_config_get({
-        llm_model_details: diffdash_llm_model_details,
-        llm_model_name,
-        llm_router,
-    });
-    const all_llm_configs = llm_config_get_all({
-        llm_model_details: diffdash_llm_model_details,
-        llm_router,
-        llm_excludes,
-    });
+    const llm_config = llm_config_get({ llm_model_details: diffdash_llm_model_details, llm_model_name: llm_model });
+    const all_llm_configs = llm_config_get_all({ llm_model_details: diffdash_llm_model_details, llm_excludes });
     debug_channels.llm_prompts = debug_llm_prompts;
     debug_channels.llm_inputs = debug_llm_inputs;
     debug_channels.llm_outputs = debug_llm_outputs;
@@ -65,10 +56,10 @@ export function diffdash_config_get() {
         disable_preview,
         disable_status,
         disable_push,
-        push_no_verify,
-        push_force,
         add_prefix,
         add_suffix,
+        no_verify,
+        force,
         llm_compare,
         llm_config,
         all_llm_configs,

package/dist/src/lib_diffdash_llm.js

@@ -1,25 +1,20 @@
 import { env_get_substitute } from "./lib_env.js";
 import { llm_model_get_choices, llm_model_get_details } from "./lib_llm_model.js";
 const model_name_default = "gpt-4.1-mini";
-const model_name_fallback = "claude-3.5-haiku";
 const model_name_options = [
-    "claude-3.5-haiku",
-    "deepseek-v3",
-    "devstral-medium",
-    "devstral-small",
+    "claude-3.5-haiku", // fallback
+    "deepseek-chat",
     "gemini-2.0-flash",
     "gemini-2.5-flash",
     "gpt-4.1-mini", // the best
     "gpt-4.1-nano",
-    "gpt-4o-mini",
-    "grok-3-mini",
-    "kimi-k2",
-    "llama-4-maverick",
-    "mercury-coder",
-    "mistral-medium-3",
-    "qwen3-235b-a22b",
+    "gpt-5-mini",
+    "gpt-5-mini-minimal", // fallback
+    "gpt-5-nano",
+    "gpt-5-nano-minimal",
+    "grok-code-fast-1",
+    "llama-4-maverick@cerebras",
 ];
 export const diffdash_llm_model_details = llm_model_get_details({ llm_model_names: model_name_options });
 export const diffdash_llm_model_choices = llm_model_get_choices({ llm_model_details: diffdash_llm_model_details });
 export const diffdash_llm_model_default = env_get_substitute("DIFFDASH_LLM_MODEL", model_name_default);
-export const diffdash_llm_model_fallback = model_name_fallback;

package/dist/src/lib_diffdash_sequence.js

@@ -1,4 +1,5 @@
 import { abort_with_error, abort_with_warning } from "./lib_abort.js";
+import { ansi_blue } from "./lib_ansi.js";
 import { debug_channels, debug_inspect } from "./lib_debug.js";
 import { diffdash_add_footer, diffdash_add_prefix_or_suffix } from "./lib_diffdash_add.js";
 import { error_get_text } from "./lib_error.js";
@@ -7,11 +8,11 @@ import { git_message_generate_result } from "./lib_git_message_generate.js";
 import { git_message_validate_check, git_message_validate_get_result } from "./lib_git_message_validate.js";
 import { git_simple_open_check_not_bare, git_simple_open_git_repo } from "./lib_git_simple_open.js";
 import { git_simple_staging_create_commit, git_simple_staging_get_staged_diff, git_simple_staging_get_staged_diffstat, git_simple_staging_has_staged_changes, git_simple_staging_has_unstaged_changes, git_simple_staging_push_to_remote, git_simple_staging_stage_all_changes, } from "./lib_git_simple_staging.js";
-import { llm_config_get_model_via } from "./lib_llm_config.js";
+import { llm_results_summary } from "./lib_llm_results.js";
 import { stdio_write_stdout, stdio_write_stdout_linefeed } from "./lib_stdio_write.js";
 import { tell_action, tell_info, tell_plain, tell_success, tell_warning } from "./lib_tell.js";
+import { tui_confirm } from "./lib_tui_confirm.js";
 import { tui_justify_left } from "./lib_tui_justify.js";
-import { tui_readline_confirm } from "./lib_tui_readline.js";
 async function phase_open() {
     const git = await git_simple_open_git_repo();
     await git_simple_open_check_not_bare(git);
@@ -40,7 +41,11 @@ async function phase_add({ config, git }) {
         }
     }
     else {
-        const add_confirmed = await tui_readline_confirm("No staged changes found - would you like to add all changes?");
+        const add_confirmed = await tui_confirm({
+            question: "No staged changes found - would you like to add all changes?",
+            default: true,
+            style_message: ansi_blue,
+        });
         if (!add_confirmed) {
             abort_with_warning("Please add changes before creating a commit");
         }
@@ -98,25 +103,27 @@ async function phase_compare({ config, git }) {
     const all_results = await Promise.all(result_promises);
     for (const result of all_results) {
         const { llm_config, seconds, error_text } = result;
-        const model_via = llm_config_get_model_via({ llm_config });
+        const { llm_model_name } = llm_config;
         if (error_text !== null) {
-            tell_warning(`Failed to generate a commit message in ${seconds} seconds using ${model_via}: ${error_text}`);
+            tell_warning(`Failed to generate a commit message in ${seconds} seconds using ${llm_model_name}: ${error_text}`);
             continue;
         }
-        tell_info(`Git commit message in ${seconds} seconds using ${model_via}:`);
-        let { git_message } = result;
+        tell_info(`Git commit message in ${seconds} seconds using ${llm_model_name}:`);
+        const { outputs } = result;
+        let { generated_text: git_message } = outputs;
         const validation_result = git_message_validate_get_result(git_message);
         const teller = validation_result.valid ? tell_plain : tell_warning;
         git_message = diffdash_add_prefix_or_suffix({ git_message, add_prefix, add_suffix });
         git_message = diffdash_add_footer({ git_message, llm_config });
         git_message_display({ git_message, teller });
     }
+    llm_results_summary(all_results);
 }
 async function phase_generate({ config, git }) {
     const { disable_preview, add_prefix, add_suffix, llm_config, just_output, silent, extra_prompts } = config;
-    const model_via = llm_config_get_model_via({ llm_config });
+    const { llm_model_name } = llm_config;
     if (!silent && !just_output) {
-        tell_action(`Generating the Git commit message using ${model_via}`);
+        tell_action(`Generating the Git commit message using ${llm_model_name}`);
     }
     const diffstat = await git_simple_staging_get_staged_diffstat(git);
     const diff = await git_simple_staging_get_staged_diff(git);
@@ -124,9 +131,10 @@ async function phase_generate({ config, git }) {
     const result = await git_message_generate_result({ llm_config, inputs });
     const { error_text } = result;
     if (error_text !== null) {
-        abort_with_error(`Failed to generate a commit message using ${model_via}: ${error_text}`);
+        abort_with_error(`Failed to generate a commit message using ${llm_model_name}: ${error_text}`);
     }
-    let { git_message } = result;
+    const { outputs } = result;
+    let { generated_text: git_message } = outputs;
     git_message_validate_check(git_message);
     git_message = diffdash_add_prefix_or_suffix({ git_message, add_prefix, add_suffix });
     git_message = diffdash_add_footer({ git_message, llm_config });
@@ -139,7 +147,7 @@ async function phase_generate({ config, git }) {
     return git_message;
 }
 async function phase_commit({ config, git, git_message, }) {
-    const { auto_commit, disable_commit, silent } = config;
+    const { auto_commit, disable_commit, no_verify, silent } = config;
     if (disable_commit) {
         return;
     }
@@ -149,18 +157,22 @@ async function phase_commit({ config, git, git_message, }) {
         }
     }
     else {
-        const commit_confirmed = await tui_readline_confirm("Do you want to commit these changes?");
+        const commit_confirmed = await tui_confirm({
+            question: "Do you want to commit these changes?",
+            default: true,
+            style_message: ansi_blue,
+        });
         if (!commit_confirmed) {
             abort_with_warning("Commit cancelled by user");
         }
     }
-    await git_simple_staging_create_commit(git, git_message);
+    await git_simple_staging_create_commit({ git, git_message, no_verify });
     if (!silent) {
         tell_success("Changes committed successfully");
     }
 }
 async function phase_push({ config, git }) {
-    const { auto_push, disable_commit, disable_push, push_no_verify, push_force, silent } = config;
+    const { auto_push, disable_commit, disable_push, no_verify, force, silent } = config;
     if (disable_push || disable_commit) {
         return;
     }
@@ -170,13 +182,17 @@ async function phase_push({ config, git }) {
         }
     }
     else {
-        const push_confirmed = await tui_readline_confirm("Do you want to push these changes?");
+        const push_confirmed = await tui_confirm({
+            question: "Do you want to push these changes?",
+            default: true,
+            style_message: ansi_blue,
+        });
         if (!push_confirmed) {
             return;
         }
     }
     try {
-        await git_simple_staging_push_to_remote({ git, no_verify: push_no_verify, force: push_force });
+        await git_simple_staging_push_to_remote({ git, no_verify, force });
     }
     catch (error) {
         abort_with_error(`Failed to push to remote: ${error_get_text(error)}`);

package/dist/src/lib_git_message_generate.js

@@ -1,55 +1,55 @@
 import { Duration } from "./lib_duration.js";
 import { error_get_text } from "./lib_error.js";
-import { git_message_get_system_prompt, git_message_get_user_prompt } from "./lib_git_message_prompt.js";
+import { git_message_prompt_get_system, git_message_prompt_get_user } from "./lib_git_message_prompt.js";
 import { git_message_schema, git_message_schema_format } from "./lib_git_message_schema.js";
 import { llm_chat_generate_object, llm_chat_generate_text } from "./lib_llm_chat.js";
-import { llm_tokens_count_estimated, llm_tokens_debug_usage } from "./lib_llm_tokens.js";
+import { llm_tokens_debug_usage, llm_tokens_estimate_length_from_tokens, llm_tokens_estimate_tokens_from_length, } from "./lib_llm_tokens.js";
 async function git_message_generate_unstructured({ llm_config, system_prompt, user_prompt, }) {
-    const llm_response_text = await llm_chat_generate_text({ llm_config, system_prompt, user_prompt });
-    return llm_response_text;
+    const outputs = await llm_chat_generate_text({ llm_config, system_prompt, user_prompt });
+    return outputs;
 }
 async function git_message_generate_structured({ llm_config, system_prompt, user_prompt, }) {
     const schema = git_message_schema;
-    const llm_response_structured = await llm_chat_generate_object({
+    const { generated_object, total_usage, provider_metadata } = await llm_chat_generate_object({
         llm_config,
         system_prompt,
         user_prompt,
         schema,
     });
-    const llm_response_text = git_message_schema_format(llm_response_structured);
-    return llm_response_text;
+    const generated_text = git_message_schema_format(generated_object);
+    return { generated_text, reasoning_text: undefined, total_usage, provider_metadata };
 }
 export async function git_message_generate_string({ llm_config, inputs, }) {
-    const { context_window, has_structured_json } = llm_config.llm_model_detail;
-    const system_prompt = git_message_get_system_prompt({ has_structured_json, inputs });
-    // Estimate remaining prompt length
-    const user_tokens = context_window - llm_tokens_count_estimated({ llm_config, text: system_prompt }) - 1000;
-    const user_length = user_tokens * 3;
-    const user_prompt = git_message_get_user_prompt({
+    const { effective_context_window } = llm_config;
+    const { has_structured_json } = llm_config.llm_model_detail;
+    const system_prompt = git_message_prompt_get_system({ has_structured_json, inputs });
+    const user_tokens = effective_context_window - llm_tokens_estimate_tokens_from_length({ llm_config, length: system_prompt.length }) - 1000;
+    const user_length = llm_tokens_estimate_length_from_tokens({ llm_config, tokens: user_tokens });
+    const user_prompt = git_message_prompt_get_user({
         has_structured_json,
         inputs,
         max_length: user_length,
     });
     llm_tokens_debug_usage({ name: "Inputs", llm_config, text: system_prompt + user_prompt });
-    const llm_response_text = has_structured_json
+    const outputs = has_structured_json
         ? await git_message_generate_structured({ llm_config, system_prompt, user_prompt })
         : await git_message_generate_unstructured({ llm_config, system_prompt, user_prompt });
-    llm_tokens_debug_usage({ name: "Outputs", llm_config, text: llm_response_text });
-    return llm_response_text;
+    llm_tokens_debug_usage({ name: "Outputs", llm_config, text: outputs.generated_text });
+    return outputs;
 }
 export async function git_message_generate_result({ llm_config, inputs, }) {
     const duration = new Duration();
     duration.start();
     try {
-        const git_message = await git_message_generate_string({ llm_config, inputs });
+        const outputs = await git_message_generate_string({ llm_config, inputs });
         duration.stop();
         const seconds = duration.seconds_rounded();
-        return { llm_config, seconds, git_message, error_text: null };
+        return { llm_config, seconds, error_text: null, outputs };
     }
     catch (error) {
         duration.stop();
         const seconds = duration.seconds_rounded();
         const error_text = error_get_text(error);
-        return { llm_config, seconds, git_message: null, error_text };
+        return { llm_config, seconds, error_text, outputs: null };
     }
 }

package/dist/src/lib_git_message_prompt.js

@@ -45,13 +45,13 @@ A simple change needs only two additional sentences scaling up to a complex chan
 If there are a lot of changes, you will need to summarize even more.
 `.trim() + LF_LF;
 const portion_extra = (extra_prompts) => {
-    return extra_prompts && extra_prompts.length > 0 ? extra_prompts.map((s) => s.trim).join(LF) + LF_LF : EMPTY;
+    return extra_prompts && extra_prompts.length > 0 ? extra_prompts.map((s) => s.trim()).join(LF) + LF_LF : EMPTY;
 };
 const portion_final = `
 Everything you write will be checked for validity and then saved directly to Git - it will not be reviewed by a human.
 Therefore, you must just output the Git message itself without any introductory or concluding sections.
 `.trim() + LF_LF;
-export function git_message_get_system_prompt({ has_structured_json, inputs, }) {
+export function git_message_prompt_get_system({ has_structured_json, inputs, }) {
     let system_prompt = EMPTY;
     system_prompt += portion_role;
     system_prompt += portion_inputs;
@@ -62,7 +62,7 @@ export function git_message_get_system_prompt({ has_structured_json, inputs, })
     system_prompt += portion_final;
     return system_prompt.trim();
 }
-export function git_message_get_user_prompt({ has_structured_json, inputs, max_length, }) {
+export function git_message_prompt_get_user({ has_structured_json, inputs, max_length, }) {
     const { diffstat, diff } = inputs;
     const truncate = diffstat.length + diff.length > max_length;
     const diff_truncated = truncate ? diff.slice(0, max_length - diffstat.length) + LF : diff;

package/dist/src/lib_git_message_schema.js

@@ -7,10 +7,10 @@ export const git_message_schema = z.object({
         .array(z.string().describe("Another sentence giving more information about the changes."))
         .describe("More information about the changes."),
 });
-export function git_message_schema_format(message) {
+export function git_message_schema_format(git_message_object) {
     return [
-        message.summary_line,
+        git_message_object.summary_line,
         EMPTY, // Empty line
-        ...message.extra_lines.map((line) => (line.startsWith("- ") ? line : `- ${line}`)),
+        ...git_message_object.extra_lines.map((line) => (line.startsWith("- ") ? line : `- ${line}`)),
     ].join(LF);
 }

package/dist/src/lib_git_simple_staging.js

@@ -26,16 +26,21 @@ export async function git_simple_staging_get_staged_diffstat(git) {
 export async function git_simple_staging_get_staged_diff(git) {
     return await git.diff(["--cached"]);
 }
-export async function git_simple_staging_create_commit(git, git_message) {
-    await git.commit(git_message);
+export async function git_simple_staging_create_commit({ git, git_message, no_verify = false, }) {
+    const options = {};
+    if (no_verify) {
+        options["--no-verify"] = null;
+    }
+    await git.commit(git_message, options);
 }
 export async function git_simple_staging_push_to_remote({ git, no_verify = false, force = false, }) {
-    const push_args = ["--follow-tags"];
+    const options = {};
+    options["--follow-tags"] = null;
     if (no_verify) {
-        push_args.push("--no-verify");
+        options["--no-verify"] = null;
     }
     if (force) {
-        push_args.push("--force");
+        options["--force"] = null;
     }
-    await git.push(push_args);
+    await git.push(options);
 }