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

..

__tests__

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

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

ai-routers.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.js

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

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

archive.js

refactor!: rebrand CCAM to AgentHub

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

cc-discovery.js

fix(cc-config): .claude.json sits BESIDE ~/.claude by default, not inside it

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

cc-mcp-cli.js

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

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

cc-mutate.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.js

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

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

cc-profiles.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.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

cc-update-all.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.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.js

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

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

ci-status.js

refactor!: rebrand CCAM to AgentHub

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

claude-home.js

refactor: finish the AgentHub rename and drop the MCP server

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

codex-cli.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-discovery.js

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

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

codex-home.js

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

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

codex-ingest.js

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

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

codex-mutate.js

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

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

codex-nudge.js

refactor!: rebrand CCAM to AgentHub

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

config-write.js

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

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

dashboard-runs.js

fix(runs): persist tmux-backed runs so a resumed session shows its own info

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

data-transfer.js

refactor!: rebrand CCAM to AgentHub

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

desktop-env.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

gh.js

fix(server): revert unnecessary gh.js env change from Task 4

2026-08-25 09:38:09 +07:00

git-credential-helper.js

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

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

git-credentials.js

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

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

git-diff.js

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

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

git-ops.js

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

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

lane-agents.js

refactor!: rebrand CCAM to AgentHub

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

lane-detect.js

refactor!: rebrand CCAM to AgentHub

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

lane-env.js

refactor!: rebrand CCAM to AgentHub

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

lane-features.js

fix(lanes): keep stage detection honest across rollbacks and feature switches

2026-09-03 15:29:08 +07:00

lane-file-write.js

feat(lanes): split panes on one lane, in-place file editing, hunk review bar

2026-09-24 15:49:39 +07:00

lane-gc.js

refactor!: rebrand CCAM to AgentHub

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

lane-lock.js

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

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

lane-mcp.js

fix(mcp): fall back to lane cwd when source_repo is null

2026-08-13 15:36:36 +07:00

lane-preflight.js

fix(lanes): removing a lane deletes its record only, never the worktree

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

lane-profile.js

refactor!: rebrand CCAM to AgentHub

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

lane-runtime.js

refactor!: rebrand CCAM to AgentHub

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

lane-services.js

refactor!: rebrand CCAM to AgentHub

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

lane-slots.js

refactor!: rebrand CCAM to AgentHub

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

lane-sync.js

refactor!: rebrand CCAM to AgentHub

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

lanes.js

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

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

named-lock.js

refactor!: rebrand CCAM to AgentHub

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

pipelines.js

refactor!: rebrand CCAM to AgentHub

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

plugin-update.js

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

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

ports.js

feat(lanes): per-lane database, Redis, and .env isolation (A1+A2)

2026-08-04 10:03:40 +07:00

pricing-constants.js

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

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

pricing-sync.js

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

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

project-memory.js

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

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

proof.js

refactor!: rebrand CCAM to AgentHub

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

pty-attach.js

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

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

pty-run.js

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

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

push.js

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

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

redoc.js

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

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

remote-sync.js

refactor!: rebrand CCAM to AgentHub

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

router-apply.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

same-origin.js

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

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

scoped-stats.js

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

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

secrets.js

refactor!: rebrand CCAM to AgentHub

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

security.js

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

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

self-restart.js

feat(updates): auto-apply and self-restart on new dashboard versions

2026-08-18 16:04:27 +07:00

server-info.js

chore: remove unused surfaces (VS Code extension, statusline, landing assets, Docker)

2026-09-10 13:44:28 +07:00

session-liveness.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

skill-plugins.js

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

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

skills-install.js

refactor!: rebrand CCAM to AgentHub

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

source-filter.js

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

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

stage-detect.js

fix(lanes): revive dead detect rules and stop alias-blind detection badges

2026-08-28 10:05:24 +07:00

tmux.js

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

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

token-usage.js

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

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

transcript-cache.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.js

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

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

webhook-providers.js

refactor!: rebrand CCAM to AgentHub

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

webhooks.js

refactor!: rebrand CCAM to AgentHub

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

workflow-ingest.js

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

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

worktree.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