brainiac 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be4dc2e28622b168e577e1813ab7bda98ce074fc04d0f4b63fe69502e24ef6f2
-  data.tar.gz: 06513ef234e4a5ce4c23bc809c02942193a73394953a749df3b63653ceb70bc2
+  metadata.gz: e0e0e919150a76bcf0b7f289b72cfdbc8000bc0cacf94bc9103685cf49331415
+  data.tar.gz: 58174d5dcf9d0c3641f9a96317f6d94a4dda153481d586659275e8e81623fd24
 SHA512:
-  metadata.gz: d8bedd4bef849857ac72d040d925bb74d23f97c10e575fdb8326c85d1580c60fbaff5e77a65d8958685c00b3b79f3b3d22e5b7304b194a5746e2aff74c4e850e
-  data.tar.gz: c47e8739c7a655bde2283876538fd08d5b3b9500fd6bb56f38c2a02f4214d89b15be2f127f0752a78d68a4ddc13af0e7fb97a03d8db1a8fa1d43a61ac76495f1
+  metadata.gz: 73331c38b19e2ef1bb2d352b0a9b6cf6259d7075022e6ea529ad1203fd8dc30369d83b7d88e603c1ab04a59ec2a96856b01a59fc669a4b43c1efbba847ea2399
+  data.tar.gz: 917ea682b6749cef4a17d76a2a40d10deabb175c30af77044dc5a3d8be7132ab7f52e8722f8881bc11689c3d597ad83039e107e336cf40d891a0a222396df405

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    brainiac (0.1.3)
+    brainiac (0.1.5)
       puma (~> 7.2)
       rackup (~> 2.3)
       sinatra (~> 4.1)
@@ -84,7 +84,7 @@ DEPENDENCIES
 CHECKSUMS
   ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
   base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
-  brainiac (0.1.3)
+  brainiac (0.1.5)
   json (2.21.2) sha256=1f1d3b7cf2b3ba1a69beca0bb6db13d5438b80bff3cd54cdaaa620b9b07c1c6a
   language_server-protocol (3.17.0.6) sha256=5ef2c0c138f8267e1bc631d3328347d354f96724b0af22f2c79516120443b7f0
   lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87

data/README.md

@@ -704,14 +704,11 @@ Exactly one profile should be marked `"default": true` — it applies when no `[
 
 ### Model selection
 
-Model selection is a **cli-provider concern**, not a profile concern. kiro-cli's backend doesn't support the `--model` runtime flag — model selection happens via `settings chat.defaultModel`. The kiro-cli provider is configured to use this approach:
+Model selection is a **cli-provider concern**, not a profile concern. kiro-cli accepts `--model <id>` per run, so the kiro-cli provider uses `"model_flag": "--model"`. A model tag (`[opus]`, `[sol]`, etc.) only affects that dispatch (and the thread/work item it was sent in). It never changes the account's saved `chat.defaultModel`, so other threads are unaffected.
 
-- `"model_flag": ""` — no `--model` flag is ever passed
-- `"settings_model_cmd": ["kiro-cli", "settings", "chat.defaultModel"]` — when a model tag (`[opus]`, `[sonnet]`, etc.) or Fizzy card tag resolves to a model, brainiac runs this command (with the profile's env) to set `chat.defaultModel` before spawning the dispatch
+Each account's `chat.defaultModel` (in its own `KIRO_HOME`) only applies when no model is resolved at all. Keep it set to a model that account can actually use.
 
-With per-profile `KIRO_HOME`, the settings write goes to that profile's own `settings/cli.json` — so `[p:k+] [opus]` updates k+'s model, and `[p:q] [sonnet]` updates q's model, independently.
-
-**Concurrency note:** the settings write is per-`KIRO_HOME`. Concurrent dispatches on *different* profiles never conflict. Two concurrent dispatches on the *same* profile with different model tags have a narrow write-before-spawn race — acceptable for single-user setups, but worth knowing.
+**`settings_model_cmd` (legacy, avoid for kiro-cli):** for CLIs with no runtime model flag, a provider can set `"model_flag": ""` plus `"settings_model_cmd": [...]`, and brainiac runs that command before each tagged dispatch. That write is *persistent*: it becomes the account's default for every later dispatch, including unrelated threads. If a tag writes a model the default account doesn't have (e.g. `[sol]` landing on `q`), every untagged dispatch on that account fails with `The model '...' is not available`.
 
 ### Seeding a new KIRO_HOME
 

data/lib/brainiac/helpers.rb

@@ -315,6 +315,11 @@ end
 def register_work_item(branch:, worktree: nil, project: nil, agent: nil, source: nil, source_data: {})
   map = load_work_item_map
 
+  # Normalize source to a string key — callers may pass a symbol (e.g. :fizzy).
+  # The sources hash is JSON-serialized with string keys, so mixing symbol and
+  # string keys produces a "duplicate key" error in JSON.pretty_generate.
+  source = source.to_s if source
+
   # Check if a work item already exists for this branch
   existing_id = nil
   map.each do |wid, info|
@@ -330,7 +335,7 @@ def register_work_item(branch:, worktree: nil, project: nil, agent: nil, source:
     # Update existing entry — merge in new source, update worktree/agent if provided
     map[work_item_id]["worktree"] = worktree if worktree
     map[work_item_id]["agent"] = agent if agent
-    map[work_item_id]["sources"] ||= {}
+    map[work_item_id]["sources"] = normalize_source_keys(map[work_item_id]["sources"])
     map[work_item_id]["sources"][source] = source_data if source
   else
     # Create new entry
@@ -348,10 +353,10 @@ def register_work_item(branch:, worktree: nil, project: nil, agent: nil, source:
   work_item_id
 end
 
-# Update dispatch overrides on a work item (cli_provider, model, effort).
+# Update dispatch overrides on a work item (cli_provider, model, effort, profile).
 # Only non-nil values are stored; nil values are removed from existing overrides.
 # Returns true if the work item was found and updated, false otherwise.
-def update_work_item_overrides(cli_provider: nil, model: nil, effort: nil, work_item_id: nil, branch: nil) # rubocop:disable Naming/PredicateMethod
+def update_work_item_overrides(cli_provider: nil, model: nil, effort: nil, profile: nil, work_item_id: nil, branch: nil) # rubocop:disable Naming/PredicateMethod
   map = load_work_item_map
 
   target_id = work_item_id
@@ -370,6 +375,7 @@ def update_work_item_overrides(cli_provider: nil, model: nil, effort: nil, work_
   overrides["cli_provider"] = cli_provider if cli_provider
   overrides["model"] = model if model
   overrides["effort"] = effort if effort
+  overrides["profile"] = profile if profile
   overrides.compact!
 
   if overrides.empty?
@@ -412,16 +418,26 @@ end
 #   inline_cli_provider: — [cli:X] from current message (nil if not specified)
 #   inline_model: — resolved model from current message (nil if not specified)
 #   inline_effort: — [effort:X] from current message (nil if not specified)
+#   inline_profile: — [profile:X]/[p:X] from current message (nil if not specified)
+#
+# A profile sticks to the work item like model/effort do: [p:k+] once and every later
+# untagged reply keeps running on k+ until a different [p:X] (e.g. [p:q]) replaces it.
+# Unknown profile names are never persisted, so a typo can't pin a work item to a
+# profile that doesn't exist (profile_spawn_env ignores it for this dispatch too).
 #
-# Returns: { cli_provider: String|nil, model: String|nil, effort: String|nil }
-def resolve_work_item_overrides(work_item_id: nil, branch: nil, inline_cli_provider: nil, inline_model: nil, inline_effort: nil)
+# Returns: { cli_provider:, model:, effort:, profile: } (each String or nil)
+def resolve_work_item_overrides(work_item_id: nil, branch: nil, inline_cli_provider: nil, inline_model: nil, inline_effort: nil,
+                                inline_profile: nil)
   stored = work_item_overrides_for(work_item_id: work_item_id, branch: branch)
+  inline_profile = inline_profile&.to_s&.downcase
+  persist_profile = inline_profile && profile_entry(inline_profile) ? inline_profile : nil
 
   # Inline tags override stored values
   resolved = {
     cli_provider: inline_cli_provider || stored["cli_provider"],
     model: inline_model || stored["model"],
-    effort: inline_effort || stored["effort"]
+    effort: inline_effort || stored["effort"],
+    profile: inline_profile || stored["profile"]
   }
 
   # Persist any new inline overrides to the work item for future dispatches
@@ -429,6 +445,7 @@ def resolve_work_item_overrides(work_item_id: nil, branch: nil, inline_cli_provi
   new_overrides[:cli_provider] = inline_cli_provider if inline_cli_provider
   new_overrides[:model] = inline_model if inline_model
   new_overrides[:effort] = inline_effort if inline_effort
+  new_overrides[:profile] = persist_profile if persist_profile
 
   update_work_item_overrides(work_item_id: work_item_id, branch: branch, **new_overrides) if new_overrides.any? && (work_item_id || branch)
 
@@ -440,6 +457,10 @@ end
 def register_work_item_source(source:, source_data:, work_item_id: nil, branch: nil) # rubocop:disable Naming/PredicateMethod
   map = load_work_item_map
 
+  # Normalize source to a string key — callers may pass a symbol (e.g. :fizzy).
+  # See register_work_item for why mixing symbol/string keys breaks JSON serialization.
+  source = source.to_s if source
+
   # Find by ID or branch
   target_id = work_item_id
   unless target_id
@@ -453,12 +474,24 @@ def register_work_item_source(source:, source_data:, work_item_id: nil, branch:
 
   return false unless target_id && map[target_id]
 
-  map[target_id]["sources"] ||= {}
+  map[target_id]["sources"] = normalize_source_keys(map[target_id]["sources"])
   map[target_id]["sources"][source] = source_data
   save_work_item_map(map)
   true
 end
 
+# Normalize a work item's sources hash so all keys are strings. Guards against
+# a previously-corrupted in-memory hash that mixed symbol and string keys
+# (e.g. both :fizzy and "fizzy"), which would otherwise crash JSON serialization.
+# A later entry (symbol source just written) wins over an existing string entry.
+def normalize_source_keys(sources)
+  return {} unless sources.is_a?(Hash)
+
+  sources.each_with_object({}) do |(key, value), acc|
+    acc[key.to_s] = value
+  end
+end
+
 def slugify(title, max_length: 40)
   title.downcase.gsub(/[^a-z0-9\s-]/, "").strip.gsub(/\s+/, "-").slice(0, max_length).chomp("-")
 end
@@ -965,6 +998,11 @@ end
 # run that command synchronously before spawning the agent so the correct model
 # is already persisted in the provider's settings dir (e.g. KIRO_HOME/settings/cli.json).
 #
+# WARNING: this write is sticky. It changes the account's default for every later
+# dispatch, not just this one, so a tag in one thread leaks into unrelated threads.
+# Only use it for CLIs with no per-run model flag. kiro-cli supports --model and
+# should use "model_flag": "--model" instead.
+#
 # Only fires when:
 #   - model_flag is absent or empty (the provider doesn't support runtime model selection)
 #   - settings_model_cmd is configured on the provider

data/lib/brainiac/profiles.rb

@@ -17,10 +17,10 @@
 #                   lives — giving each profile its own KIRO_HOME means each account has
 #                   its own model setting.
 #
-# Model selection is a cli-provider concern, not a profile concern. To stop passing
-# --model (e.g. because the CLI backend doesn't support the flag), set "model_flag": ""
-# in the cli-provider config (~/.brainiac/cli-providers/kiro.json). Each account's
-# chat.defaultModel (in its own KIRO_HOME) then drives model selection instead.
+# Model selection is a cli-provider concern, not a profile concern. kiro-cli takes
+# --model per run ("model_flag": "--model"), so an inline model tag only affects that
+# dispatch. Each account's chat.defaultModel (in its own KIRO_HOME) is just the fallback
+# when no model resolves — keep it set to a model that account actually has.
 #
 # NOTE: a fresh KIRO_HOME starts empty. brainiac dispatches with --agent <name>, so each
 # KIRO_HOME needs agent definitions (and any MCP/permissions you rely on) or dispatches

data/lib/brainiac/version.rb

@@ -2,5 +2,5 @@
 
 module Brainiac
   # @return [String] the current gem version
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

data/templates/cli-providers/kiro.json.example

@@ -2,8 +2,7 @@
   "binary": "kiro-cli",
   "default_args": "chat --trust-all-tools --no-interactive",
   "agent_flag": "--agent",
-  "model_flag": "",
-  "settings_model_cmd": ["kiro-cli", "settings", "chat.defaultModel"],
+  "model_flag": "--model",
   "effort_flag": "--effort",
   "prompt_mode": "stdin",
   "resume_flag": "--resume",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brainiac
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Andy Davis