@johnowennixon/diffdash 1.6.1 → 1.7.0

package/README.md

@@ -107,8 +107,8 @@ diffdash --llm-model claude-3.5-haiku
 # Just output the commit message for use in scripts
 diffdash --just-output
 
-# Debug options
-diffdash --debug-llm-inputs --debug-llm-outputs
+# Debug prompts
+diffdash --debug-llm-prompts
 ```
 
 ## Command Line Arguments
@@ -139,8 +139,9 @@ All command-line arguments are optional.
 | `--llm-excludes MODELS` | models to exclude from comparison (comma separated) |
 | `--just-output` | just output the commit message for use in scripts |
 | `--silent` | suppress all normal output - errors and aborts still display |
-| `--debug-llm-inputs` | show inputs (including all prompts) sent to the LLM |
-| `--debug-llm-outputs` | show outputs received from the LLM |
+| `--debug-llm-prompts` | show prompts sent to the LLM |
+| `--debug-llm-inputs` | show inputs object sent to the LLM |
+| `--debug-llm-outputs` | show outputs object received from the LLM |
 
 ## Files containing secrets
 

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@johnowennixon/diffdash",
-    "version": "1.6.1",
+    "version": "1.7.0",
     "description": "A command-line tool to generate Git commit messages using AI",
     "license": "0BSD",
     "author": "John Owen Nixon",
@@ -26,16 +26,17 @@
         "build:tsc": "echo 'Transpiling TypeScript to dist (using tsc)' && tsc --erasableSyntaxOnly --libReplacement false",
         "fix": "run-s -ls fix:biome fix:markdownlint",
         "fix:biome": "echo 'Fixing with Biome' && biome check --write",
-        "fix:eslint": "echo 'Fixing with ESLint' && eslint --fix",
+        "fix:docbot": "echo 'Fixing with DocBot' && docbot --remove --generate",
         "fix:markdownlint": "echo 'Fixing with markdownlint' && markdownlint-cli2 '**/*.md' --fix",
         "fix:oxlint": "echo 'Fixing with oxlint' && oxlint --fix",
-        "lint": "run-s -ls lint:biome lint:oxlint lint:knip lint:markdownlint",
+        "lint": "run-s -ls lint:biome lint:oxlint lint:tsgolint lint:knip lint:markdownlint",
         "lint:biome": "echo 'Linting with Biome' && biome check",
-        "lint:eslint": "echo 'Linting with ESLint' && eslint",
+        "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: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",
         "test": "run-s -ls lint build"
     },
     "dependencies": {
@@ -43,38 +44,29 @@
         "@ai-sdk/deepseek": "0.2.16",
         "@ai-sdk/google": "1.2.22",
         "@ai-sdk/openai": "1.3.23",
-        "@openrouter/ai-sdk-provider": "0.7.2",
+        "@openrouter/ai-sdk-provider": "0.7.3",
         "@requesty/ai-sdk": "0.0.9",
         "ai": "4.3.19",
         "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"
     },
     "devDependencies": {
-        "@biomejs/biome": "2.1.1",
-        "@eslint/eslintrc": "3.3.1",
-        "@eslint/js": "9.31.0",
+        "@biomejs/biome": "2.1.2",
         "@johnowennixon/add-shebangs": "1.1.0",
         "@johnowennixon/chmodx": "2.0.0",
-        "@stylistic/eslint-plugin": "5.2.0",
+        "@johnowennixon/pipe-exit": "1.0.1",
         "@types/argparse": "2.0.17",
-        "@types/node": "24.0.14",
-        "@typescript-eslint/eslint-plugin": "8.37.0",
-        "@typescript-eslint/parser": "8.37.0",
-        "eslint": "9.31.0",
-        "eslint-import-resolver-typescript": "4.4.4",
-        "eslint-plugin-import-x": "4.16.1",
-        "eslint-plugin-sonarjs": "3.0.4",
-        "eslint-plugin-unicorn": "59.0.1",
-        "globals": "16.3.0",
-        "knip": "5.61.3",
+        "@types/node": "24.1.0",
+        "knip": "5.62.0",
         "markdownlint-cli2": "0.18.1",
         "npm-run-all2": "8.0.4",
-        "oxlint": "1.7.0",
+        "oxlint": "1.8.0",
+        "oxlint-tsgolint": "0.0.0-8",
         "rimraf": "6.0.1",
-        "typescript": "5.8.3",
-        "typescript-eslint": "8.37.0"
+        "typescript": "5.8.3"
     }
 }

package/dist/src/lib_abort.js

@@ -1,7 +1,7 @@
 import { ansi_red, ansi_yellow } from "./lib_ansi.js";
 import { stdio_write_stderr_linefeed } from "./lib_stdio_write.js";
-export function abort_exit() {
-    process.exit(1);
+export function abort_exit(exitcode = 1) {
+    process.exit(exitcode);
 }
 export function abort_with_warning(message) {
     if (process.stdout.isTTY) {

package/dist/src/lib_assert_type.js

@@ -0,0 +1,30 @@
+import { abort_with_error } from "./lib_abort.js";
+import { type_guard_is_boolean, type_guard_is_number, type_guard_is_object, type_guard_is_string, } from "./lib_type_guard.js";
+export function assert_type_boolean(value) {
+    if (type_guard_is_boolean(value)) {
+        return value;
+    }
+    console.error(value);
+    return abort_with_error("Assertion failed: value is not a boolean");
+}
+export function assert_type_number(value) {
+    if (type_guard_is_number(value)) {
+        return value;
+    }
+    console.error(value);
+    return abort_with_error("Assertion failed: value is not a number");
+}
+export function assert_type_string(value) {
+    if (type_guard_is_string(value)) {
+        return value;
+    }
+    console.error(value);
+    return abort_with_error("Assertion failed: value is not a string");
+}
+export function assert_type_object(value) {
+    if (type_guard_is_object(value)) {
+        return value;
+    }
+    console.error(value);
+    return abort_with_error("Assertion failed: value is not an object");
+}

package/dist/src/lib_char_smart.js

@@ -0,0 +1,4 @@
+export const LEFT_DOUBLE_QUOTATION_MARK = "“";
+export const LEFT_SINGLE_QUOTATION_MARK = "‘";
+export const RIGHT_DOUBLE_QUOTATION_MARK = "”";
+export const RIGHT_SINGLE_QUOTATION_MARK = "’";

package/dist/src/lib_debug.js

@@ -22,6 +22,7 @@ export const debug_channels = {
     lines: false,
     llm_inputs: false,
     llm_outputs: false,
+    llm_prompts: false,
     llm_tokens: false,
     llm_tools: false,
     node: false,

package/dist/src/lib_diffdash_cli.js

@@ -26,10 +26,12 @@ const diffdash_cli_schema = {
     llm_excludes: cli_string({ help: "models to exclude from comparison (comma separated)", metavar: "MODELS" }),
     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_inputs: cli_boolean({ help: "debug inputs (including all prompts) sent to the LLM" }),
-    debug_llm_outputs: cli_boolean({ help: "debug outputs received from the LLM" }),
+    debug_llm_prompts: cli_boolean({ help: "debug prompts sent to the LLM" }),
+    debug_llm_inputs: cli_boolean({ help: "debug inputs object sent to the LLM" }),
+    debug_llm_outputs: cli_boolean({ help: "debug outputs object received from the LLM" }),
 };
 export const diffdash_cli_parser = cli_make_parser({
     cli_schema: diffdash_cli_schema,
     description: "DiffDash - generate Git commit messages using AI",
 });
+export const diffdash_cli_parsed_args = diffdash_cli_parser.parsed_args;

package/dist/src/lib_diffdash_config.js

@@ -1,13 +1,39 @@
+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_parser } from "./lib_diffdash_cli.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 { 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";
 import { llm_config_get, llm_config_get_all } from "./lib_llm_config.js";
 import { llm_list_models } from "./lib_llm_list.js";
 import { PACKAGE_NAME, PACKAGE_VERSION } from "./lib_package.js";
 import { tell_plain } from "./lib_tell.js";
+import { tui_quote_smart_single } from "./lib_tui_quote.js";
+const diffdash_config_file_schema = z
+    .object({
+    extra_prompts: z.string().array().optional(),
+})
+    .strict();
+function diffdash_config_file_read(config) {
+    const config_file_name = ".diffdash.json5";
+    if (!file_is_file(config_file_name)) {
+        return;
+    }
+    const config_content = file_io_read_text(config_file_name);
+    const parsed_json = json5_parse(config_content);
+    const validation_result = diffdash_config_file_schema.safeParse(parsed_json);
+    if (!validation_result.success) {
+        abort_with_error(`Unable to parse DiffDash config file: ${tui_quote_smart_single(config_file_name)}`);
+    }
+    const data = validation_result.data;
+    if (data.extra_prompts) {
+        config.extra_prompts = data.extra_prompts;
+    }
+}
 export function diffdash_config_get() {
-    const pa = diffdash_cli_parser.parsed_args;
-    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_inputs, debug_llm_outputs, } = pa;
+    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;
     if (version) {
         tell_plain(`${PACKAGE_NAME} v${PACKAGE_VERSION}`);
         process.exit(0);
@@ -27,6 +53,7 @@ export function diffdash_config_get() {
         llm_router,
         llm_excludes,
     });
+    debug_channels.llm_prompts = debug_llm_prompts;
     debug_channels.llm_inputs = debug_llm_inputs;
     debug_channels.llm_outputs = debug_llm_outputs;
     const config = {
@@ -47,7 +74,9 @@ export function diffdash_config_get() {
         all_llm_configs,
         just_output,
         silent,
+        extra_prompts: undefined,
     };
+    diffdash_config_file_read(config);
     debug_inspect_when(debug_channels.config, config, "config");
     return config;
 }

package/dist/src/lib_diffdash_llm.js

@@ -20,6 +20,6 @@ const model_name_options = [
     "qwen3-235b-a22b",
 ];
 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(diffdash_llm_model_details);
+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

@@ -90,24 +90,21 @@ async function phase_compare({ config, git }) {
     if (!silent) {
         tell_action("Generating Git commit messages using all models in parallel");
     }
-    const { all_llm_configs, add_prefix, add_suffix } = config;
+    const { all_llm_configs, add_prefix, add_suffix, extra_prompts } = config;
     const diffstat = await git_simple_staging_get_staged_diffstat(git);
     const diff = await git_simple_staging_get_staged_diff(git);
-    const inputs = { diffstat, diff };
+    const inputs = { diffstat, diff, extra_prompts };
     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) {
         const { llm_config, seconds, error_text } = result;
-        let { git_message } = result;
-        const model_via = llm_config_get_model_via(llm_config);
-        if (error_text) {
+        const model_via = llm_config_get_model_via({ llm_config });
+        if (error_text !== null) {
             tell_warning(`Failed to generate a commit message in ${seconds} seconds using ${model_via}: ${error_text}`);
             continue;
         }
-        if (!git_message) {
-            continue;
-        }
         tell_info(`Git commit message in ${seconds} seconds using ${model_via}:`);
+        let { git_message } = result;
         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 });
@@ -116,20 +113,20 @@ async function phase_compare({ config, git }) {
     }
 }
 async function phase_generate({ config, git }) {
-    const { disable_preview, add_prefix, add_suffix, llm_config, just_output, silent } = config;
-    const model_via = llm_config_get_model_via(llm_config);
+    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 });
     if (!silent && !just_output) {
         tell_action(`Generating the Git commit message using ${model_via}`);
     }
     const diffstat = await git_simple_staging_get_staged_diffstat(git);
     const diff = await git_simple_staging_get_staged_diff(git);
-    const inputs = { diffstat, diff };
+    const inputs = { diffstat, diff, extra_prompts };
     const result = await git_message_generate_result({ llm_config, inputs });
     const { error_text } = result;
-    let { git_message } = result;
-    if (error_text || git_message === null) {
+    if (error_text !== null) {
         abort_with_error(`Failed to generate a commit message using ${model_via}: ${error_text}`);
     }
+    let { git_message } = result;
     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 });

package/dist/src/lib_file_io.js

@@ -0,0 +1,13 @@
+import fs from "node:fs";
+export function file_io_read_binary(file_path) {
+    return fs.readFileSync(file_path);
+}
+export function file_io_read_text(file_path) {
+    return fs.readFileSync(file_path, { encoding: "utf8" });
+}
+export function file_io_write_binary({ file_path, data }) {
+    fs.writeFileSync(file_path, data);
+}
+export function file_io_write_text({ file_path, text }) {
+    fs.writeFileSync(file_path, text, { encoding: "utf8" });
+}

package/dist/src/lib_file_is.js

@@ -0,0 +1,34 @@
+import fs from "node:fs";
+export function file_is_dir(dir_path) {
+    try {
+        return fs.statSync(dir_path).isDirectory();
+    }
+    catch {
+        return false;
+    }
+}
+export function file_is_file(file_path) {
+    try {
+        return fs.statSync(file_path).isFile();
+    }
+    catch {
+        return false;
+    }
+}
+export function file_is_socket(file_path) {
+    try {
+        return fs.statSync(file_path).isSocket();
+    }
+    catch {
+        return false;
+    }
+}
+export function file_is_executable(file_path) {
+    try {
+        fs.accessSync(file_path, fs.constants.X_OK);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}

package/dist/src/lib_git_message_generate.js

@@ -21,7 +21,7 @@ async function git_message_generate_structured({ llm_config, system_prompt, user
 }
 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 });
+    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;

package/dist/src/lib_git_message_prompt.js

@@ -1,34 +1,35 @@
 import { LF } from "./lib_char_control.js";
 import { EMPTY } from "./lib_char_empty.js";
+const LF_LF = LF + LF;
 const portion_role = `
 Your role is to generate a Git commit message in conversational English.
 The user does not want Conventional Commits - the summary line must be a normal sentence.
-`.trim() + LF;
+`.trim() + LF_LF;
 const portion_inputs = `
 The user will send you a <diffstat> block, the output of a 'git diff --staged --stat' command.
 The user will send you a <diff> block, the output of a 'git diff --staged' command.
-`.trim() + LF;
+`.trim() + LF_LF;
 const portion_reminders = `
 Some reminders of how diffs work:
 - Lines that start with a single plus sign have been added to the file.
 - Lines that start with a single minus sign have been removed from the file.
 - Lines that start with @@ indicate a jump to a different section of the file - you can not see the code in these gaps.
-`.trim() + LF;
+`.trim() + LF_LF;
 const portion_format_structured = `
 You must output in the following format (this will be forced):
 - summary_line: a single sentence giving a concise summary of the changes.
 - extra_lines: additional sentences giving more information about the changes.
-`.trim() + LF;
+`.trim() + LF_LF;
 const portion_format_unstructured = `
 You must output in the following format - without any preamble or conclusion:
 - First line: a single sentence giving a concise summary of the changes.
 - Second line: completely blank - not even any spaces.
 - Then an unordered list (with a dash prefix) of additional sentences giving more information about the changes.
 - And nothing else.
-`.trim() + LF;
-function portion_format(has_structured_json) {
+`.trim() + LF_LF;
+const portion_format = (has_structured_json) => {
     return has_structured_json ? portion_format_structured : portion_format_unstructured;
-}
+};
 const portion_instructions = `
 Use the imperative mood and present tense.
 Please write in full sentences that start with a capital letter.
@@ -42,19 +43,23 @@ Don't assume the change is always an improvement - it might be making things wor
 The number of additional sentences should depend upon the complexity of the change.
 A simple change needs only two additional sentences scaling up to a complex change with five additional sentences.
 If there are a lot of changes, you will need to summarize even more.
-`.trim() + LF;
+`.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;
+};
 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;
-export function git_message_get_system_prompt({ has_structured_json }) {
+`.trim() + LF_LF;
+export function git_message_get_system_prompt({ has_structured_json, inputs, }) {
     let system_prompt = EMPTY;
-    system_prompt += portion_role + LF;
-    system_prompt += portion_inputs + LF;
-    system_prompt += portion_reminders + LF;
-    system_prompt += portion_format(has_structured_json) + LF;
-    system_prompt += portion_instructions + LF;
-    system_prompt += portion_final + LF;
+    system_prompt += portion_role;
+    system_prompt += portion_inputs;
+    system_prompt += portion_reminders;
+    system_prompt += portion_format(has_structured_json);
+    system_prompt += portion_instructions;
+    system_prompt += portion_extra(inputs.extra_prompts);
+    system_prompt += portion_final;
     return system_prompt.trim();
 }
 export function git_message_get_user_prompt({ has_structured_json, inputs, max_length, }) {
@@ -62,11 +67,11 @@ export function git_message_get_user_prompt({ has_structured_json, inputs, max_l
     const truncate = diffstat.length + diff.length > max_length;
     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;
-    user_prompt += "<diff>" + LF + diff_truncated + "</diff>" + LF + LF;
+    user_prompt += "<diffstat>" + LF + diffstat + "</diffstat>" + LF_LF;
+    user_prompt += "<diff>" + LF + diff_truncated + "</diff>" + LF_LF;
     if (truncate) {
-        user_prompt += "Please note: the Diff above has been truncated" + LF + LF;
+        user_prompt += "Please note: the Diff above has been truncated" + LF_LF;
     }
-    user_prompt += portion_format(has_structured_json) + LF;
+    user_prompt += portion_format(has_structured_json);
     return user_prompt.trim();
 }

package/dist/src/lib_json5.js

@@ -0,0 +1,4 @@
+import JSON5 from "json5";
+export function json5_parse(text) {
+    return JSON5.parse(text);
+}

package/dist/src/lib_llm_access.js

@@ -1,8 +1,13 @@
 import { abort_with_error } from "./lib_abort.js";
 import { COMMA } from "./lib_char_punctuation.js";
+import { llm_api_get_api_key, llm_api_get_api_key_env } from "./lib_llm_api.js";
 import { llm_model_find_detail } from "./lib_llm_model.js";
-import { llm_provider_get_api_key, llm_provider_get_api_key_env } from "./lib_llm_provider.js";
-export function llm_access_available({ llm_model_details, llm_model_name, llm_excludes, }) {
+export function llm_access_available({ llm_model_details, llm_model_name, llm_include, llm_excludes, }) {
+    if (llm_include) {
+        if (!llm_model_name.includes(llm_include)) {
+            return false;
+        }
+    }
     if (llm_excludes) {
         const llm_excludes_array = llm_excludes.split(COMMA).map((exclude) => exclude.trim());
         for (const llm_exclude of llm_excludes_array) {
@@ -12,19 +17,19 @@ export function llm_access_available({ llm_model_details, llm_model_name, llm_ex
         }
     }
     const detail = llm_model_find_detail({ llm_model_details, llm_model_name });
-    const { llm_provider, llm_model_code_direct, llm_model_code_requesty, llm_model_code_openrouter } = detail;
-    if (llm_model_code_direct !== null && llm_provider !== null) {
-        if (llm_provider_get_api_key(llm_provider)) {
+    const { llm_api_code, llm_model_code_direct, llm_model_code_requesty, llm_model_code_openrouter } = detail;
+    if (llm_model_code_direct !== null && llm_api_code !== null) {
+        if (llm_api_get_api_key(llm_api_code)) {
             return true;
         }
     }
     if (llm_model_code_openrouter !== null) {
-        if (llm_provider_get_api_key("openrouter")) {
+        if (llm_api_get_api_key("openrouter")) {
             return true;
         }
     }
     if (llm_model_code_requesty !== null) {
-        if (llm_provider_get_api_key("requesty")) {
+        if (llm_api_get_api_key("requesty")) {
             return true;
         }
     }
@@ -32,38 +37,38 @@ export function llm_access_available({ llm_model_details, llm_model_name, llm_ex
 }
 export function llm_access_get({ llm_model_details, llm_model_name, llm_router, }) {
     const detail = llm_model_find_detail({ llm_model_details, llm_model_name });
-    const { llm_provider, llm_model_code_direct, llm_model_code_requesty, llm_model_code_openrouter } = detail;
+    const { llm_api_code, llm_model_code_direct, llm_model_code_requesty, llm_model_code_openrouter } = detail;
     if (!llm_router) {
-        if (llm_model_code_direct !== null && llm_provider !== null) {
-            const llm_api_key = llm_provider_get_api_key(llm_provider);
+        if (llm_model_code_direct !== null && llm_api_code !== null) {
+            const llm_api_key = llm_api_get_api_key(llm_api_code);
             if (llm_api_key) {
-                return { llm_model_code: llm_model_code_direct, llm_provider, llm_api_key };
+                return { llm_model_code: llm_model_code_direct, llm_api_code, llm_api_key };
             }
         }
     }
     if (llm_model_code_openrouter !== null) {
-        const llm_api_key = llm_provider_get_api_key("openrouter");
+        const llm_api_key = llm_api_get_api_key("openrouter");
         if (llm_api_key) {
-            return { llm_model_code: llm_model_code_openrouter, llm_provider: "openrouter", llm_api_key };
+            return { llm_model_code: llm_model_code_openrouter, llm_api_code: "openrouter", llm_api_key };
         }
     }
     if (llm_model_code_requesty !== null) {
-        const llm_api_key = llm_provider_get_api_key("requesty");
+        const llm_api_key = llm_api_get_api_key("requesty");
         if (llm_api_key) {
-            return { llm_model_code: llm_model_code_requesty, llm_provider: "requesty", llm_api_key };
+            return { llm_model_code: llm_model_code_requesty, llm_api_code: "requesty", llm_api_key };
         }
     }
-    if (llm_model_code_direct !== null && llm_provider !== null) {
-        const llm_api_key = llm_provider_get_api_key(llm_provider);
+    if (llm_model_code_direct !== null && llm_api_code !== null) {
+        const llm_api_key = llm_api_get_api_key(llm_api_code);
         if (llm_api_key) {
-            return { llm_model_code: llm_model_code_direct, llm_provider, llm_api_key };
+            return { llm_model_code: llm_model_code_direct, llm_api_code, llm_api_key };
         }
     }
-    const env_openrouter = llm_provider_get_api_key_env("openrouter");
-    const env_requesty = llm_provider_get_api_key_env("requesty");
-    if (llm_provider !== null) {
-        const env_provider = llm_provider_get_api_key_env(llm_provider);
-        abort_with_error(`Please set environment variable ${env_provider}, ${env_openrouter} or ${env_requesty}`);
+    const env_openrouter = llm_api_get_api_key_env("openrouter");
+    const env_requesty = llm_api_get_api_key_env("requesty");
+    if (llm_api_code !== null) {
+        const env_direct = llm_api_get_api_key_env(llm_api_code);
+        abort_with_error(`Please set environment variable ${env_direct}, ${env_openrouter} or ${env_requesty}`);
     }
     abort_with_error(`Please set environment variable ${env_openrouter} or ${env_requesty}`);
 }

package/dist/src/{lib_llm_provider.js → lib_llm_api.js}

@@ -5,9 +5,11 @@ import { createOpenAI } from "@ai-sdk/openai";
 import { createOpenRouter } from "@openrouter/ai-sdk-provider";
 import { createRequesty } from "@requesty/ai-sdk";
 import { abort_with_error } from "./lib_abort.js";
+import { assert_type_string } from "./lib_assert_type.js";
+import { AT_SIGN } from "./lib_char_punctuation.js";
 import { env_get } from "./lib_env.js";
-export function llm_provider_get_via(llm_provider) {
-    switch (llm_provider) {
+export function llm_api_get_via(llm_api_code) {
+    switch (llm_api_code) {
         case "anthropic":
         case "deepseek":
         case "google":
@@ -18,11 +20,11 @@ export function llm_provider_get_via(llm_provider) {
         case "openrouter":
             return "via OpenRouter";
         default:
-            abort_with_error("Unknown LLM provider");
+            abort_with_error("Unknown LLM API");
     }
 }
-export function llm_provider_get_api_key_env(llm_provider) {
-    switch (llm_provider) {
+export function llm_api_get_api_key_env(llm_api_code) {
+    switch (llm_api_code) {
         case "anthropic":
             return "ANTHROPIC_API_KEY";
         case "deepseek":
@@ -36,15 +38,15 @@ export function llm_provider_get_api_key_env(llm_provider) {
         case "openrouter":
             return "OPENROUTER_API_KEY";
         default:
-            abort_with_error("Unknown LLM provider");
+            abort_with_error("Unknown LLM API");
     }
 }
-export function llm_provider_get_api_key(llm_provider) {
-    const env = llm_provider_get_api_key_env(llm_provider);
+export function llm_api_get_api_key(llm_api_code) {
+    const env = llm_api_get_api_key_env(llm_api_code);
     return env_get(env);
 }
-export function llm_provider_get_ai_sdk_language_model({ llm_model_code, llm_provider, llm_api_key, }) {
-    switch (llm_provider) {
+export function llm_api_get_ai_sdk_language_model({ llm_model_code, llm_api_code, llm_api_key, }) {
+    switch (llm_api_code) {
         case "anthropic":
             return createAnthropic({ apiKey: llm_api_key })(llm_model_code);
         case "deepseek":
@@ -55,9 +57,23 @@ export function llm_provider_get_ai_sdk_language_model({ llm_model_code, llm_pro
             return createOpenAI({ apiKey: llm_api_key })(llm_model_code);
         case "requesty":
             return createRequesty({ apiKey: llm_api_key })(llm_model_code);
-        case "openrouter":
-            return createOpenRouter({ apiKey: llm_api_key })(llm_model_code);
+        case "openrouter": {
+            const openrouter = createOpenRouter({ apiKey: llm_api_key });
+            if (llm_model_code.includes(AT_SIGN)) {
+                const splits = llm_model_code.split(AT_SIGN);
+                const model_id = assert_type_string(splits[0]);
+                const provider = assert_type_string(splits[1]);
+                return openrouter(model_id, {
+                    extraBody: {
+                        provider: {
+                            only: [provider],
+                        },
+                    },
+                });
+            }
+            return openrouter(llm_model_code);
+        }
         default:
-            abort_with_error("Unknown LLM provider");
+            abort_with_error("Unknown LLM API");
     }
 }