@johnowennixon/diffdash 1.8.0 → 1.10.0

package/README.md

@@ -1,5 +1,8 @@
 # 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.
@@ -126,14 +129,15 @@ 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 |
 | `--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-model MODEL` | choose the LLM model by name (the default is normally best) |
 | `--llm-excludes MODELS` | models to exclude from comparison (comma separated) |
+| `--no-secret-check` | bypass checking for secrets in diffs |
+| `--no-verify` | bypass git hooks when committing or pushing to Git |
+| `--force` | apply force when pushing to Git |
 | `--just-output` | just output the commit message for use in scripts |
 | `--silent` | suppress all normal output - errors and aborts still display |
 | `--debug-llm-prompts` | show prompts sent to the LLM |
@@ -150,6 +154,8 @@ Files containing secrets should not be in Git. But if they are, you can add an e
 .env  -diff
 ```
 
+There is a rudimentary check for secrets in diffs before submitting to the LLM. If any are found, there is an interactive option to ignore. If you want to bypass this check, you can use the `--no-secret-check` flag.
+
 ## Development
 
 To install on your laptop:

package/dist/package.json

@@ -1,12 +1,12 @@
 {
     "name": "@johnowennixon/diffdash",
-    "version": "1.8.0",
+    "version": "1.10.0",
     "description": "A command-line tool to generate Git commit messages using AI",
     "license": "0BSD",
     "author": "John Owen Nixon",
     "repository": {
         "type": "git",
-        "url": "https://github.com/johnowennixon/diffdash.git"
+        "url": "git+https://github.com/johnowennixon/diffdash.git"
     },
     "engines": {
         "node": ">=20"
@@ -42,32 +42,34 @@
         "test": "run-s -ls lint build"
     },
     "dependencies": {
-        "@ai-sdk/anthropic": "2.0.1",
-        "@ai-sdk/deepseek": "1.0.5",
-        "@ai-sdk/google": "2.0.4",
-        "@ai-sdk/openai": "2.0.9",
-        "@openrouter/ai-sdk-provider": "1.1.2",
-        "ai": "5.0.9",
-        "ansis": "4.1.0",
+        "@ai-sdk/anthropic": "2.0.23",
+        "@ai-sdk/deepseek": "1.0.20",
+        "@ai-sdk/google": "2.0.17",
+        "@ai-sdk/openai": "2.0.42",
+        "@inquirer/prompts": "7.8.6",
+        "@openrouter/ai-sdk-provider": "1.2.0",
+        "ai": "5.0.60",
+        "ansis": "4.2.0",
         "argparse": "2.0.1",
         "cli-table3": "0.6.5",
         "json5": "2.2.3",
+        "magic-regexp": "0.10.0",
         "simple-git": "3.28.0",
-        "zod": "4.0.17"
+        "zod": "4.1.11"
     },
     "devDependencies": {
-        "@biomejs/biome": "2.1.4",
-        "@candide/tsgolint": "1.3.0",
+        "@biomejs/biome": "2.2.5",
+        "@candide/tsgolint": "1.4.0",
         "@johnowennixon/add-shebangs": "1.1.0",
-        "@johnowennixon/chmodx": "2.0.0",
+        "@johnowennixon/chmodx": "2.1.0",
         "@types/argparse": "2.0.17",
-        "@types/node": "24.2.1",
-        "@typescript/native-preview": "7.0.0-dev.20250811.1",
-        "knip": "5.62.0",
+        "@types/node": "24.5.2",
+        "@typescript/native-preview": "7.0.0-dev.20250925.1",
+        "knip": "5.63.1",
         "markdownlint-cli2": "0.18.1",
         "npm-run-all2": "8.0.4",
-        "oxlint": "1.11.1",
+        "oxlint": "1.19.0",
         "rimraf": "6.0.1",
-        "typescript": "5.9.2"
+        "typescript": "5.9.3"
     }
 }

package/dist/src/lib_char_digit.js

@@ -8,3 +8,4 @@ export const DIGIT_6 = "6";
 export const DIGIT_7 = "7";
 export const DIGIT_8 = "8";
 export const DIGIT_9 = "9";
+export const DIGITS = "0123456789";

package/dist/src/lib_cli.js

@@ -17,12 +17,6 @@ export function cli_integer_always(options = {}) {
 export function cli_boolean(options = {}) {
     return { kind: "boolean", options, value: false };
 }
-export function cli_command_sync(command_sync, options = {}) {
-    return { kind: "boolean", options, value: false, command_sync };
-}
-export function cli_command_async(command_async, options = {}) {
-    return { kind: "boolean", options, value: false, command_async };
-}
 export function cli_choice_optional(options = {}) {
     return { kind: "choice", options, value: undefined };
 }
@@ -126,50 +120,6 @@ function cli_recursive_parse({ schema, namespace, predicate, }) {
     }
     return result;
 }
-function cli_recursive_despatch_sync({ schema, namespace, parsed_args, }) {
-    for (const key in schema) {
-        if (!Object.hasOwn(schema, key)) {
-            continue;
-        }
-        const cli = schema[key];
-        if (!cli) {
-            continue;
-        }
-        if (cli.kind === "meg") {
-            const nested_schema = cli.value;
-            cli_recursive_despatch_sync({ schema: nested_schema, namespace, parsed_args });
-        }
-        else if (cli.kind === "boolean") {
-            if (namespace[key]) {
-                if (cli.command_sync) {
-                    cli.command_sync(parsed_args);
-                }
-            }
-        }
-    }
-}
-async function cli_recursive_despatch_async({ schema, namespace, parsed_args, }) {
-    for (const key in schema) {
-        if (!Object.hasOwn(schema, key)) {
-            continue;
-        }
-        const cli = schema[key];
-        if (!cli) {
-            continue;
-        }
-        if (cli.kind === "meg") {
-            const nested_schema = cli.value;
-            await cli_recursive_despatch_async({ schema: nested_schema, namespace, parsed_args });
-        }
-        else if (cli.kind === "boolean") {
-            if (namespace[key]) {
-                if (cli.command_async) {
-                    await cli.command_async(parsed_args);
-                }
-            }
-        }
-    }
-}
 export function cli_make_parser({ cli_schema, description, }) {
     const argument_parser_options = { description, allow_abbrev: false };
     const parser = new ArgumentParser(argument_parser_options);
@@ -177,11 +127,5 @@ export function cli_make_parser({ cli_schema, description, }) {
     const namespace = parser.parse_args();
     debug_inspect_when(debug_channels.cli, namespace, "namespace");
     const parsed_args = cli_recursive_parse({ schema: cli_schema, namespace });
-    function despatch_sync() {
-        cli_recursive_despatch_sync({ schema: cli_schema, namespace, parsed_args });
-    }
-    async function despatch_async() {
-        await cli_recursive_despatch_async({ schema: cli_schema, namespace, parsed_args });
-    }
-    return { parsed_args, despatch_sync, despatch_async };
+    return { parsed_args };
 }

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

@@ -10,8 +10,6 @@ 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" }),
     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" }),
@@ -22,6 +20,9 @@ const diffdash_cli_schema = {
         default: diffdash_llm_model_default,
     }),
     llm_excludes: cli_string({ help: "models to exclude from comparison (comma separated)", metavar: "MODELS" }),
+    no_secret_check: cli_boolean({ help: "bypass checking for secrets in diffs" }),
+    no_verify: cli_boolean({ help: "bypass git hooks when committing or pushing to Git" }),
+    force: cli_boolean({ help: "apply force when pushing to Git" }),
     just_output: cli_boolean({ help: "just output the commit message for use in scripts" }),
     silent: cli_boolean({ help: "suppress all normal output - errors and aborts still display" }),
     debug_llm_prompts: cli_boolean({ help: "debug prompts sent to the LLM" }),

package/dist/src/lib_diffdash_config.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_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, add_prefix, add_suffix, llm_list, llm_compare, llm_model, llm_excludes, no_secret_check, no_verify, force, 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);
@@ -56,10 +56,11 @@ export function diffdash_config_get() {
         disable_preview,
         disable_status,
         disable_push,
-        push_no_verify,
-        push_force,
         add_prefix,
         add_suffix,
+        no_secret_check,
+        no_verify,
+        force,
         llm_compare,
         llm_config,
         all_llm_configs,

package/dist/src/lib_diffdash_llm.js

@@ -12,6 +12,7 @@ const model_name_options = [
     "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 });

package/dist/src/lib_diffdash_sequence.js

@@ -1,17 +1,19 @@
 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";
+import { error_get_message, error_get_text } from "./lib_error.js";
 import { git_message_display } from "./lib_git_message_display.js";
 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_results_summary } from "./lib_llm_results.js";
+import { secret_check } from "./lib_secret_check.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 +42,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");
         }
@@ -87,13 +93,21 @@ async function phase_status({ config, git }) {
 }
 async function phase_compare({ config, git }) {
     const { silent } = config;
-    if (!silent) {
-        tell_action("Generating Git commit messages using all models in parallel");
-    }
-    const { all_llm_configs, add_prefix, add_suffix, extra_prompts } = config;
+    const { all_llm_configs, add_prefix, add_suffix, no_secret_check, extra_prompts } = config;
     const diffstat = await git_simple_staging_get_staged_diffstat(git);
     const diff = await git_simple_staging_get_staged_diff(git);
+    if (!no_secret_check) {
+        try {
+            await secret_check({ text: diff, interactive: true });
+        }
+        catch (error) {
+            abort_with_error(`Aborting: ${error_get_message(error)}`);
+        }
+    }
     const inputs = { diffstat, diff, extra_prompts };
+    if (!silent) {
+        tell_action("Generating Git commit messages using all models in parallel");
+    }
     const result_promises = all_llm_configs.map((llm_config) => git_message_generate_result({ llm_config, inputs }));
     const all_results = await Promise.all(result_promises);
     for (const result of all_results) {
@@ -115,14 +129,22 @@ async function phase_compare({ config, git }) {
     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 { disable_preview, add_prefix, add_suffix, llm_config, no_secret_check, just_output, silent, extra_prompts } = config;
     const { llm_model_name } = llm_config;
-    if (!silent && !just_output) {
-        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);
+    if (!no_secret_check) {
+        try {
+            await secret_check({ text: diff, interactive: true });
+        }
+        catch (error) {
+            abort_with_error(`Aborting: ${error_get_message(error)}`);
+        }
+    }
     const inputs = { diffstat, diff, extra_prompts };
+    if (!silent && !just_output) {
+        tell_action(`Generating the Git commit message using ${llm_model_name}`);
+    }
     const result = await git_message_generate_result({ llm_config, inputs });
     const { error_text } = result;
     if (error_text !== null) {
@@ -142,7 +164,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;
     }
@@ -152,18 +174,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;
     }
@@ -173,13 +199,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,39 +1,41 @@
 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";
-async function git_message_generate_unstructured({ llm_config, system_prompt, user_prompt, }) {
-    const outputs = await llm_chat_generate_text({ llm_config, system_prompt, user_prompt });
+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, max_output_tokens, }) {
+    const outputs = await llm_chat_generate_text({ llm_config, system_prompt, user_prompt, max_output_tokens });
     return outputs;
 }
-async function git_message_generate_structured({ llm_config, system_prompt, user_prompt, }) {
+async function git_message_generate_structured({ llm_config, system_prompt, user_prompt, max_output_tokens, }) {
     const schema = git_message_schema;
     const { generated_object, total_usage, provider_metadata } = await llm_chat_generate_object({
         llm_config,
         system_prompt,
         user_prompt,
+        max_output_tokens,
         schema,
     });
     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({
+async function git_message_generate_outputs({ llm_config, inputs, }) {
+    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,
     });
+    const max_output_tokens = 8192; // This is the maximum for some models
     llm_tokens_debug_usage({ name: "Inputs", llm_config, text: system_prompt + user_prompt });
     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 });
+        ? await git_message_generate_structured({ llm_config, system_prompt, user_prompt, max_output_tokens })
+        : await git_message_generate_unstructured({ llm_config, system_prompt, user_prompt, max_output_tokens });
     llm_tokens_debug_usage({ name: "Outputs", llm_config, text: outputs.generated_text });
     return outputs;
 }
@@ -41,7 +43,7 @@ export async function git_message_generate_result({ llm_config, inputs, }) {
     const duration = new Duration();
     duration.start();
     try {
-        const outputs = await git_message_generate_string({ llm_config, inputs });
+        const outputs = await git_message_generate_outputs({ llm_config, inputs });
         duration.stop();
         const seconds = duration.seconds_rounded();
         return { llm_config, seconds, error_text: null, outputs };

package/dist/src/lib_git_message_prompt.js

@@ -1,5 +1,6 @@
 import { LF } from "./lib_char_control.js";
 import { EMPTY } from "./lib_char_empty.js";
+import { tell_warning } from "./lib_tell.js";
 const LF_LF = LF + LF;
 const portion_role = `
 Your role is to generate a Git commit message in conversational English.
@@ -45,13 +46,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,9 +63,12 @@ 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;
+    if (truncate) {
+        tell_warning("The Diff is too long to fit in the user prompt - it is being truncated");
+    }
     const diff_truncated = truncate ? diff.slice(0, max_length - diffstat.length) + LF : diff;
     let user_prompt = EMPTY;
     user_prompt += "<diffstat>" + LF + diffstat + "</diffstat>" + LF_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);
 }

package/dist/src/lib_llm_chat.js

@@ -10,7 +10,7 @@ import { tui_block_string } from "./lib_tui_block.js";
 function llm_chat_get_parameters() {
     return {
         max_output_tokens: parse_int_or_undefined(env_get_empty("lib_llm_chat_max_output_tokens")),
-        timeout: parse_int(env_get_substitute("lib_llm_chat_timeout", "60")),
+        timeout: parse_int(env_get_substitute("lib_llm_chat_timeout", "90")),
     };
 }
 function llm_chat_debug_prompts({ llm_model_name, system_prompt, user_prompt, }) {
@@ -22,7 +22,7 @@ function llm_chat_debug_prompts({ llm_model_name, system_prompt, user_prompt, })
         tui_block_string({ teller, title: `LLM user prompt (for ${llm_model_name}):`, content: user_prompt });
     }
 }
-export async function llm_chat_generate_text({ llm_config, system_prompt, user_prompt, tools, max_steps, min_steps, }) {
+export async function llm_chat_generate_text({ llm_config, system_prompt, user_prompt, max_output_tokens, tools, max_steps, min_steps, }) {
     const { llm_model_name, llm_model_detail, llm_model_code, llm_api_code, llm_api_key } = llm_config;
     llm_chat_debug_prompts({ system_prompt, user_prompt, llm_model_name });
     const ai_sdk_language_model = llm_api_get_ai_sdk_language_model({
@@ -30,9 +30,14 @@ export async function llm_chat_generate_text({ llm_config, system_prompt, user_p
         llm_api_code,
         llm_api_key,
     });
-    const { recommended_temperature, provider_options } = llm_model_detail;
+    const { recommended_temperature, provider_options, max_output_tokens: max_output_tokens_model } = llm_model_detail;
     const temperature = recommended_temperature;
-    const { max_output_tokens, timeout } = llm_chat_get_parameters();
+    const { timeout, max_output_tokens: max_output_tokens_env } = llm_chat_get_parameters();
+    if (max_output_tokens_env !== undefined) {
+        max_output_tokens = max_output_tokens_env;
+    }
+    max_output_tokens =
+        max_output_tokens === undefined ? max_output_tokens_model : Math.min(max_output_tokens, max_output_tokens_model);
     const llm_inputs = {
         model: ai_sdk_language_model,
         system: system_prompt,
@@ -57,11 +62,11 @@ export async function llm_chat_generate_text({ llm_config, system_prompt, user_p
     const { text: generated_text, reasoningText: reasoning_text, totalUsage: total_usage, providerMetadata: provider_metadata, } = llm_outputs;
     return { generated_text, reasoning_text, total_usage, provider_metadata };
 }
-export async function llm_chat_generate_text_result({ llm_config, system_prompt, user_prompt, }) {
+export async function llm_chat_generate_text_result({ llm_config, system_prompt, user_prompt, max_output_tokens, }) {
     const duration = new Duration();
     duration.start();
     try {
-        const outputs = await llm_chat_generate_text({ llm_config, system_prompt, user_prompt });
+        const outputs = await llm_chat_generate_text({ llm_config, system_prompt, user_prompt, max_output_tokens });
         duration.stop();
         const seconds = duration.seconds_rounded();
         return { llm_config, seconds, error_text: null, outputs };
@@ -73,7 +78,7 @@ export async function llm_chat_generate_text_result({ llm_config, system_prompt,
         return { llm_config, seconds, error_text, outputs: null };
     }
 }
-export async function llm_chat_generate_object({ llm_config, user_prompt, system_prompt, schema, }) {
+export async function llm_chat_generate_object({ llm_config, user_prompt, system_prompt, max_output_tokens, schema, }) {
     const { llm_model_name, llm_model_detail, llm_model_code, llm_api_code, llm_api_key } = llm_config;
     llm_chat_debug_prompts({ system_prompt, user_prompt, llm_model_name });
     const ai_sdk_language_model = llm_api_get_ai_sdk_language_model({
@@ -83,14 +88,14 @@ export async function llm_chat_generate_object({ llm_config, user_prompt, system
     });
     const { recommended_temperature, provider_options } = llm_model_detail;
     const temperature = recommended_temperature;
-    const { max_output_tokens, timeout } = llm_chat_get_parameters();
+    const { timeout, max_output_tokens: max_output_tokens_env } = llm_chat_get_parameters();
     const llm_inputs = {
         model: ai_sdk_language_model,
         system: system_prompt,
         prompt: user_prompt,
         output: "object",
         schema,
-        maxOutputTokens: max_output_tokens,
+        maxOutputTokens: max_output_tokens_env ?? max_output_tokens,
         temperature,
         providerOptions: provider_options,
         abortSignal: AbortSignal.timeout(timeout * 1000),

package/dist/src/lib_llm_config.js

@@ -1,10 +1,17 @@
+import { env_get } from "./lib_env.js";
 import { llm_access_available, llm_access_get } from "./lib_llm_access.js";
 import { llm_model_find_detail, llm_model_get_choices } from "./lib_llm_model.js";
+import { parse_int_or_undefined } from "./lib_parse_number.js";
 export function llm_config_get({ llm_model_details, llm_model_name, }) {
     const llm_model_detail = llm_model_find_detail({ llm_model_details, llm_model_name });
     const access = llm_access_get({ llm_model_details, llm_model_name });
     const { llm_model_code, llm_api_code, llm_api_key } = access;
-    return { llm_model_name, llm_model_detail, llm_model_code, llm_api_code, llm_api_key };
+    let effective_context_window = llm_model_detail.context_window;
+    const env_context_window = parse_int_or_undefined(env_get("LLM_CONFIG_CONTEXT_WINDOW"));
+    if (env_context_window !== undefined) {
+        effective_context_window = Math.min(effective_context_window, env_context_window);
+    }
+    return { llm_model_name, llm_model_detail, llm_model_code, llm_api_code, llm_api_key, effective_context_window };
 }
 export function llm_config_get_all({ llm_model_details, llm_include, llm_excludes, }) {
     const choices = llm_model_get_choices({ llm_model_details });

package/dist/src/lib_llm_list.js

@@ -5,7 +5,7 @@ import { TuiTable } from "./lib_tui_table.js";
 export function llm_list_models({ llm_model_details }) {
     const headings = ["NAME", "API", "CONTEXT", "INPUT", "OUTPUT", "REASONING"];
     const alignments = ["left", "left", "right", "right", "right", "left"];
-    const table = new TuiTable({ headings, alignments });
+    const table = new TuiTable({ headings, alignments, compact: true });
     for (const detail of llm_model_details) {
         const { llm_model_name, llm_api_code, context_window, cents_input, cents_output, default_reasoning } = detail;
         const tui_name = llm_model_name;