brainiac 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cedcfe4e4dfa26034cf0ded9746d8ff5bade886ec3d83774580d8334777d4d3c
-  data.tar.gz: 96d1702d994f06f0a4f41870de6652258fc700a9f9df1b6193c347b2cce3b365
+  metadata.gz: e63254b890e44045e1c05872417234f86e34fdcd36a737c7565c4ee7efc74426
+  data.tar.gz: 630399ccb91dc4ef99b6f14619710c5893b6194354dc3a89f3d491cc4b226bdb
 SHA512:
-  metadata.gz: 16a5c9937e67afe78bcba468dea8a4b75c73864c4a320b8d2da930a966bd618797b6285f765f772a99394d8925ba9438fe2b9012ccb94730908e97642148cdbb
-  data.tar.gz: 95cd9275779731da352b0356e1da275f12511b960037512e829614a6b5e2a4a97e3b00ba0ceeefbdbcc8eff71a3f0717b9cc43fb3ee4d21b2b706361e4dfccc0
+  metadata.gz: d0a1f9cc0ca39aa87aec48c3b45132b7777e6dc6ca7f71006a78e6ebe00879c188d8cea9104822d2e32a3d1b65970d09d5271c558d5af10faa8d29a24bd182a5
+  data.tar.gz: '02884d9354a9b5946a28f58f0e0c70d4f98893554b773f1738aa6e2a9383850d4f7577c8d691c9ef11867f71a81c5327a5ac28922fc7b90a95311bb1ceb536c4'

data/lib/brainiac/helpers.rb

@@ -704,9 +704,11 @@ def prior_session_exists?(chdir, agent_cli, session_dir: nil)
   return true if File.directory?(session_dir_local)
 
   # Fallback: look for recent session logs in tmp/ that suggest this CLI ran here before.
-  # This covers CLIs that don't leave a dotdir but do leave logs via brainiac.
+  # This covers CLIs that don't leave a dotdir but do leave logs via brainiac. The logs
+  # don't say which CLI wrote them, so only trust them when the last-CLI marker says it was this one.
   tmp_dir = File.join(chdir, "tmp")
   return false unless File.directory?(tmp_dir)
+  return false unless last_cli_for(chdir) == cli_name
 
   Dir.glob(File.join(tmp_dir, "agent-*.log")).any? do |log|
     # Only count logs from the last 24 hours as valid "resumable" sessions
@@ -716,6 +718,40 @@ rescue StandardError
   false
 end
 
+# Marker recording which CLI binary last ran in a directory (written by run_agent).
+def last_cli_marker_path(chdir)
+  File.join(chdir, "tmp", ".brainiac-last-cli")
+end
+
+def last_cli_for(chdir)
+  return nil unless chdir
+
+  name = File.read(last_cli_marker_path(chdir)).strip
+  name.empty? ? nil : name
+rescue StandardError
+  nil
+end
+
+def record_last_cli(chdir, agent_cli)
+  key = cli_session_key(agent_cli)
+  return unless chdir && key
+
+  FileUtils.mkdir_p(File.join(chdir, "tmp"))
+  File.write(last_cli_marker_path(chdir), key)
+rescue StandardError => e
+  LOG.warn "[Dispatch] Could not record last CLI for #{chdir}: #{e.message}"
+end
+
+# True when a different CLI ran in this directory more recently than agent_cli.
+# A switched-to CLI never saw the other provider's turns, so resuming its own (older)
+# session would hand it a lean prompt with a stale or empty history. Start fresh instead
+# and let the full prompt (memory file + source context) carry the conversation.
+def cli_switched_since_last_run?(chdir, agent_cli)
+  last = last_cli_for(chdir)
+  key = cli_session_key(agent_cli)
+  !last.nil? && !key.nil? && last != key
+end
+
 # Check if a centralized session directory has sessions matching the given cwd.
 # Supports CLIs that store sessions as .jsonl files in date-partitioned directories (YYYY/MM/DD/)
 # with a first-line JSON metadata object containing a "payload.cwd" field.
@@ -777,6 +813,7 @@ end
 def resume_viable?(project_config:, cli_provider: nil, agent_name: nil, chdir: nil)
   resolved = resolve_project_cli_config(project_config, cli_provider_override: cli_provider, agent_name: agent_name)
   chdir ||= resolved["repo_path"]
+  return false if cli_switched_since_last_run?(chdir, resolved["agent_cli"])
   return stored_cli_session_viable?(resolved, chdir) if resolved["resume_id_flag"]
   return false unless resolved["resume_flag"] || resolved["resume_args"]
 
@@ -805,6 +842,11 @@ end
 def resolve_resume(resume, resolved, chdir, session_id: nil)
   return false unless resume
 
+  if cli_switched_since_last_run?(chdir, resolved["agent_cli"])
+    LOG.info "[Dispatch] CLI switched from #{last_cli_for(chdir)} to #{resolved["agent_cli"]} in #{chdir} — starting fresh session"
+    return false
+  end
+
   if resolved["resume_id_flag"]
     id = session_id.to_s.empty? ? cli_session_id_for(agent_cli: resolved["agent_cli"], worktree: chdir) : session_id
     if id.to_s.empty?
@@ -824,16 +866,27 @@ def resolve_resume(resume, resolved, chdir, session_id: nil)
   false
 end
 
-# Some CLIs (e.g. grok --session-id) let the caller name a new session up front.
-# Mint a UUID only on the first run, when we are not resuming an existing id.
-def mint_cli_session_id(resolved, stored_session:, resuming:)
+# Some CLIs (e.g. claude/grok --session-id) let the caller name a new session up front.
+# Mint a UUID whenever we start fresh — including after a provider switch, when an older
+# stored id exists — so the stored id always points at the latest session for this CLI.
+def mint_cli_session_id(resolved, resuming:)
   return nil if resuming
   return nil unless resolved["new_session_id_flag"]
-  return nil unless stored_session.to_s.empty?
 
   SecureRandom.uuid
 end
 
+# Decide resume vs. fresh start for this dispatch, then record this CLI as the last
+# one to run here. Returns [should_resume, minted_session_id].
+def prepare_cli_session(resume, resolved, chdir)
+  stored_session = cli_session_id_for(agent_cli: resolved["agent_cli"], worktree: chdir)
+  # Auto-resume: only if the provider supports it AND a prior session exists for this CLI here.
+  should_resume = resolve_resume(resume, resolved, chdir, session_id: stored_session)
+  minted_session_id = mint_cli_session_id(resolved, resuming: should_resume)
+  record_last_cli(chdir, resolved["agent_cli"])
+  [should_resume, minted_session_id]
+end
+
 # Check if intent detection says to skip dispatching the agent.
 # Returns true if the message should be skipped, false otherwise.
 # Only runs if a raw message is provided, an agent is named, and intent is enabled.
@@ -870,12 +923,8 @@ def run_agent(prompt, project_config:, chdir: nil, log_name: "agent", model: nil
   effort ||= resolved["agent_effort"]
   agent_config_name = agent_name&.downcase&.gsub(/[^a-z0-9-]/, "-")
 
-  stored_session = cli_session_id_for(agent_cli: resolved["agent_cli"], worktree: chdir)
   work_item_id = find_work_item_by_worktree(chdir)&.first
-
-  # Auto-resume: only if the provider supports it AND a prior session exists for this CLI here.
-  should_resume = resolve_resume(resume, resolved, chdir, session_id: stored_session)
-  minted_session_id = mint_cli_session_id(resolved, stored_session: stored_session, resuming: should_resume)
+  should_resume, minted_session_id = prepare_cli_session(resume, resolved, chdir)
 
   # Pre-dispatch hook — plugins can prep the working directory (e.g., copy config files, clean up)
   Brainiac.emit(:pre_dispatch, chdir: chdir, project_config: project_config, agent_name: agent_name)

data/lib/brainiac/version.rb

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

metadata

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