nntrivi2001 1da46f10f4 feat(git): per-block conflict view with mine/theirs choices (#45) ...

Opening a conflicted file in the Changes panel now shows each conflict
block as its two sides, labelled from git's markers and tinted apart,
with Keep mine / Take theirs / Keep both per block (undoable, ^/v to
jump). Save and mark resolved writes the chosen text through the
whole-file editor's PUT /git/file (baseSha stale check) then runs
resolve done. The Merge conflicts group's buttons are text, and a
conflicted file is marked with a red ! in the Files tree.

Fix: ls-files --cached lists an unmerged path once per stage, so the
tree showed a conflicted file three times; lsFiles now dedupes.

2026-09-25 13:35:50 +07:00

..

agenthub-cli.test.js

test(cli): cover the doctor's tmux line

2026-09-11 15:20:30 +07:00

agents-legacy-rebuild.test.js

feat: Claude Code Monitor — lanes, pipelines and a merged workspace

2026-07-30 14:39:03 +07:00

ai-routers.test.js

feat(ai-router): test an endpoint before saving it, and re-point a live lane

2026-09-16 11:26:00 +07:00

alerts.test.js

fix(hooks): store a hook delivered twice only once

2026-09-23 09:18:17 +07:00

api.test.js

fix(dashboard): measure V8 heap against its limit, not its current size

2026-09-23 16:46:00 +07:00

awaiting-subagent-guard.test.js

feat: Claude Code Monitor — lanes, pipelines and a merged workspace

2026-07-30 14:39:03 +07:00

cc-config.test.js

fix(cc-config): MCP scope was inverted — expose user/local, not user/project

2026-09-09 09:36:52 +07:00

cc-discovery-helpers.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

cc-mcp-cli.test.js

fix(cc-config): MCP scope was inverted — expose user/local, not user/project

2026-09-09 09:36:52 +07:00

cc-mutate-containment.test.js

fix(cc-config): close the symlink write escape and the caller-chosen write target

2026-09-09 08:30:45 +07:00

cc-mutate-settings.test.js

feat(cc-config,lanes): per-profile quota, and three fixes that made a write look lost

2026-09-17 22:20:32 +07:00

cc-plugin-cli.test.js

fix(plugins): retry claude plugin install|update without -y on an old CLI

2026-09-23 16:46:20 +07:00

cc-profiles.test.js

feat(run,notifications,profiles): stop sending prompts nobody typed, and fix notification + profile delivery

2026-09-21 15:15:22 +07:00

cc-reload.test.js

fix(tmux,run,hooks): the four pre-existing bugs the #37 evaluation found

2026-09-25 11:30:02 +07:00

cc-update-all.test.js

feat(cc-config): update every plugin and marketplace at once, then reload the open sessions

2026-09-10 16:05:07 +07:00

cc-usage.test.js

fix(cc-config): read the live account's quota from the CLI, and ask for every account at once

2026-09-17 23:17:06 +07:00

cc-watcher.test.js

fix(cc-watcher): stop burning 65k inotify watches on the plugin cache

2026-09-07 08:32:19 +07:00

ci-status.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

claude-home-datadir.test.js

refactor: finish the AgentHub rename and drop the MCP server

2026-09-08 09:48:40 +07:00

client-dist-override.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

codex-cli.test.js

fix(codex): treat a literal null from the CLI as an empty list, not a 500

2026-09-09 01:29:17 +07:00

codex-config.test.js

fix(codex-config): close whole-branch review defects in the Codex panel

2026-09-09 01:17:06 +07:00

codex-discovery.test.js

fix(codex): backslash parity in the TOML closing-quote scan

2026-09-08 16:57:02 +07:00

codex-home.test.js

refactor(codex): give the CODEX_HOME lookup its own module

2026-09-08 16:24:17 +07:00

codex-ingest.test.js

feat(lanes): auto-advance a codex lane's stage from its rollout detection

2026-09-03 16:51:02 +07:00

codex-mutate.test.js

fix(codex-config): close whole-branch review defects in the Codex panel

2026-09-09 01:17:06 +07:00

codex-nudge.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

config-write.test.js

refactor(config): extract the safe-write primitives cc-mutate guards with

2026-09-08 16:17:48 +07:00

data-transfer.test.js

feat: Claude Code Monitor — lanes, pipelines and a merged workspace

2026-07-30 14:39:03 +07:00

desktop-env.test.js

feat(run,ui): make the lane console usable — terminal focus, live-exit recovery, auto permission mode, model aliases

2026-09-21 17:03:27 +07:00

env-scrub.test.js

fix(macos): scrub parent-session env, survive node upgrades and reboots, store lanes by real path (#22)

2026-09-25 11:23:59 +07:00

first-user-descriptor.test.js

feat: Claude Code Monitor — lanes, pipelines and a merged workspace

2026-07-30 14:39:03 +07:00

gh.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

git-credentials-route.test.js

feat(lanes): git login from the dashboard, merge and conflict resolution (#45)

2026-09-25 10:44:40 +07:00

git-credentials.test.js

feat(lanes): git login from the dashboard, merge and conflict resolution (#45)

2026-09-25 10:44:40 +07:00

git-diff-ops-hardening.test.js

fix(lanes,git): harden the lane git surface and fix client races in the Changes panel

2026-09-24 10:30:25 +07:00

git-diff-ops.test.js

fix(git,macos,runs): close the review findings on #22, #34 and #38

2026-09-25 11:26:31 +07:00

git-ops-auth.test.js

feat(lanes): git login from the dashboard, merge and conflict resolution (#45)

2026-09-25 10:44:40 +07:00

git-ops-merge.test.js

feat(git): per-block conflict view with mine/theirs choices (#45)

2026-09-25 13:35:50 +07:00

hook-handler.test.js

feat: Claude Code Monitor — lanes, pipelines and a merged workspace

2026-07-30 14:39:03 +07:00

import-correctness.test.js

feat: Claude Code Monitor — lanes, pipelines and a merged workspace

2026-07-30 14:39:03 +07:00

import-workflow-link.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

import.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

install-hooks.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

lane-agents.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

lane-data.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

lane-detect.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

lane-features-api.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

lane-features.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

lane-gc.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

lane-lifecycle.test.js

fix(tmux,run,hooks): the four pre-existing bugs the #37 evaluation found

2026-09-25 11:30:02 +07:00

lane-mcp.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

lane-profile.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

lane-runtime.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

lane-stage-events.test.js

fix(lanes,reload): count a pipeline run by declarations, and stop the two reload commands merging

2026-09-17 16:16:31 +07:00

lane-sync.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

lanes-api.test.js

fix(tmux,run,hooks): the four pre-existing bugs the #37 evaluation found

2026-09-25 11:30:02 +07:00

lanes-cli.test.js

feat(lanes,git): publish a repo with no remote, and read a repo with no commits

2026-09-25 11:21:30 +07:00

lanes-cwd-unique-rebuild.test.js

fix(db): keep router_profile through the legacy lanes rebuild

2026-09-25 11:30:10 +07:00

lanes-lib.test.js

fix(macos): scrub parent-session env, survive node upgrades and reboots, store lanes by real path (#22)

2026-09-25 11:23:59 +07:00

locks-api.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

metrics.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

named-lock.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

plugin-bootstrap.test.js

fix(macos): scrub parent-session env, survive node upgrades and reboots, store lanes by real path (#22)

2026-09-25 11:23:59 +07:00

plugin-doctor-runtime.test.js

feat(doctor): catch half-written installs, not just absent ones

2026-09-08 15:44:41 +07:00

plugin-doctor-skill-plugins.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

plugin-doctor-systemd.test.js

fix(bootstrap): self-heal a systemd unit left on a retired plugin root

2026-09-11 16:45:47 +07:00

plugin-doctor-tmux.test.js

docs: document the system prerequisites, and report tmux in both doctors

2026-09-11 10:44:10 +07:00

plugin-update.test.js

feat(updates): detect the newest release and self-apply it, including plugin installs

2026-09-10 16:03:07 +07:00

plugins-marketplace.test.js

fix(plugins): make the 10 focused plugins installable, finish the AgentHub rename

2026-09-10 11:03:14 +07:00

pricing-calc.test.js

feat(lanes,run,pricing): Changes sidebar editor, staged groups, image drop, auto pricing

2026-09-24 17:05:15 +07:00

pricing-intro-edit.test.js

feat: Claude Code Monitor — lanes, pipelines and a merged workspace

2026-07-30 14:39:03 +07:00

pricing-sync.test.js

feat(lanes,run,pricing): Changes sidebar editor, staged groups, image drop, auto pricing

2026-09-24 17:05:15 +07:00

project-memory.test.js

feat(config): create a new project's memory file from Settings

2026-09-09 01:45:00 +07:00

proof-api.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

proof.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

pty-attach.test.js

fix(tmux,run,hooks): the four pre-existing bugs the #37 evaluation found

2026-09-25 11:30:02 +07:00

pty-run.test.js

fix(tmux,run,hooks): the four pre-existing bugs the #37 evaluation found

2026-09-25 11:30:02 +07:00

push.test.js

feat: Claude Code Monitor — lanes, pipelines and a merged workspace

2026-07-30 14:39:03 +07:00

remote-sources.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

repo-links.test.js

feat(lanes,run,pricing): Changes sidebar editor, staged groups, image drop, auto pricing

2026-09-24 17:05:15 +07:00

router-apply.test.js

feat(settings): add AI Router profiles and attach one per lane

2026-09-14 16:04:57 +07:00

run.test.js

feat(lanes,run,pricing): Changes sidebar editor, staged groups, image drop, auto pricing

2026-09-24 17:05:15 +07:00

security.test.js

feat: Claude Code Monitor — lanes, pipelines and a merged workspace

2026-07-30 14:39:03 +07:00

server-info.test.js

refactor: finish the AgentHub rename and drop the MCP server

2026-09-08 09:48:40 +07:00

session-liveness.test.js

fix(macos): scrub parent-session env, survive node upgrades and reboots, store lanes by real path (#22)

2026-09-25 11:23:59 +07:00

session-name-rename.test.js

fix(hooks): store a hook delivered twice only once

2026-09-23 09:18:17 +07:00

session-sync-yield.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

session-sync.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

sessions-transcript-path-migration.test.js

feat: Claude Code Monitor — lanes, pipelines and a merged workspace

2026-07-30 14:39:03 +07:00

skill-plugins.test.js

test(cc-config): cover the env runClaudePlugin actually spawns with

2026-09-09 10:16:58 +07:00

skills-install.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

stage-detect.test.js

feat(skills,pipelines): ask the user at the two points being wrong is cheap, and stop paying for reviews the diff does not need

2026-09-18 10:21:03 +07:00

subagent-attribution.test.js

feat: Claude Code Monitor — lanes, pipelines and a merged workspace

2026-07-30 14:39:03 +07:00

subagent-cost-backfill.test.js

feat: Claude Code Monitor — lanes, pipelines and a merged workspace

2026-07-30 14:39:03 +07:00

subagent-cost.test.js

feat: Claude Code Monitor — lanes, pipelines and a merged workspace

2026-07-30 14:39:03 +07:00

systemd-service.test.js

fix(bootstrap): stop a retired plugin build from downgrading the dashboard

2026-09-15 10:30:00 +07:00

tmux.test.js

fix(tmux,run,hooks): the four pre-existing bugs the #37 evaluation found

2026-09-25 11:30:02 +07:00

token-baseline.test.js

feat: Claude Code Monitor — lanes, pipelines and a merged workspace

2026-07-30 14:39:03 +07:00

transcript-cache-bounded.test.js

feat: Claude Code Monitor — lanes, pipelines and a merged workspace

2026-07-30 14:39:03 +07:00

transcript-path-sweep.test.js

feat: Claude Code Monitor — lanes, pipelines and a merged workspace

2026-07-30 14:39:03 +07:00

transcript-sender.test.js

feat: Claude Code Monitor — lanes, pipelines and a merged workspace

2026-07-30 14:39:03 +07:00

turn-duration-dedup.test.js

fix(ingest,ui): count each assistant message once, each turn once, and each event once

2026-09-18 16:52:05 +07:00

update-check-plugin-nogit.test.js

fix(update-check): resolve the release URL for a relative plugin source

2026-09-14 13:10:16 +07:00

update-check-release.test.js

feat(updates): detect the newest release and self-apply it, including plugin installs

2026-09-10 16:03:07 +07:00

update-check.test.js

fix(tests): scrub GIT_* env vars leaking from the pre-commit hook into git-fixture tests

2026-08-12 09:24:03 +07:00

updates.test.js

feat(updates): detect the newest release and self-apply it, including plugin installs

2026-09-10 16:03:07 +07:00

webhooks.test.js

feat: Claude Code Monitor — lanes, pipelines and a merged workspace

2026-07-30 14:39:03 +07:00

websocket-pty-size.test.js

feat(run,ui): make the lane console usable — terminal focus, live-exit recovery, auto permission mode, model aliases

2026-09-21 17:03:27 +07:00

websocket-shutdown.test.js

refactor!: rebrand CCAM to AgentHub

2026-09-07 12:09:15 +07:00

workflow-api.test.js

feat: Claude Code Monitor — lanes, pipelines and a merged workspace

2026-07-30 14:39:03 +07:00

workflow-ingest.test.js

feat: Claude Code Monitor — lanes, pipelines and a merged workspace

2026-07-30 14:39:03 +07:00

workflow-transcript-resolution.test.js

feat: Claude Code Monitor — lanes, pipelines and a merged workspace

2026-07-30 14:39:03 +07:00

workflows-usage-api.test.js

fix(lanes): count every pipeline run, not one per lane

2026-09-09 15:32:09 +07:00

worktree.test.js

feat(lanes): reorder and rename lane cards, and show each file's line delta

2026-09-17 15:07:37 +07:00