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

Part A — a fetch/pull/push against a remote that needs a login no longer
dies on "terminal prompts disabled": the server answers 409 EGITAUTH with
the host, the git bar asks for a username + password/access token and
resends the same action. AgentHub keeps its OWN credential store
(<CLAUDE_HOME>/agenthub-git-credentials/, 0700/0600), one login per host,
shared by every user of the install, managed from Settings -> Git
credentials. A login is only sent to one of the repo's own remote hosts,
saved only after git accepted it, never returned by any route, and reaches
git through an exclusive credential helper (never argv).

Part B — merge a branch (or the diverged upstream) from the git bar; a
merge that stops on conflicts lists them in the Changes panel with Keep
mine / Take theirs / Mark resolved, then Complete merge or Abort merge
(confirm gate). Clean tree, repo-root lane and an existing ref only;
pull/switch/hunk actions are blocked mid-merge; staging a conflicted file
with markers left is refused. Rebase/reset/stash stay out.

This commit is contained in:

nntrivi2001

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

parent 605ca9d65e

commit f514602697

30 changed files with 2005 additions and 59 deletions

									
										server/lib/git-diff.js
									
		+1
		
												View File
												
				@@ -907,6 +907,7 @@ async function listTreeAll(dir) {

				module.exports = {

				  collectChanges,

				  CONFLICT_CODES,

				  contentSha,

				  isSecretOnDisk,

				  lanePath,