merge integration into main #111

Merged

thabeta merged 55 commits from integration into main 2026-06-11 23:37:24 +00:00

Conversation 0 Commits 55 Files changed 72 +4982 -1177

salmaelsoly commented 2026-06-11 12:58:06 +00:00

Member

Copy link

No description provided.

salmaelsoly added 49 commits 2026-06-11 12:58:07 +00:00

fix: tables markdown rendering eca59dba67

Merge remote-tracking branch 'origin/development' into development_fix_markdown_table_rendering ... d3531bae79

# Conflicts:
#	crates/hero_shrimp_web/static/assets/app.BWKElLkA.js
#	crates/hero_shrimp_web/static/assets/app.CaZse4bC.js
#	crates/hero_shrimp_web/static/assets/app.D1oK3cUT.js
#	crates/hero_shrimp_web/static/index.html

Merge remote-tracking branch 'origin/development' into development_fix_markdown_table_rendering ... e3d135573c

# Conflicts:
#	crates/hero_shrimp_web/static/assets/app.BWKElLkA.js
#	crates/hero_shrimp_web/static/assets/app.C84XiDPf.js
#	crates/hero_shrimp_web/static/assets/app.ZKpvRLfm.js
#	crates/hero_shrimp_web/static/index.html

Merge pull request 'fix: tables markdown rendering' (#82) from development_fix_markdown_table_rendering into integration ... b36c8c0ae7

Reviewed-on: #82

ci: add integration branch to triggers alongside development 2754adee87

fix(crew): prevent duplicate ASK bubble for new question ... 0c26e5e8e3

The optimistic ask bubble was only cleared when a reply arrived, so
after refresh() re-fetched the persisted ask it rendered alongside the
optimistic copy during the in-flight window. Clear pendingAsk once the
real ask is present in fetched messages, and guard focusedThread() from
appending a duplicate ask while keeping the working indicator.

#72

feat(crew): group thread into ask→reply turn cards with timeline rail ... 171226b4ae

Render the focused agent thread as conversation turns instead of a flat
timestamp-sorted list. Each ask is paired with its reply (matched by
correlation_id, already exposed by crew.messages) inside one parent card,
joined by a centred left-rail connector: an accent dot for the ask and a
good dot for the reply, linked by a continuous vertical line. This stops
the thread ever showing reply-after-reply or ask-after-ask.

An ask still in flight with no reply yet gets a synthetic "working…" reply
(its dot pulses), so a live ask never renders as a lone bubble.

#72

Merge pull request 'fix(crew): prevent duplicate ASK bubble for new question' (#84) from development_fix_crew_duplicate_ask into integration ... fae1d20b9a

Reviewed-on: #84

fix: fixed socket mismatch, updated docs to only use lab 513ca6094f

Merge pull request 'fix: fixed socket mismatch, updated docs to only use lab' (#88) from int_fix_socket into integration ... 659622bde5

Reviewed-on: #88

Merge remote-tracking branch 'origin/main' into integration 0a3920bf18

fix: veridict box dc21a00354

fix(web): stamp explicit incomplete/stop_reason instead of UI prose matching ... f6c9572a2d

Replace the UI's brittle prose-matching (isIncompleteReply over ~8 hardcoded
phrases) with an explicit incomplete/stop_reason field stamped by the server on
every turn/job reply. The UI keys its Continue/Retry affordance off that field
and falls back to the prose heuristic only when the field is absent (older
daemon). Detection reuses existing server signals — the structured step-limit
event, failure_kind, and a single server-owned reply_indicates_incomplete_run
fallback — so there is no new prose matcher.

#40

bump rust to 1.96 e0bc63d320

Merge remote-tracking branch 'origin' into int_fix_veridict 86e60749ae

Merge pull request 'fix: veridict box' (#97) from int_fix_veridict into integration ... c4992eeee4

Reviewed-on: #97

Merge remote-tracking branch 'origin/integration' into development_structured_incomplete_field ... 0bfef5c1bb

# Conflicts:
#	crates/hero_shrimp_web/static/assets/app.C9ryv1Pi.js
#	crates/hero_shrimp_web/static/assets/app.CLFV4RoG.js
#	crates/hero_shrimp_web/static/assets/app.DsplZEWO.js
#	crates/hero_shrimp_web/static/index.html

Merge pull request 'fix(web): stamp explicit incomplete/stop_reason instead of UI prose matching' (#96) from development_structured_incomplete_field into integration ... 432df99bdb

Reviewed-on: #96

fix: cargo update 1099dde49a

Merge branch 'integration' of ssh://forge.ourworld.tf/lhumina_code/hero_shrimp into integration f6980accd4

fix: fix auto approve checkbox 7229461621

ci: canonical lab-publish workflow (build main/development/integration) ... c0a4301db3

Publishes musl-x86_64 binaries to per-branch releases (latest,
latest-dev, latest-integration) and installs lab from the matching
hero_skills branch (clone + build via --branch). Triggers only on push
to these three branches.

ci: trigger lab-publish run 02f4ac677d

Merge remote-tracking branch 'origin' into int_fix_checkbox ... 81fc8c7156

rebasing to integration

Merge pull request 'int_fix_checkbox' (#103) from int_fix_checkbox into integration ... fb4f4a0ac4

Reviewed-on: #103

ci: lab-release workflow (prebaked lab-builder image) ... 6e3cce0b47

Replaces lab-publish.yaml with a single lab-release workflow that pulls the
prebaked lab-builder image and publishes per-branch releases (main=stable,
development/integration=pre-release). No per-run toolchain/lab install.

fix: auto approve added, toggle the mode from yolo added 15936ab603

fix: format 5d408f9c0d

Merge pull request 'int_auto_approve' (#108) from int_auto_approve into integration ... a6f795b9b8

Reviewed-on: #108

ci: canonical lab-release (cargo check + multi-arch + hero.releaser) 4dc1c739e5

feat(budget): make spend budget the sole run limiter ... fc129bf718

Remove agent step/iteration limiting entirely and make the spend budget
the only execution limiter:

- resolve_iteration_budget always returns an unbounded ceiling, so the
  agent loop (and subagents) are never stopped by an iteration count
- max_iterations/hard_max_iterations and the duplicate per-job budget
  fields (per_job_usd, per_job_max_calls, autonomy.job_budget_usd) are
  deprecated no-ops, still parsed for backward compatibility
- job.start refuses a run when no budget is configured (with the
  HERO_SHRIMP_BUDGET_OVERRIDE escape hatch); default.yml ships
  budget.daily_usd so runs stay bounded out of the box
- the per-call cap and the job-start gate read the live global config so
  a budget edited from the UI takes effect without a restart

#98

fix(budget): unbound subagents, enforce env/monthly cap, hide ceiling from prompt ... 523c4b0de2

#98

fix(budget): abort orphaned subagent task on wait timeout ... 8ecf63fdd8

#98

fix(budget): reword stale step-limit fallback message ... 22b303f0fd

#98

fix(web): save budget with the main settings Save button ... 79999bcb26

#98

style: cargo fmt 0574ea1d70

chore: drop local dev profile from Cargo.toml d10d45002b

fix(web): budget save dirty-guard, budget-stop shows raise-budget only ... 919b61724f

#98

Merge pull request 'feat(budget): make spend budget the sole run limiter' (#101) from development_unify_budget_limit into integration ... efcb9613aa

Reviewed-on: #101

fix(web): populate model select boxes from the configured catalog ... 809c092ef1

config.get now exposes a models array (alias, tier, ctx, caps) from the
global model catalog. The Settings modal per-phase model datalist and
the Crew hire-modal Model field are populated from it, with the old
hardcoded list kept only as a fallback. Free-text entry stays allowed.

#105

fix(web): replace model datalists with a combo-box dropdown showing the full catalog a9da576b1a

Merge pull request 'fix(web): populate model select boxes from the configured catalog' (#106) from integration_fix_model_select_boxes into integration ... d9ea8113fc

Reviewed-on: #106

fix: delegation 111cf713e8

fix: No crew agents are installed issue 4e1787f7f5

fix(runtime,web): route inline think tags into reasoning lane ... e467e6d3c8

#104

style: cargo fmt 4eba87403e

fix: formatting b49883a9e5

Merge pull request 'fix(runtime,web): route inline think tags into reasoning lane' (#109) from integration_hide_inline_think_tags into integration ... 06242d266d

Reviewed-on: #109

Merge pull request 'fix: auto-delegation to the crew + crew-chat visibility' (#110) from int_delegate_crew into integration ... ff37889875

Reviewed-on: #110

salmaelsoly changed title from merge integration into main to WIP: merge integration into main 2026-06-11 13:02:00 +00:00

salmaelsoly added 1 commit 2026-06-11 13:17:02 +00:00

Merge remote-tracking branch 'origin/main' into integration ... 7a24035997

# Conflicts:
#	Cargo.lock

salmaelsoly changed title from WIP: merge integration into main to merge integration into main 2026-06-11 13:17:45 +00:00

salmaelsoly changed title from merge integration into main to WIP: merge integration into main 2026-06-11 13:17:55 +00:00

mahmoud added 1 commit 2026-06-11 14:25:25 +00:00

ci: canonical-only lab-release (+cargo test); remove other workflows 5b6a42b746

thabeta added 2 commits 2026-06-11 20:02:10 +00:00

fix: steering 15705bf9e7

Merge pull request 'fix: steering' (#113) from int_steering into integration ... 19afd18e9f

Reviewed-on: #113

thabeta changed title from WIP: merge integration into main to merge integration into main 2026-06-11 20:02:32 +00:00

thabeta added 1 commit 2026-06-11 23:18:56 +00:00

fix(time_travel): make is_git_workspace hermetic against parent git repos ... 53899e11d2

Temp directories created by tests (e.g. under /tmp) were incorrectly
reported as git workspaces when a parent directory happened to be a git
repo. This caused git add -A to walk outside the intended workspace and
fail in CI/container environments.

Change is_git_workspace to require the directory itself to be the git
worktree root by comparing rev-parse --show-toplevel against the
canonical path.

thabeta added 1 commit 2026-06-11 23:33:43 +00:00

fix(config_cache): remove env-mutating tests that break parallel test isolation ... 169135f9d3

The shrimp_home tests mutated process-wide HOME/SHRIMP_HOME env vars,
which leaked into concurrently-running tests that resolve config paths.
This produced spurious 'Permission denied' failures when the suite ran
in parallel (the default).

Refactor shrimp_home to delegate to a pure helper that takes the env
values as arguments, and test the helper directly without touching the
process environment.

thabeta merged commit 2906d5418a into main 2026-06-11 23:37:24 +00:00

thabeta referenced this pull request from a commit 2026-06-11 23:37:27 +00:00

Merge pull request 'merge integration into main' (#111) from integration into main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

prio_critical

  

prio_low

  

type_bug

  

type_contact

  

type_issue

  

type_lead

  

type_question

  

type_story

  

type_task

No labels

prio_critical

prio_low

type_bug

type_contact

type_issue

type_lead

type_question

type_story

type_task

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

3 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

lhumina_code/hero_shrimp!111

No description provided.