ollama_chat 0.0.117 → 0.0.119

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbe0a034dee8079ea14e573b0e98624ebaa3311baaf60e1bd666d7f7b0d61dda
-  data.tar.gz: 2a2b0c1b00ce5db2fa4b20660d8cda86669f1bac50e62352a07953e0c327d863
+  metadata.gz: a7b876b681130c1ff2ec672460bb04aa85ed095e9358dbdaa62d744f82d68720
+  data.tar.gz: 3f85175d15231880d45e8f192f9f9af47c861cb8f1475d2fe653309ca173ab1c
 SHA512:
-  metadata.gz: f187ae33f48c198b1aa15d680b5d7dd45e96c8ba7bcb71bf80adf5d0cb049a766d79d57d8bad32175363c490cfe94a94908b1eba4a1ba28a8b0e9896065079ed
-  data.tar.gz: 0d61b926d6e7018d5f21d52ed06d36e81ea859dc5f288a0247834def14245813f1306bf444baaf715c8ec37df20ea64d97f03279045e34eb669a29c9facadb23
+  metadata.gz: 9cf60761b6ce28cb22873b30808d3398ffcefc9e9991fcf781621b4db8a8fed5fd6cca21de046d8bf2851dd60a7529cfa162125ca4ee567e32c09042f4dc4e81
+  data.tar.gz: a2f1e6210141a8f00c4b9428453c49e4e1673e51521f788dcec694cd2c2c9963542bd491618ec8d1a4bb3ad5788588ca3d2c7f51ed3b67b977eaac1b4a59115a

data/CHANGES.md

@@ -1,5 +1,102 @@
 # Changes
 
+## 2026-09-14 v0.0.119
+
+*   **Word-boundary fuzzy matching in chooser**
+    *   Pass `/\b/` as the word-boundary argument to `matcher.similar` in
+        `chooser.rb` to filter out partial-word hits, improving ranked results
+        for model names containing `/`, `-`, `:`, and `.` separators.
+
+*   **Parallel embedding via bounded thread pool**
+    *   Add `concurrency: 3` under `embedding:` in `default_config.yml`.
+    *   Add `bulk_embed_sources` to `source_fetching.rb` using a
+        `Tins::Limited` bounded thread pool with a `Mutex`-guarded results
+        array.
+    *   Change `embed` to accept a `prompt:` kwarg (defaults to
+        `prompt(:embed)`) so worker threads share a single resolved template
+        instead of each hitting Sequel/SQLite.
+    *   Replace `STDOUT.puts` with `infobar.puts` in `embed_source` to prevent
+        raw output from clobbering the progress bar in concurrent workers.
+    *   Rewrite the `-p` pattern path in `commands.rb` embedding to build a
+        `{source => tags}` Hash and call `bulk_embed_sources`.
+    *   Rewrite `update_collection` in `rag_handling.rb` to collect both
+        modified and new sources into a single Hash and issue one
+        `bulk_embed_sources` call instead of a sequential `embed` loop.
+    *   Update `commands_spec.rb` to stub `bulk_embed_sources` returning an
+        array.
+
+*   **Speed up embedding generation**
+    *   Implement batch processing in the ollama server.
+
+*   **Dependency updates**
+    *   Update `documentrix` minimum version to **0.7.0** in `Rakefile` and
+        `ollama_chat.gemspec` to support improved embedding speed.
+
+*   **Improve session switching and duplication robustness**
+    *   In `duplicate_session`, replaced defensive `session.lock?` check with a
+        direct `session.lock` call, since a freshly duplicated session is never
+        yet locked.
+    *   In `change_session`, added `except_id: session.id` to `choose_session`
+        to prevent re-selecting the current session from the chooser.
+    *   Track `previous_session` as a full object instead of just an ID,
+        enabling restoration on lock failure.
+    *   On lock failure, restore `@session` to the previous session, re-acquire
+        its lock, and reset `name` to `??` so the next iteration opens the
+        interactive picker instead of retrying the same locked session.
+    *   Log `previous_session_id` correctly in the "Session changed" info
+        message.
+
+*   **Formatting fix**
+    *   Add space before `\`.
+
+*   **Fix `context_spook` returning `nil` instead of context**
+    *   Reordered `STDOUT.puts` and `ctx.send("to_#{format.downcase}")` in
+        `context_spook` so the serialized context is the last expression in the
+        `if count > 0` branch, preventing `STDOUT.puts` from clobbering the
+        implicit return value.
+    *   Added a regression spec in `input_content_spec.rb` that exercises the
+        `count > 0` path with a real file and `all: true`, asserting the return
+        value is a non-blank `String` containing the ingested file path.
+
+## 2026-09-05 v0.0.118
+
+*   Documented the upgrade workflow in the README, adding an "Upgrading"
+    section that covers the post-`gem update` flow: `/config diff` with
+    `:diffget`, reload, and `/prompt sync` for per-prompt drift resolution.
+*   Clarified that the local `config.yml` is a partial override requiring no
+    migration script.
+*   Improved the prompt drift nagging message in `app_state.rb#seed` by
+    replacing the previous prompt with a two-part message featuring a bold
+    `Tip:` line suggesting `/prompt sync` and a "Seen these changes?"
+    confirmation.
+*   Replaced literal `⚠️` emoji with `\u26A0\uFE0F` escapes for consistent
+    rendering and introduced `Term::ANSIColor` locally for the bold tip prefix.
+*   Added a `session.standup` template to `default_config.yml` defining a
+    six-section end-of-day document.
+*   Moved the compaction system prompt from `prompts.compaction.system` to
+    `prompts.system.compaction` and updated `compaction.rb` to call
+    `prompt(:compaction, context: 'system')`.
+*   Added `prompts.system.report`, a genre-neutral writer system prompt, and
+    updated `session_management.rb#report_session` to pass `system:` and
+    `think: true` to `generate` for report generation.
+*   Simplified `compaction_spec.rb` to resolve templates from
+    `chat.config.prompts.system.compaction` and added a `prompt(:report,
+    context: 'system')` expectation to `session_management_spec.rb`.
+*   Fixed the `get_url` summarizing policy by wrapping it in `Infobar.busy` and
+    `chat.generate` to ensure the LLM produces the summary.
+*   Added a `words` (integer) parameter to the `get_url` tool schema, forwarded
+    to `summarize_source` to control summary length.
+*   Changed `STDOUT.puts` to `infobar.puts` in `summarize_source` to prevent
+    garbling spinner output.
+*   Updated `get_url_spec.rb` to include `words: nil` in argument doubles,
+    reworked the summarizing test to expect `chat.generate`, and added a
+    `words: 50` forwarding test.
+*   Added `Infobar.busy` spinners with descriptive labels to LLM `generate`
+    calls in `personae_management.rb`, `prompt_management.rb`, and
+    `session_management.rb`.
+*   Modified `prompt_management.rb` to only call `edit_text(suggestions)` if
+    `suggestions.present?`.
+
 ## 2026-09-03 v0.0.117
 
 *   Fixed `/favourite` subcommand completion rendering by replacing separate

data/README.md

@@ -19,6 +19,39 @@ gem install ollama_chat
 
 in your terminal.
 
+## Upgrading
+
+After `gem update ollama_chat`, the next launch will either
+start cleanly or prompt you to fix the config:
+
+1. **Open the config diff.** Run `/config diff`, or wait for
+   the automatic `fix_config` prompt if the new version
+   introduced required keys. Either way, your `$DIFF_TOOL`
+   (default: `vimdiff`) opens with your local `config.yml`
+   on one side and the shipped `default_config.yml` on the
+   other.
+2. **Pull in the changes.** In vimdiff, use `:diffget` to
+   copy new or updated keys from the default into your local
+   file. Ignore keys you've intentionally overridden.
+3. **Reload.** Close the diff tool and answer `y` to the
+   "restart?" prompt.
+4. **Prompt drift.** If the new version changed any shipped
+   prompts, a fingerprint notice lists modified, added, and
+   removed prompts. To reconcile your stored prompts with
+   the new defaults, run `/prompt sync`. It diffs each
+   prompt against the shipped version and lets you decide
+   per prompt: adopt the new default, keep your local edit,
+   or review the change. After syncing, the fingerprint is
+   updated and the nagging stops.
+
+   If you simply want to dismiss the notice without
+   syncing, answer `y` to the boot prompt. The fingerprint
+   is stored and you won't be asked again.
+
+Your local config is a partial override. Keys you don't
+have fall through to the shipped defaults. No migration
+script needed.
+
 ## Configuration
 
 ### Environment Variables

data/Rakefile

@@ -40,7 +40,7 @@ GemHadar do
 
   dependency             'excon',                 '~> 1.0'
   dependency             'ollama-ruby',           '~> 1.23'
-  dependency             'documentrix',           '>= 0.6.0'
+  dependency             'documentrix',           '>= 0.7.0'
   dependency             'unix_socks',            '>= 0.4'
   dependency             'rss',                   '~> 0.3'
   dependency             'term-ansicolor',        '~> 1.11'

data/lib/ollama_chat/commands.rb

@@ -883,7 +883,8 @@ module OllamaChat::Commands
         if opts[?p]
           all = opts.fetch(?a, false)
           patterns = extract_patterns(arg)
-          next provide_file_set_content(patterns, all:, skip_blank: true) { embed(_1, tags:) } || :next
+          sources = file_set_each(patterns, all:).map(&:to_s).to_h { [_1, tags] }
+          next bulk_embed_sources(sources) || :next
         elsif arg
           next embed(arg, tags:) || :next
         else

data/lib/ollama_chat/compaction.rb

@@ -191,7 +191,7 @@ module OllamaChat::Compaction
     prompt = prompt(:summarize, context: 'compaction').to_s % {
       previous:, groups:
     }
-    system = prompt(:system, context: 'compaction').to_s
+    system = prompt(:compaction, context: 'system').to_s
 
     es = OllamaChat::TokenEstimator.estimate(prompt)
     log(:info, "Compaction: sending prompt " \

data/lib/ollama_chat/database/models/app_state.rb

@@ -73,19 +73,20 @@ class OllamaChat::Database::Models::AppState < Sequel::Model(OllamaChat::DB)
       removed = old.keys - hashes.keys
       changed = hashes.select { |k, v| old[k] && old[k] != v }.keys
 
-      STDERR.puts "⚠️  Shipped prompts changed since last boot:"
+      STDERR.puts "\u26A0\uFE0F Shipped prompts changed since last boot:"
       changed.each { |k| STDERR.puts "  ~ #{k} (modified)" }
       added.each   { |k| STDERR.puts "  + #{k} (new)" }
       removed.each { |k| STDERR.puts "  - #{k} (removed)" }
     elsif !OllamaChat.test_mode?
-      STDERR.puts '⚠️  First run — storing prompt fingerprints.'
+      STDERR.puts "\u26A0\uFE0F First run — storing prompt fingerprints."
       store_fingerprint(fingerprint, hashes)
       return true
     end
 
+    c = Term::ANSIColor
     prompt = <<~EOT.chomp << ' '
-      Keep local prompts (stop nagging)?
-      Consider adopting via /prompt sync or just ignore? (y/n) %s
+      #{c.bold{'Tip'}}: /prompt sync adopts shipped defaults into local config.
+      Seen these changes? (y = stop nagging, n = ask again next boot) %s
     EOT
     if OllamaChat.test_mode? || chat.confirm?(prompt:, yes: /\Ay/i, timeout: 5)
       store_fingerprint(fingerprint, hashes)

data/lib/ollama_chat/input_content.rb

@@ -106,8 +106,8 @@ module OllamaChat::InputContent
         end
       end
       if count > 0
-        ctx.send("to_#{format.downcase}")
         STDOUT.puts "✅ Ingesting context now."
+        ctx.send("to_#{format.downcase}")
       else
         STDERR.puts "❌ No files in context. ⇨ Cancelled."
       end

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -190,12 +190,40 @@ prompts:
 
       Write a narrative retelling of the roleplay session
       above. Your story MUST:
+
       - Capture the emotional arc and key plot beats.
       - Stay in the established setting and character voices.
       - Use vivid, evocative prose; show, don't tell.
       - Highlight turning points, revelations, and character
         growth.
       - Read it like a short story chapter, not a log.
+    standup: |
+      %{content}
+
+      Write a document for an end-of-session snapshot. It captures what was
+      accomplished, which decisions were made and why, and what happens next —
+      the same alignment a Scrum standup provides, but written down so no
+      context is lost between sessions.
+
+      Your document MUST contain these exact sections:
+
+      1. ## Progress Log — bulleted list of completed tasks with relative file
+      paths. 2. ## External References — all URLs, API docs, or GitHub links
+      discussed during the session. 3. ## Current Mental Model — current focus,
+      existing blockers, and the immediate next step. 4. ## Technical Decision
+      Log — rationale for chosen implementations vs. rejected alternatives
+      (table). 5. ## Pending Roadmap — Critical → Important → Future Polish. 6.
+      ## Quick-Start Pointers — 2–3 files or links the next session must read
+      #first.
+
+      Constraints:
+      - Use relative Markdown paths for file references.
+      - Document *why* decisions were made, not just *what*.
+      - Do not restate what the conversation records verbatim.
+      - Professional, precise, technical tone.
+
+      Output only the standup document. No preamble, no
+      postamble, no meta-commentary.
   suggest:
     coding: |
       ## Context
@@ -366,12 +394,6 @@ prompts:
       Output only the 9 suggestions as plain text, each separated by one empty line.
       No other text.
   compaction:
-    system: |
-      You are a context summarizer for a chat application.
-      Your sole task is to produce a concise, factual narrative
-      summary of the conversation provided. Be precise, omit
-      speculation, and follow the formatting instructions in the
-      user prompt exactly. Output only the summary text.
     summarize: |
       previous_summary:
       %{previous}
@@ -408,6 +430,20 @@ prompts:
 
       %{runtime_info}
     assistant: You are a helpful assistant.
+    compaction: |
+      You are a context summarizer for a chat application.
+      Your sole task is to produce a concise, factual narrative
+      summary of the conversation provided. Be precise, omit
+      speculation, and follow the formatting instructions in the
+      user prompt exactly. Output only the summary text.
+    report: |
+      You are a writer. The user prompt below
+      specifies the document to produce: its
+      structure, tone, and constraints. Follow
+      it exactly. Output only the final document
+      — no preamble, no postamble, no commentary,
+      no reference to yourself or the act of
+      writing.
 voice:
   handler: OllamaChat::Say
   enabled: false
@@ -442,10 +478,12 @@ embedding:
     name: snowflake-arctic-embed:137m
     embedding_length: 768
     context_length: 2048
-    options: {}
+    options:
+      num_batch: 2048
     # Retrieval prompt template:
     prompt: 'Represent this sentence for searching relevant passages: %s'
-  batch_size: 100
+  batch_size: 500
+  concurrency: 3
   database_filename: null # ':memory:'
   collection: <%= OC::OLLAMA::CHAT::COLLECTION %>
   found_texts_size: 16384

data/lib/ollama_chat/personae_management.rb

@@ -597,12 +597,18 @@ module OllamaChat::PersonaeManagement
   # @param persona_name [String] the name of the character to replace {{char}} with
   # @return [String] the resulting structured Markdown persona profile
   def convert_json_character_to_markdown(character, persona_name)
-    generate(
-      prompt:  prompt(:persona_architect).to_s % {
-        character:,
-        persona_template: prompt(:persona).to_s
-      }
-    ).gsub(/{{user}}/i, '%{user}').gsub(/{{char}}/i, persona_name)
+    Infobar.busy(
+      label: 'Converting character…',
+      frames: :braille7,
+      output: STDOUT,
+    ) do
+      generate(
+        prompt:  prompt(:persona_architect).to_s % {
+          character:,
+          persona_template: prompt(:persona).to_s
+        }
+      ).gsub(/{{user}}/i, '%{user}').gsub(/{{char}}/i, persona_name)
+    end
   end
 
   # Interactively exports a persona profile to a specified file.

data/lib/ollama_chat/prompt_management.rb

@@ -346,10 +346,16 @@ module OllamaChat::PromptManagement
     full_prompt = template % { history:, instruction: }
 
     # Execute a silent chat oneshot call (doesn't add to history)
-    suggestions = generate(prompt: full_prompt).full? or return
+    suggestions = Infobar.busy(
+      label: 'Creating suggestions…',
+      frames: :braille7,
+      output: STDOUT,
+    ) do
+      generate(prompt: full_prompt)
+    end
 
     # Pass the AI's suggestions through the editor for final refinement
-    edit_text(suggestions)
+    edit_text(suggestions) if suggestions.present?
   end
 
   # Lists all prompt templates in the database, indicating which are defaults
@@ -426,7 +432,7 @@ module OllamaChat::PromptManagement
     end
 
     if orphans.any?
-      STDOUT.puts "\n#{orphans.count} orphaned prompt(s) "\
+      STDOUT.puts "\n#{orphans.count} orphaned prompt(s) " \
                  "(no longer in default config):\n"
       orphans.each { |p| STDOUT.puts "  • #{bold{p.name}} in #{italic{p.context}}" }
       STDOUT.puts

data/lib/ollama_chat/rag_handling.rb

@@ -184,12 +184,13 @@ module OllamaChat::RAGHandling
   #
   # @return [String] a newline-separated string of embedding result messages.
   def update_collection(collection)
+    results = []
     switch_collection(collection) do
       unless col = database_collection?(collection)
         STDERR.puts "❌ Collection #{collection.inspect} not found in database."
-        return
+        return ''
       end
-      results = []
+      sources = {}
       seen = {}
       @documents.each_record do |record|
         source = @documents.normalize_source(record.source) or next
@@ -199,24 +200,20 @@ module OllamaChat::RAGHandling
           infobar.puts "Source #{source.to_s.inspect} is unmodified. => Skipping."
           next
         end
-        tags = record.tags_set
+        sources[source] = record.tags_set
         @documents.source_remove(source)
-        r = embed(source, tags:) or next
-        results << r
       end
 
       if patterns = col.patterns.full?
-        all_file_set(patterns).each do |file|
-          seen[file.to_s] and next
-          seen[file.to_s] = true
-          r = embed(file.to_s, tags: []) or next
-          results << r
-        end
+        new_sources = all_file_set(patterns).map(&:to_s).reject { seen.key?(_1) }
+        new_sources.each { seen[_1] = true }
+        new_sources.each { sources[_1] = [] }
       end
 
+      results.concat(bulk_embed_sources(sources))
       log(:info, "Collection updated", data: { collection:, sources_updated: results.size })
-      results * "\n"
     end
+    results * ?\n
   end
 
   # Extracts and normalizes file patterns from a shell-style string.

data/lib/ollama_chat/session_management.rb

@@ -219,8 +219,7 @@ module OllamaChat::SessionManagement
     @session = session.duplicate
     set_previous_session_on_change(old_session.id)
     session.update(name:)
-    session.lock? or raise OllamaChat::OllamaChatError,
-      "Could not lock session #{session.id} #{session.errors.full?(:inspect)}"
+    session.lock
     confirm?(
       prompt: "🔔 Clear messages of duplicated session? (y/n) ",
       yes: /\Ay/i
@@ -444,7 +443,15 @@ module OllamaChat::SessionManagement
                end
     template or return
 
-    generate(prompt: template.to_s % { content: })
+    system = prompt(:report, context: 'system').to_s
+
+    Infobar.busy(
+      label: 'Generating session report…',
+      frames: :braille7,
+      output: STDOUT,
+    ) do
+      generate(system:, prompt: template.to_s % { content: }, think: true)
+    end
   end
 
   # Generates a report and displays or saves the result.
@@ -485,11 +492,17 @@ module OllamaChat::SessionManagement
       c << "%s: %s\n\n" % [ sender_name, message.content ]
     end
     prompt = prompt(:session_title).to_s % { length:, content: }
-    generate(prompt:).full? do |name|
-      name = name.
-        gsub(/(\A(\s|[^A-Za-z])+|(\s|[^A-Za-z])+\z)/m, '').
-        gsub(/\s+/, ' ')
-      Kramdown::ANSI::Width.truncate(name, length:)
+    Infobar.busy(
+      label: 'Naming session…',
+      frames: :braille7,
+      output: STDOUT,
+    ) do
+      generate(prompt:).full? do |name|
+        name = name.
+          gsub(/(\A(\s|[^A-Za-z])+|(\s|[^A-Za-z])+\z)/m, '').
+          gsub(/\s+/, ' ')
+        Kramdown::ANSI::Width.truncate(name, length:)
+      end
     end
   end
 
@@ -523,9 +536,9 @@ module OllamaChat::SessionManagement
   # @param name [String] the name or ID of the session to switch to
   def change_session(name)
     name.full? or name = ??
-    previous_session_id = nil
+    previous_session = nil
     loop do
-      if chosen_session = choose_session(name, allow_new: true)
+      if chosen_session = choose_session(name, except_id: session.id, allow_new: true)
         if chosen_session.nil? || chosen_session == session
           confirm?(
             prompt: "\n⏎  Same session chosen, Press any key to continue (%s). ",
@@ -534,7 +547,7 @@ module OllamaChat::SessionManagement
           break
         end
         session_close
-        previous_session_id = session.id
+        previous_session = session
         @session = chosen_session
         if session.lock?
           messages.read_conversation_jsonl(session.messages.to_s)
@@ -549,10 +562,13 @@ module OllamaChat::SessionManagement
           set_default_persona_name(session.default_persona_name.full? || :none)
           set_current_system_prompt(session.current_system_prompt.full? || 'default')
           session_apply
-          log(:info, "Session changed", data: { session_id: session.id, name: session.name, previous_session_id: })
+          log(:info, "Session changed", data: { session_id: session.id, name: session.name, previous_session_id: previous_session&.id })
           info_session
           break
         else
+          @session = previous_session
+          @session.lock
+          name = ??
           confirm?(
             prompt: "\n⏎  Session locked: could not switch, Press any key to continue (%s). ",
             timeout: 3
@@ -565,7 +581,7 @@ module OllamaChat::SessionManagement
       end
     end
   ensure
-    set_previous_session_on_change(previous_session_id)
+    set_previous_session_on_change(previous_session&.id)
     session_sync
   end
 

data/lib/ollama_chat/source_fetching.rb

@@ -144,7 +144,7 @@ module OllamaChat::SourceFetching
   # @param words [Integer, nil] The target number of words for the summary (defaults to 100)
   # @return [String, nil] The formatted summary message or nil if content is empty or cannot be processed
   def summarize_source(source_io, source, words: nil)
-    STDOUT.puts "Summarizing #{italic { source_io&.content_type }} document #{source.to_s.inspect} now."
+    infobar.puts "Summarizing #{italic { source_io&.content_type }} document #{source.to_s.inspect} now."
     log(:info, "Source summarized", data: { source: source.to_s, content_type: source_io&.content_type, words: })
     words = words.to_i
     words < 1 and words = 100
@@ -185,7 +185,7 @@ module OllamaChat::SourceFetching
   def embed_source(source_io, source, tags: [], count: nil)
     @embedding.on? or return parse_source(source_io)
     unless @documents.source_modified?(source)
-      STDOUT.puts "Source #{source.to_s.inspect} already up-to-date. => Skipping."
+      infobar.puts "Source #{source.to_s.inspect} already up-to-date. => Skipping."
       log(:info, "Source up-to-date", data: { source: source.to_s })
       return
     end
@@ -225,9 +225,9 @@ module OllamaChat::SourceFetching
       chunks: inputs.size
     })
     if count
-      STDOUT.puts '%u. %s' % [ count, m ]
+      infobar.puts '%u. %s' % [ count, m ]
     else
-      STDOUT.puts m
+      infobar.puts m
     end
     source  = source.to_s
     command = false
@@ -253,10 +253,14 @@ module OllamaChat::SourceFetching
   #
   # @param source [String] The source identifier which can be a command, URL,
   #   or file path
+  # @param tags [Array<String>] Tags to apply to the embedded source
+  # @param prompt [#to_s] The prompt template to format the result with
+  #   (defaults to `prompt(:embed)`)
   #
   # @return [String, nil] The formatted embedding result or summary message, or
   #   nil if the operation fails
-  def embed(source, tags: [])
+  def embed(source, tags: [], prompt: prompt(:embed))
+    prompt = prompt.to_s
     @embedding.on? or return
     fetch_source(source) do |source_io|
       content = parse_source(source_io)
@@ -264,7 +268,31 @@ module OllamaChat::SourceFetching
       source_io.rewind
       embed_source(source_io, source, tags:) or return
     end
-    prompt(:embed).to_s % { source:, collection: }
+    prompt.to_s % { source:, collection: }
+  end
+
+  # Embeds multiple sources concurrently using a bounded thread pool.
+  #
+  # @param sources_tags [Hash{String => Array}] mapping of source identifier
+  #   to the tags array to apply to that source
+  # @return [Array<String>] results from each successful embed call
+  def bulk_embed_sources(sources_tags)
+    return sources_tags.map { |s, tags| embed(s, tags:) }.compact if
+      sources_tags.size <= 1 or config.embedding.concurrency <= 1
+
+    results = []
+    mutex   = Mutex.new
+    prompt = prompt(:embed)
+    Tins::Limited.new(config.embedding.concurrency, name: 'embed').process do |l|
+      sources_tags.each do |s, tags|
+        l.execute do
+          r = embed(s, prompt:, tags:)
+          mutex.synchronize { results << r } if r
+        end
+      end
+      l.stop
+    end
+    results
   end
 
   private

data/lib/ollama_chat/tools/get_url.rb

@@ -52,6 +52,13 @@ class OllamaChat::Tools::GetURL
                 - 'summarizing': Returns a condensed summary of the content.
               EOT
             ),
+            words: Tool::Function::Parameters::Property.new(
+              type: 'integer',
+              description: <<~EOT,
+                Target word count for the summary (only applies when
+                document_policy is 'summarizing'). Defaults to 100.
+              EOT
+            ),
           },
           required: %w[url]
         )
@@ -75,6 +82,7 @@ class OllamaChat::Tools::GetURL
     args            = tool_call.function.arguments
     url             = args.url.to_s
     document_policy = args.document_policy.full? || 'ignoring'
+    words           = args.words.to_i
 
     allowed_schemes = Array(config.tools.functions.get_url.schemes?).map(&:to_s)
 
@@ -99,7 +107,13 @@ class OllamaChat::Tools::GetURL
         when 'embedding'
           content = chat.embed_source(source_io, source)
         when 'summarizing'
-          content = chat.summarize_source(source_io, source)
+          content = Infobar.busy(
+            label: 'Summarizing…',
+            frames: :braille7,
+            output: STDOUT,
+          ) do
+            chat.generate(prompt: chat.summarize_source(source_io, source, words:))
+          end
         else
           message = "Invalid document policy #{document_policy.inspect} used."
         end

data/lib/ollama_chat/utils/chooser.rb

@@ -51,7 +51,7 @@ module OllamaChat::Utils::Chooser
         matches = entries.map { |n|
           [
             n,
-            -matcher.similar(n.ask_and_send_or_self(:value).to_s.downcase)
+            -matcher.similar(n.ask_and_send_or_self(:value).to_s.downcase, /\b/)
           ]
         }.select { |_, s| s < 0 }.sort_by(&:last).map(&:first)
         matches.empty? and matches = entries

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.117'
+  VERSION         = '0.0.119'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/ollama_chat.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama_chat 0.0.117 ruby lib
+# stub: ollama_chat 0.0.119 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.117".freeze
+  s.version = "0.0.119".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<utils>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<excon>.freeze, ["~> 1.0".freeze])
   s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.23".freeze])
-  s.add_runtime_dependency(%q<documentrix>.freeze, [">= 0.6.0".freeze])
+  s.add_runtime_dependency(%q<documentrix>.freeze, [">= 0.7.0".freeze])
   s.add_runtime_dependency(%q<unix_socks>.freeze, [">= 0.4".freeze])
   s.add_runtime_dependency(%q<rss>.freeze, ["~> 0.3".freeze])
   s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.11".freeze])

data/spec/ollama_chat/commands_spec.rb

@@ -411,11 +411,11 @@ describe OllamaChat::Commands, protect_env: true do
       end
 
       it 'returns "success" when input is "/input embedding -p (.+)"' do
-        expect(chat).to receive(:embed).
-          with(asset_pathname('example.rb'), tags: nil).
-          and_return 'success'
-        expect(chat.handle_input("/input embedding -a -p #{asset('*.rb')}")).
-          to match(/success/)
+        expect(chat).to receive(:bulk_embed_sources).
+          with(anything).
+          and_return [ 'success' ]
+        expect(chat.handle_input("/input embedding -a -p #{asset('*.rb')}"))
+          .to eq [ 'success' ]
       end
 
       it 'returns :next when input is "/input embedding"' do

data/spec/ollama_chat/compaction_spec.rb

@@ -9,31 +9,11 @@ describe OllamaChat::Compaction do
 
   connect_to_ollama_server
 
-  let :summarize_template do
-    chat.config.prompts.compaction.summarize
-  end
-
   let :system_template do
-    chat.config.prompts.compaction.system
-  end
-
-  let :assemble_template do
-    chat.config.prompts.compaction.assemble
+    chat.config.prompts.system.compaction
   end
 
   before do
-    allow(chat).to receive(:prompt)
-      .with(:summarize, context: 'compaction')
-      .and_return(summarize_template)
-
-    allow(chat).to receive(:prompt)
-      .with(:system, context: 'compaction')
-      .and_return(system_template)
-
-    allow(chat).to receive(:prompt)
-      .with(:assemble, context: 'compaction')
-      .and_return(assemble_template)
-
     allow(chat).to receive(:log)
   end
 

data/spec/ollama_chat/input_content_spec.rb

@@ -97,5 +97,15 @@ describe OllamaChat::InputContent do
         and_return(nil)
       expect(chat.context_spook(nil)).to be_nil
     end
+
+    it 'returns the serialized context instead of nil' do
+      patterns = ['spec/assets/example.rb']
+      expect(STDOUT).to receive(:puts).with(/Ingesting context now/)
+      result = chat.context_spook(patterns, all: true)
+      expect(result).to be_a(String)
+      json     = JSON.parse(result)
+      expected = Pathname.new('spec/assets/example.rb').expand_path.to_path
+      expect(json['files'].keys).to include(expected)
+    end
   end
 end

data/spec/ollama_chat/session_management_spec.rb

@@ -366,6 +366,8 @@ describe OllamaChat::SessionManagement do
       expect(chat).to receive(:sender_name_displayed).and_return('User')
       expect(chat).to receive(:prompt).with('coding_brief', context: 'session')
         .and_return(double(to_s: '%{content}'))
+      expect(chat).to receive(:prompt).with(:report, context: 'system')
+        .and_return(double(to_s: '%{content}'))
       expect(chat).to receive(:generate).and_return('Brief')
       expect(chat.report_session(name: 'coding_brief')).to eq('Brief')
     end

data/spec/ollama_chat/tools/get_url_spec.rb

@@ -26,7 +26,8 @@ describe OllamaChat::Tools::GetURL do
           name: 'get_url',
           arguments: double(
             url: 'https://www.example.com/foo',
-            document_policy: nil
+            document_policy: nil,
+            words: nil
           )
         )
       )
@@ -55,7 +56,8 @@ describe OllamaChat::Tools::GetURL do
           name: 'get_url',
           arguments: double(
             url:,
-            document_policy: nil
+            document_policy: nil,
+            words: nil
           )
         )
       )
@@ -81,10 +83,11 @@ describe OllamaChat::Tools::GetURL do
       'ToolCall',
       function: double(
         name: 'get_url',
-        arguments: double(
-          url: 'https://www.example.com/foo',
-          document_policy: nil,
-        )
+          arguments: double(
+            url: 'https://www.example.com/foo',
+            document_policy: nil,
+            words: nil,
+          )
       )
     )
 
@@ -111,7 +114,7 @@ describe OllamaChat::Tools::GetURL do
     end
 
     it 'handles the "ignoring" policy' do
-      args = double(url:, document_policy: 'ignoring')
+      args = double(url:, document_policy: 'ignoring', words: nil)
       tool_call = double(function: double(arguments: args))
 
       result = described_class.new.execute(tool_call, chat:)
@@ -120,7 +123,7 @@ describe OllamaChat::Tools::GetURL do
     end
 
     it 'handles the "importing" policy' do
-      args = double(url:, document_policy: 'importing')
+      args = double(url:, document_policy: 'importing', words: nil)
       tool_call = double(function: double(arguments: args))
       expect(chat).to receive(:import_source).with(source_io, URI.parse(url)).and_return('imported content')
 
@@ -130,7 +133,7 @@ describe OllamaChat::Tools::GetURL do
     end
 
     it 'handles the "embedding" policy' do
-      args = double(url:, document_policy: 'embedding')
+      args = double(url:, document_policy: 'embedding', words: nil)
       tool_call = double(function: double(arguments: args))
       expect(chat).to receive(:embed_source).with(source_io, URI.parse(url)).and_return('embedded content')
 
@@ -140,17 +143,29 @@ describe OllamaChat::Tools::GetURL do
     end
 
     it 'handles the "summarizing" policy' do
-      args = double(url:, document_policy: 'summarizing')
+      args = double(url:, document_policy: 'summarizing', words: nil)
       tool_call = double(function: double(arguments: args))
-      expect(chat).to receive(:summarize_source).with(source_io, URI.parse(url)).and_return('summarized content')
+      expect(chat).to receive(:summarize_source).with(source_io, URI.parse(url), words: 0).and_return('summarize prompt')
+      expect(chat).to receive(:generate).with(prompt: 'summarize prompt').and_return('summarized content')
 
       result = described_class.new.execute(tool_call, chat:)
       json = json_object(result)
       expect(json.content).to eq('summarized content')
     end
 
+    it 'handles the "summarizing" policy with custom words' do
+      args = double(url:, document_policy: 'summarizing', words: 50)
+      tool_call = double(function: double(arguments: args))
+      expect(chat).to receive(:summarize_source).with(source_io, URI.parse(url), words: 50).and_return('summarize prompt 50')
+      expect(chat).to receive(:generate).with(prompt: 'summarize prompt 50').and_return('short summary')
+
+      result = described_class.new.execute(tool_call, chat:)
+      json = json_object(result)
+      expect(json.content).to eq('short summary')
+    end
+
     it 'handles an invalid policy' do
-      args = double(url:, document_policy: 'chaos_mode')
+      args = double(url:, document_policy: 'chaos_mode', words: nil)
       tool_call = double(function: double(arguments: args))
 
       result = described_class.new.execute(tool_call, chat:)
@@ -167,7 +182,7 @@ describe OllamaChat::Tools::GetURL do
       expect(chat).to receive(:fetch_source).and_yield(source_io)
       expect(chat).to receive(:add_image).with(chat.images, source_io, URI.parse(url))
 
-      args = double(url:, document_policy: 'ignoring')
+      args = double(url:, document_policy: 'ignoring', words: nil)
       tool_call = double(function: double(arguments: args))
 
       result = described_class.new.execute(tool_call, chat:)
@@ -179,7 +194,7 @@ describe OllamaChat::Tools::GetURL do
       source_io = double('SourceIO', content_type: double(media_type: 'video'))
       expect(chat).to receive(:fetch_source).and_yield(source_io)
 
-      args = double(url:, document_policy: 'ignoring')
+      args = double(url:, document_policy: 'ignoring', words: nil)
       tool_call = double(function: double(arguments: args))
 
       result = described_class.new.execute(tool_call, chat:)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.117
+  version: 0.0.119
 platform: ruby
 authors:
 - Florian Frank
@@ -169,14 +169,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: unix_socks
   requirement: !ruby/object:Gem::Requirement