Fix restore_from_log panic on Thinking entries, fix bail nullglob
restore_from_log called .message() on all entries including Thinking entries, which panic. Filter them out alongside Log entries. Also fix bail-no-competing.sh: without nullglob, when no pid-* files exist the glob stays literal and always triggers a false bail. Co-Authored-By: Proof of Concept <poc@bcachefs.org>
This commit is contained in:
parent
06176201da
commit
70ee7abea5
2 changed files with 5 additions and 3 deletions
|
|
@ -930,7 +930,7 @@ impl Agent {
|
|||
|
||||
// Load extra — compact() will dedup, trim, reload identity + journal
|
||||
let all: Vec<ContextEntry> = entries.into_iter()
|
||||
.filter(|e| !e.is_log() && e.message().role != Role::System)
|
||||
.filter(|e| !e.is_log() && !e.is_thinking() && e.message().role != Role::System)
|
||||
.map(|e| {
|
||||
let tokens = if e.is_log() { 0 } else {
|
||||
context::msg_token_count(&self.tokenizer, e.api_message())
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
#!/bin/bash
|
||||
# Bail if other agents are alive in the state dir.
|
||||
# $1 = path to this agent's pid file
|
||||
# $1 = this agent's pid file name (e.g. pid-12345)
|
||||
# cwd = state dir
|
||||
#
|
||||
# Exit 0 = continue, exit 1 = bail
|
||||
|
||||
my_pid_file=$(basename "$1")
|
||||
shopt -s nullglob
|
||||
|
||||
my_pid_file="$1"
|
||||
|
||||
for f in pid-*; do
|
||||
[[ $f != $my_pid_file ]] && exit 1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue