@johnowennixon/diffdash 1.6.1 → 1.8.0

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_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_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,18 @@
 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, }) {
+    const detail = llm_model_find_detail({ llm_model_details, llm_model_name });
+    const { llm_api_code } = detail;
+    if (llm_api_get_api_key(llm_api_code) === null) {
+        return false;
+    }
+    if (llm_include) {
+        if (!(llm_model_name.includes(llm_include) || llm_include === llm_api_code)) {
+            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) {
@@ -11,59 +21,15 @@ 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)) {
-            return true;
-        }
-    }
-    if (llm_model_code_openrouter !== null) {
-        if (llm_provider_get_api_key("openrouter")) {
-            return true;
-        }
-    }
-    if (llm_model_code_requesty !== null) {
-        if (llm_provider_get_api_key("requesty")) {
-            return true;
-        }
-    }
-    return false;
+    return true;
 }
-export function llm_access_get({ llm_model_details, llm_model_name, llm_router, }) {
+export function llm_access_get({ llm_model_details, llm_model_name, }) {
     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_router) {
-        if (llm_model_code_direct !== null && llm_provider !== null) {
-            const llm_api_key = llm_provider_get_api_key(llm_provider);
-            if (llm_api_key) {
-                return { llm_model_code: llm_model_code_direct, llm_provider, llm_api_key };
-            }
-        }
-    }
-    if (llm_model_code_openrouter !== null) {
-        const llm_api_key = llm_provider_get_api_key("openrouter");
-        if (llm_api_key) {
-            return { llm_model_code: llm_model_code_openrouter, llm_provider: "openrouter", llm_api_key };
-        }
-    }
-    if (llm_model_code_requesty !== null) {
-        const llm_api_key = llm_provider_get_api_key("requesty");
-        if (llm_api_key) {
-            return { llm_model_code: llm_model_code_requesty, llm_provider: "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_api_key) {
-            return { llm_model_code: llm_model_code_direct, llm_provider, 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 { llm_api_code, llm_model_code } = detail;
+    const llm_api_key = llm_api_get_api_key(llm_api_code);
+    if (!llm_api_key) {
+        const env_name = llm_api_get_api_key_env(llm_api_code);
+        abort_with_error(`Please set environment variable ${env_name}`);
     }
-    abort_with_error(`Please set environment variable ${env_openrouter} or ${env_requesty}`);
+    return { llm_model_code, llm_api_code, llm_api_key };
 }

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

@@ -3,26 +3,10 @@ import { createDeepSeek } from "@ai-sdk/deepseek";
 import { createGoogleGenerativeAI } from "@ai-sdk/google";
 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 { env_get } from "./lib_env.js";
-export function llm_provider_get_via(llm_provider) {
-    switch (llm_provider) {
-        case "anthropic":
-        case "deepseek":
-        case "google":
-        case "openai":
-            return "direct";
-        case "requesty":
-            return "via Requesty";
-        case "openrouter":
-            return "via OpenRouter";
-        default:
-            abort_with_error("Unknown LLM provider");
-    }
-}
-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":
@@ -31,20 +15,19 @@ export function llm_provider_get_api_key_env(llm_provider) {
             return "GEMINI_API_KEY";
         case "openai":
             return "OPENAI_API_KEY";
-        case "requesty":
-            return "REQUESTY_API_KEY";
         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) {
+// eslint-disable-next-line sonarjs/function-return-type
+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":
@@ -53,11 +36,10 @@ export function llm_provider_get_ai_sdk_language_model({ llm_model_code, llm_pro
             return createGoogleGenerativeAI({ apiKey: llm_api_key })(llm_model_code);
         case "openai":
             return createOpenAI({ apiKey: llm_api_key })(llm_model_code);
-        case "requesty":
-            return createRequesty({ apiKey: llm_api_key })(llm_model_code);
-        case "openrouter":
+        case "openrouter": {
             return createOpenRouter({ apiKey: llm_api_key })(llm_model_code);
+        }
         default:
-            abort_with_error("Unknown LLM provider");
+            abort_with_error("Unknown LLM API");
     }
 }

package/dist/src/lib_llm_chat.js

@@ -1,66 +1,104 @@
-import { generateObject, generateText } from "ai";
+import { generateObject, generateText, stepCountIs } from "ai";
 import { debug_channels, debug_inspect_when } from "./lib_debug.js";
+import { Duration } from "./lib_duration.js";
 import { env_get_empty, env_get_substitute } from "./lib_env.js";
-import { llm_provider_get_ai_sdk_language_model } from "./lib_llm_provider.js";
-import { parse_float_or_undefined, parse_int, parse_int_or_undefined } from "./lib_parse_number.js";
+import { error_get_text } from "./lib_error.js";
+import { llm_api_get_ai_sdk_language_model } from "./lib_llm_api.js";
+import { parse_int, parse_int_or_undefined } from "./lib_parse_number.js";
+import { tell_debug } from "./lib_tell.js";
+import { tui_block_string } from "./lib_tui_block.js";
 function llm_chat_get_parameters() {
     return {
-        max_tokens: parse_int_or_undefined(env_get_empty("lib_llm_chat_max_tokens")),
-        temperature: parse_float_or_undefined(env_get_substitute("lib_llm_chat_temperature", "0.6")),
+        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")),
     };
 }
-export async function llm_chat_generate_text({ llm_config, headers, system_prompt, user_prompt, tools, max_steps, min_steps, }) {
-    const { llm_model_name, llm_provider, llm_model_code, llm_api_key } = llm_config;
-    const ai_sdk_language_model = llm_provider_get_ai_sdk_language_model({
+function llm_chat_debug_prompts({ llm_model_name, system_prompt, user_prompt, }) {
+    if (debug_channels.llm_prompts) {
+        const teller = tell_debug;
+        if (system_prompt) {
+            tui_block_string({ teller, title: `LLM system prompt (for ${llm_model_name}):`, content: system_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, }) {
+    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({
         llm_model_code,
-        llm_provider,
+        llm_api_code,
         llm_api_key,
     });
-    const { max_tokens, temperature, timeout } = llm_chat_get_parameters();
+    const { recommended_temperature, provider_options } = llm_model_detail;
+    const temperature = recommended_temperature;
+    const { max_output_tokens, timeout } = llm_chat_get_parameters();
     const llm_inputs = {
         model: ai_sdk_language_model,
         system: system_prompt,
         prompt: user_prompt,
         tools,
-        headers,
-        maxSteps: max_steps,
-        maxTokens: max_tokens,
+        stopWhen: max_steps === undefined ? undefined : stepCountIs(max_steps),
+        maxOutputTokens: max_output_tokens,
         temperature,
+        providerOptions: provider_options,
         abortSignal: AbortSignal.timeout(timeout * 1000),
     };
-    debug_inspect_when(debug_channels.llm_inputs, llm_inputs, `llm_inputs (for ${llm_model_name})`);
+    debug_inspect_when(debug_channels.llm_inputs, llm_inputs, `LLM inputs object (for ${llm_model_name})`);
     // This is liable to throw an error
     const llm_outputs = await generateText(llm_inputs);
-    debug_inspect_when(debug_channels.llm_outputs, llm_outputs, `llm_outputs (for ${llm_model_name})`);
+    debug_inspect_when(debug_channels.llm_outputs, llm_outputs, `LLM outputs object (for ${llm_model_name})`);
     if (min_steps !== undefined && llm_outputs.steps.length < min_steps) {
         throw new Error("Too few steps taken");
     }
     if (max_steps !== undefined && llm_outputs.steps.length === max_steps) {
         throw new Error("Too many steps taken");
     }
-    return llm_outputs.text;
+    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, }) {
+    const duration = new Duration();
+    duration.start();
+    try {
+        const outputs = await llm_chat_generate_text({ llm_config, system_prompt, user_prompt });
+        duration.stop();
+        const seconds = duration.seconds_rounded();
+        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, error_text, outputs: null };
+    }
 }
 export async function llm_chat_generate_object({ llm_config, user_prompt, system_prompt, schema, }) {
-    const { llm_model_name, llm_provider, llm_model_code, llm_api_key } = llm_config;
-    const ai_sdk_language_model = llm_provider_get_ai_sdk_language_model({
+    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({
         llm_model_code,
-        llm_provider,
+        llm_api_code,
         llm_api_key,
     });
-    const { max_tokens, temperature, timeout } = llm_chat_get_parameters();
+    const { recommended_temperature, provider_options } = llm_model_detail;
+    const temperature = recommended_temperature;
+    const { max_output_tokens, timeout } = llm_chat_get_parameters();
     const llm_inputs = {
         model: ai_sdk_language_model,
         system: system_prompt,
         prompt: user_prompt,
+        output: "object",
         schema,
-        maxTokens: max_tokens,
+        maxOutputTokens: max_output_tokens,
         temperature,
+        providerOptions: provider_options,
         abortSignal: AbortSignal.timeout(timeout * 1000),
     };
-    debug_inspect_when(debug_channels.llm_inputs, llm_inputs, `llm_inputs (for ${llm_model_name})`);
+    debug_inspect_when(debug_channels.llm_inputs, llm_inputs, `LLM inputs object (for ${llm_model_name})`);
     // This is liable to throw an error
     const llm_outputs = await generateObject(llm_inputs);
-    debug_inspect_when(debug_channels.llm_outputs, llm_outputs, `llm_outputs (for ${llm_model_name})`);
-    return llm_outputs.object;
+    debug_inspect_when(debug_channels.llm_outputs, llm_outputs, `LLM outputs object (for ${llm_model_name})`);
+    const { object: generated_object, usage: total_usage, providerMetadata: provider_metadata } = llm_outputs;
+    return { generated_object, total_usage, provider_metadata };
 }

package/dist/src/lib_llm_config.js

@@ -1,23 +1,13 @@
 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 { llm_provider_get_via } from "./lib_llm_provider.js";
-import { tell_info } from "./lib_tell.js";
-export function llm_config_get({ llm_model_details, llm_model_name, llm_router, }) {
+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, llm_router });
-    const { llm_model_code, llm_provider, llm_api_key } = access;
-    return { llm_model_name, llm_model_detail, llm_model_code, llm_provider, llm_api_key };
-}
-export function llm_config_get_all({ llm_model_details, llm_router, llm_excludes, }) {
-    const choices = llm_model_get_choices(llm_model_details);
-    const available = choices.filter((llm_model_name) => llm_access_available({ llm_model_details, llm_model_name, llm_excludes }));
-    return available.map((llm_model_name) => llm_config_get({ llm_model_details, llm_model_name, llm_router }));
-}
-export function llm_config_get_model_via(llm_config) {
-    const { llm_model_name, llm_provider } = llm_config;
-    return `${llm_model_name} (${llm_provider_get_via(llm_provider)})`;
-}
-export function llm_config_show(llm_config) {
-    const model_via = llm_config_get_model_via(llm_config);
-    tell_info(`Using LLM ${model_via}`);
+    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 };
+}
+export function llm_config_get_all({ llm_model_details, llm_include, llm_excludes, }) {
+    const choices = llm_model_get_choices({ llm_model_details });
+    const available = choices.filter((llm_model_name) => llm_access_available({ llm_model_details, llm_model_name, llm_include, llm_excludes }));
+    return available.map((llm_model_name) => llm_config_get({ llm_model_details, llm_model_name }));
 }

package/dist/src/lib_llm_list.js

@@ -1,21 +1,23 @@
 import { DOLLAR } from "./lib_char_punctuation.js";
 import { stdio_write_stdout_linefeed } from "./lib_stdio_write.js";
 import { tell_info, tell_warning } from "./lib_tell.js";
-import { tui_justify_right } from "./lib_tui_justify.js";
 import { TuiTable } from "./lib_tui_table.js";
 export function llm_list_models({ llm_model_details }) {
-    const headings = ["NAME", "CONTEXT", "INPUT", "OUTPUT"];
-    const table = new TuiTable({ headings });
+    const headings = ["NAME", "API", "CONTEXT", "INPUT", "OUTPUT", "REASONING"];
+    const alignments = ["left", "left", "right", "right", "right", "left"];
+    const table = new TuiTable({ headings, alignments });
     for (const detail of llm_model_details) {
-        const { llm_model_name, context_window, cents_input, cents_output } = detail;
+        const { llm_model_name, llm_api_code, context_window, cents_input, cents_output, default_reasoning } = detail;
         const tui_name = llm_model_name;
-        const tui_context = tui_justify_right(7, context_window.toString());
-        const tui_input = tui_justify_right(6, DOLLAR + (cents_input / 100).toFixed(2));
-        const tui_output = tui_justify_right(6, DOLLAR + (cents_output / 100).toFixed(2));
-        const row = [tui_name, tui_context, tui_input, tui_output];
+        const tui_api = llm_api_code;
+        const tui_context = context_window.toString();
+        const tui_input = DOLLAR + (cents_input / 100).toFixed(2);
+        const tui_output = DOLLAR + (cents_output / 100).toFixed(2);
+        const tui_reasoning = default_reasoning ? "True" : "False";
+        const row = [tui_name, tui_api, tui_context, tui_input, tui_output, tui_reasoning];
         table.push(row);
     }
     stdio_write_stdout_linefeed(table.toString());
     tell_info("Prices are per million tokens.");
-    tell_warning("Prices are best effort and are liable to change - always double-check with your LLM provider.");
+    tell_warning("Prices are best effort and are liable to change - always double-check with your LLM API provider.");
 }