mirror of
https://github.com/runkids/skillshare.git
synced 2026-11-19 02:17:09 +00:00
* feat(mcp): sync portable server configuration across six clients
Add inline and external MCP sources with guided CLI and dashboard setup, native imports, conflict previews, ownership tracking, backups, and restore. Support Claude Code, Codex, Cursor, VS Code, OpenCode, and Grok CLI in global and project scopes.
Format YAML on save, document MCP fields in the config assistant, and keep its layout stable for scalar list items. Include schemas, localized UI copy, documentation, and regression and end-to-end coverage.
* fix(config): keep loading config when the MCP section is invalid
A mistake in the mcp section (an unknown key, a targets value that is
not a list, an invalid server field) made config.Load, LoadProject,
Save, SaveIn and ValidateConfig fail. Every command that reads config,
including skills sync, install, list and the dashboard, stopped working
because of settings it never uses.
MCPConfig now keeps a section that does not parse exactly as written and
records the error instead of returning it, so commands unrelated to MCP
load and save the config without touching that section. MCP commands
still validate their source on every run, and the dashboard config
editor calls the new ValidateMCP, so saving an invalid MCP section there
is still rejected.
Also correct the ProjectSources comment: sources.mcp resolves from the
directory containing config.yaml, not from the project root.
* fix(mcp): protect Agent files during concurrent edits and recovery
A release review of the MCP sync engine found ways it could lock users
out, report false conflicts, or change entries it does not own.
Recovery
- A failed write left pending.json behind, and every later MCP command
refused to run. Failed writes now remove their journal, and a journal
whose Agent file changed again is discarded, because ownership hashes
still flag entries that no longer match.
- Preview no longer writes. It reads the ownership that recovery will
record, byte for byte, so a preview stays valid across the recovery
that the next write performs under the lock.
Concurrent Agent writes
- Claude Code rewrites ~/.claude.json on its own, so hashing whole files
expired previews and failed applies. Revisions and pre-write checks
now cover only the MCP entries, and apply rereads each file and applies
the previewed entry edits to its current content, keeping settings the
Agent wrote after the preview.
Comparison and ownership
- Only fields Skillshare renders are hashed, after dropping defaults
Agents add or omit (type stdio/http, empty env, args or headers,
enabled: true) and header name case, so equivalent entries are not
reported as drift. enabled and disabled are compared, so turning off a
managed server is a conflict instead of being overwritten.
- An unmanaged entry that already matches the source is reported as
unchanged but no longer claimed, so removing the server never deletes
an entry the user wrote. Import adopts it explicitly, and without
--replace refuses to rewrite a differing entry, such as a literal token
that import turned into an environment reference.
- Sync keeps Agent-only fields such as timeouts in existing entries.
Import
- Agent-only fields become warnings instead of blocking the import.
- streamable-http is accepted, and enabled/disabled flags are checked
for every client.
- Values carrying a URL password, such as database DSNs, become
environment references, and credential-like arguments are flagged.
Writes and state
- Save only renders the definition first, so a server that could never
sync, such as one without targets, is rejected before it is saved.
- A symlinked config.yaml is written through to its target.
- TOML entries are updated in place, keep CRLF line endings, and repeated
add/remove cycles no longer grow blank lines.
- JSON edits no longer HTML-escape characters such as &.
- GROK_HOME is honored.
- Backups keep the newest 20 per Agent file, pruned by file name, and
damaged backup files are skipped instead of failing the list.
- GET /api/mcp no longer fails when an Agent that no server uses has an
unresolvable path.
* feat(mcp): detect the client format of pasted JSON
Import without --from, the add wizard and the dashboard import API
assumed Claude's mcpServers shape unless a client was named, so VS Code
"servers" and OpenCode "mcp" snippets copied from server docs failed to
import. The client is now chosen by the top-level key, and a bare server
object still reads as Claude's single-entry shape.
TOML stays explicit because Codex and Grok share the format; a .toml
file without --from is still read as Codex.
* refactor(mcp): print CLI results through internal/ui
MCP commands wrote plain fmt output and duplicated statusFromErr, unlike
every other command. Plans, backup IDs and save/apply messages now use
the shared ui helpers, so they get the standard status prefixes and
colors; each change line shows the server name, action and target. The
operation log uses statusFromErr. --json output is unchanged.
* fix(server): serve MCP settings only to localhost or IP hosts
MCP settings include stdio commands that Agents execute, so a web page
must not be able to read or change them. The existing Origin check does
not stop DNS rebinding: once an attacker's domain resolves to 127.0.0.1,
the browser sends that domain as both Origin and Host from a loopback
address, and the dashboard also binds 0.0.0.0 in Docker.
Rebinding always needs a domain name, so every MCP route now also
requires a Host that is localhost or an IP literal, whatever the bind
address. Other dashboard routes are unaffected. Opening the dashboard
through a domain name, including a reverse proxy, therefore returns 403
for MCP settings; the message says to use localhost or an IP address,
because rewriting Host at the proxy would still fail the Origin check
and would reopen the hole.
Remove the unused POST /api/mcp/sync endpoint. Configuring with sync
covers it, and the guard wraps every remaining MCP route.
* fix(sync): make sync --all report MCP results reliably
- "sync -g mcp" and "sync --dry-run mcp" ran skills sync, because mcp
was only recognized as the first argument. It now matches in any
position.
- sync --all --json printed plain-text errors when the MCP preflight
failed, and only an error on conflicts. Preflight errors now use the
JSON error shape, and conflicts also return the credential-free plan so
scripts can see which entries conflict.
- When resource sync failed, MCP was skipped without notice. Text output
now warns that MCP settings were not applied; JSON output omits the mcp
field, which --all otherwise always includes.
- MCP was applied with the preflight revision, which failed whenever the
resource sync changed config or state in between. It is now planned
again under the MCP lock, and conflicts found then still stop the
write.
* fix(sync): recognize agents and extras after flags
sync only checked the first argument for a resource kind, so
"sync --dry-run agents" and "sync -g extras" silently synchronized
skills instead. Sync flags take no values, so the kind now matches in
any position.
The shared parseKindArg keeps its first-argument rule: uninstall, update
and similar commands accept resource names, and a name such as "agents"
must not be read as a kind.
* feat(ui): redesign the MCP dashboard around a server-by-agent matrix
The MCP page listed servers and planned changes as flat text, which made
it hard to see where each server is written and what needs attention.
- A matrix shows each server's status per Agent, summarizes pending
changes and conflicts, and can hide synced entries. Agents whose MCP
file or config directory exists are marked as detected; GET /api/mcp
now returns the detected clients.
- Setup is a two-step dialog: add a remote URL, paste JSON or TOML, or
import from an Agent, then preview which Agent files change. Importing
an entry the Agent already has adopts it, Replace overrides only that
entry, and a target selection equal to the inherited mcp.targets is
saved without pinning targets on the server.
- Conflicts explain their cause and offer Import from <agent> or
Replace. Removal lists the affected Agent files and offers removing
from the source only or removing and syncing. Backups are grouped by
day, with a preview before restoring a file.
- Agent icons appear on the MCP and Targets pages, and the universal
target is marked as a path shared across agents. Brand icons come from
@lobehub/icons-static-svg, with bundled SVGs for Warp and Zed.
- Segmented controls wrap instead of overflowing narrow containers.
- New copy is translated for every supported locale.
* fix(ui): let Sync all apply MCP after syncing resources
Sync all previewed MCP, synced skills, agents and extras, then applied
MCP with the revision from the first preview. When the resource sync
changed config or state, that revision was stale and MCP failed with
"preview again" after everything else had already been synced.
MCP is now rechecked before and after the resource sync by comparing the
reviewed changes (target, name and action) instead of the revision, and
applied with the fresh revision. A different set of changes still stops
before any MCP file is written.
* fix(ui): keep flow-style YAML collections when saving config
Formatting on save forced every collection into block style, so a
hand-written "targets: [claude, codex]" was expanded into a list each
time the config was saved. Each collection now keeps its flow or block
style, indentation is still normalized and comments are preserved, and
flow collections are not padded with spaces.
* docs(mcp): document ownership, normalization and dashboard host rules
- Explain that matching entries stay unmanaged until imported, so
removing a server leaves them in place, and that import adopts an
identical entry while --replace rewrites a differing one.
- Note that Agent defaults and header case are not treated as changes,
that disabling a managed server is a conflict, and that previews stay
valid while an Agent rewrites unrelated settings.
- Describe Agent-specific fields, streamable-http, GROK_HOME, backup
retention, recovery by the next MCP write, and the VS Code limitation
on environment references in headers.
- Document that MCP settings require opening the dashboard by localhost
or an IP address, with SSH port forwarding for remote machines.
- Update the built-in skill for all six clients and the adoption rule,
and the MCP runbook for import refusal, Agent-specific fields and
pulled changes.
* docs(skill): streamline guidance and refresh resource workflows
Keep the built-in skill entrypoint focused and route agent and MCP details to dedicated references. Correct scope, audit, automation, and recovery guidance against the current CLI.
* feat(ui): redesign the dashboard around two styles and a flatter layout
The dashboard had grown page by page, so the same idea looked different
depending on where you met it and pages held controls with nothing to act on.
This rebuilds it on one token set that drives both the Clean and Playful styles
in light and dark, and reshapes the pages around what a person actually does.
Notable changes:
- MCP: replace the server-by-agent matrix with one row per server. The agents a
server writes to are chips inside the row, so the list grows downwards as more
CLIs gain MCP support instead of scrolling sideways.
- Settings: collect General, Backup, Log, Health, Extensions and Files into one
page. The Files tab keeps a panel beside the editor showing what the field
under the cursor does, the file's shape, or the unsaved changes.
- Audit rules: the YAML editor gets the same panel, plus a Test tab that runs a
rule's regex against pasted lines.
- Skills and Agents become separate pages; install, search, updates and trash
move into them. Old routes redirect.
- Tour: rewrite every step's copy, add MCP and Install steps, and anchor each
step to a control that is always rendered so no step silently times out.
- Give every button a pointer cursor; the browser default does not say a button
is clickable and each component class had to opt in by hand.
Docs follow the new Settings tabs and the MCP list.
* chore(devcontainer): move dev servers to uncommon ports
5173, 19420 and 8888 are defaults that other projects on the same
machine already hold, so `make devc` failed to bind and the container
never started. Use 45173, 49420 and 48888 instead, identical inside and
outside the container so every banner, log and doc prints the URL that
actually works.
* feat(ui): link dashboard source counts to their pages
The counts in the playful dashboard's source note named a number but led
nowhere, so reaching Skills or MCP from there meant going back to the
sidebar. Each row is now a link to its own page.
The hover fill uses currentColor because .ss-pinnote.src overrides the ink
tokens for the yellow note.
* feat(ui): build and browse hubs from the dashboard
A hub is a JSON index that lists skills, and until now the web UI could
only consume one someone else had already hosted. Writing the index by
hand was the only way to produce one, and the two halves never met: the
dialog that searched hubs and the page that would have built one shared a
config file but nothing else.
The new /hubs page holds both halves behind two tabs:
Browse pick a hub, filter its contents by tag or text, install from it
without leaving the page
My hubs assemble an index from installed skills, validate it, export it
A draft is offered as a source in Browse straight away, read from the
draft API rather than a file, so you can see what a recipient sees before
deciding whether to host anything. Where the index is hosted is stored on
the draft and stripped from the exported document, so a reopened hub
remembers where it was published and the published file stays clean.
Hub management moves out of the install dialog, which keeps only the
search-source dropdown and links here.
Routing switches to createBrowserRouter for useBlocker, which guards the
builder against navigating away from unsaved entries.
* docs(extras): add shared instructions recipe for AGENTS.md across agents
Answers a recurring question about sharing one instruction file between AI
agents: extras already covers it, since each agent keeps its user-level
copy in its own directory and one extra can target all of them.
Naming the source file AGENTS.md rather than something neutral matters —
Codex concatenates AGENTS.md files and has no import syntax, so it only
recognises the file by name. Claude Code and Antigravity read a fixed
filename of their own but resolve @-imports, so a one-line CLAUDE.md or
GEMINI.md picks up the synced file.
Says plainly that this is not agent memory. Agents keep their own
learnings in private stores — a Markdown directory for Claude Code, a
database for Codex, non-file storage for Cursor — so that side is a
migration problem, not something syncing files can solve.
* feat(ui): filter skills and agents by target
The Targets column showed which targets a resource reaches, but there was
no way to narrow the list down to one. The filter reads the sync matrix —
the same source that column renders — so a result always matches the icons
the rows show.
Options and counts are derived from the matrix, so no target is offered
that would filter to nothing, and the control stays hidden until at least
two targets have something. A selected target that disappears on a kind
switch or an uninstall falls back to All rather than emptying the list.
The toolbar had 24px to spare at 1440px, so the new control wrapped the
row. Source moves from a 325px segmented control to a dropdown like its
neighbours, and every filter now sizes to its label instead of a fixed
width that truncated the longer values.
* fix(ui): tighten page headers and reach hubs from skills
PageHeader carried mb-7 while .ss-wrap already separates its children with a
28px flex gap. Margins and flex gaps add up rather than collapse, so every
page inside the wrapper opened with a 56px hole under its title. Move the
default onto .ss-pgh so the wrapper can zero it, keeping the 28px for pages
that lay out their own children.
Hubs is a source you install from and a catalog you publish, not inventory
you own, so it no longer sits in the Library group next to Skills, Agents and
Plugins. The Skills page header already links to it and the page already
carries a back link there. Skills stays highlighted while the hub page is
open. Plugins takes the Package icon its own page identifies with, so the
sidebar no longer shows two identical puzzle pieces.
* fix(skill): stop implement-feature from running --no-tui as a command
The dispatch-order note wrote "not --no-tui" as !`--no-tui`. In a skill file
that is the syntax for running a shell command at load time, so the skill died
with "command not found: --no-tui" before any of it could be read. Spell the
condition out in words instead.
* feat(list): toggle model invocation for a skill with M
The only cheap gesture in the list TUI was E, which hides a skill from every
harness. Wanting a skill installed but not auto-loaded meant leaving the TUI
to edit SKILL.md, so people disabled skills they only meant to make
manual-only. M flips disable-model-invocation in place and the detail panel
shows a "manual only" badge so the state is never a blind toggle.
Unlike E this edits the skill file, which upstream may own: update skips
tracked repos with local changes, and reinstalling a skill drops the edit. M
says so and asks before writing in those cases. The flag is written as a
single-line edit rather than a YAML round-trip, and turning it back off
removes the line, so two presses return the file byte for byte and a tracked
repo is clean again. Agents are left alone; their harnesses do not read the key.
Refs #283
* feat(plugin): manage complete plugins across agent tools
Add CLI, TUI, and web flows for discovery, adoption, sync selection, updates, and removal while preserving native package formats and unrelated installations.
Support Claude, Codex, Cursor, Antigravity desktop, Pi, and OpenCode. Update help, completions, built-in skill, and documentation; keep plugins outside sync --all.
* docs(skill): describe the redesigned dashboard in the style skill
The style skill still documented the pre-redesign hand-drawn system, so
pages written with it came out on legacy tokens and outside the ss-*
classes; the new Plugins page was the first casualty.
The rewrite names tokens and classes and points to components.css for
their values, because copied values are what went stale last time. The
ui command docs described Playful by the old look as well.
* fix(ui): keep Playful ghost buttons free of stray shadows
The hover and disabled rules outranked the ghost variant's
box-shadow: none, so a frameless button grew a lone shadow arc in
Playful. Bulk toolbar and toast buttons shared the problem.
Ghost also gets a soft outline in Playful: beside 2px ink frames a bare
label such as Cancel did not read as a button.
* refactor(ui): lay out the Plugins page like the MCP page
The page was built on legacy tokens and plain markup, so it missed the
Playful frames and drifted from every other page. A per-agent column
layout would not have scaled either: each agent that gains plugin
support would add a column.
Plugins now follow the MCP server list: one row per plugin with its
agents as toggles inside the row, so the list only grows downwards.
Per-agent sync and update move to package-level actions in the row
menu, and the dialogs use the standard header, body and footer.
* feat(ui): give plugins a kind colour and per-agent actions
Plugins borrowed a neutral grey tile because no kind colour existed,
which made them the one resource without an identity on the page.
Magenta sits furthest from the five hues already taken.
Laying plugins out as rows had dropped the per-agent sync and update.
Retrying one agent after a partial failure should not re-run the rest,
so each agent in the expanded row gets its own menu. Update is left out
for a deselected agent, which has nothing installed to update.
* feat(ui): count plugins on the Dashboard
The source summary listed every resource kind except plugins, so the
Dashboard under-reported what a source holds. The Playful source note
grows to fit a fifth row.
MCP now sits above Plugins in the sidebar to match that order, and its
Dashboard label reuses the sidebar's "MCP" instead of a longer string
of its own.
* feat(scripts): add a host verification environment
Plugin and MCP work talks to the real Agent CLIs, and those live on the
host, not in the devcontainer, where every target reports "not installed".
Verifying by hand meant either pointing a build at real config or
assembling a dozen environment variables each time.
`make verify` builds a host binary and runs it against .verify-home/ in
the repo, redirecting HOME, the XDG dirs and each agent's own config
variable. The environment starts from `env -i`, so a stray
SKILLSHARE_CONFIG in the caller's shell cannot pull the run back to real
paths. Living inside the repo is safe because project-mode detection
only inspects the working directory and never walks up to a parent.
It also seeds the dashboard cache from ui/dist. A dev build serves a
placeholder rather than the working tree, because runtime download only
applies to numbered versions, so the UI was previously unverifiable
without a release.
* fix(ui): show progress while a plugin selection is applied
Toggling an agent shells out to that agent's own CLI, which takes
seconds. The row gave no sign of it: the toggle only greyed out, and
the confirmation badge is hidden while a target is deselected, so
turning one on looked like nothing happened at all.
The toggle being applied now lifts out of the greyed state and spins in
its badge. Agent versions also get room for their real strings, since
"2.1.276 (Claude Code)" was truncated to a width chosen for a bare
version number.
verify.sh gains a 'run' subcommand, so the same throwaway environment
can be driven from a script rather than only an interactive shell.
* fix(ui): spin the control that started a plugin action
Reading the inventory shells out to six agent CLIs and takes about two
and a half seconds, and every action refreshes it afterwards. Nothing on
the page said so: a menu action closed the menu and left the page still,
so the wait read as a freeze.
Each control now tracks its own work. Check, sync and import spin in
place, a menu action spins the row it acts on, and the agents refresh
follows the query itself rather than the mutation flag.
* feat(ui): split MCP add and import by where the configuration comes from
"Import from a target" opened a dialog whose second tab pasted a snippet,
which is not a target and usually comes from a provider's setup page rather
than a tool the user already configured. Pasting is a way to add a server,
so it moves under "Add server" beside the form, and importing now means one
thing: read what an installed Agent already has.
The paste side gains a file picker, matching `mcp import --file`; the API
only ever took content, so the browser reads the file and fills the editor.
The target picker no longer waits for a successful parse, and a footer that
said "writes 0 config files" next to a greyed-out button now names what is
missing instead.
* fix(ui): label the plugins result strip as the last action
The strip and the plugin inventory below it used the same list styling with
no heading on either, so two rows carrying the same plugin name read as one
list. The status word made it worse: "imported" is one of the outcomes
lifecycle.go returns for an action, but it sat where an inventory row shows
state, so it looked like a property of the plugin.
Give it the section heading the Agents list already has, plus a count and a
dismiss button, so it reads as the report it is.
* feat(plugins): expand compatibility and clarify setup guidance
Support additional native targets, safe source links, Git refs, and explicit OpenCode entries while exposing per-target capabilities across CLI, TUI, and UI.
Separate unsupported integrations from environment errors, explain next steps in plain language, and link official documentation. Update built-in guidance, website docs, completions, and regression coverage.
* feat(plugin): serve a plugin's files and translatable discovery problems
The dashboard could only show a plugin's name and targets, so reviewing
what a plugin ships meant opening the snapshot by hand. Files and
ReadFile expose the reviewed local copy read-only through os.OpenRoot,
which keeps reads inside the snapshot even across symlinks.
Discovery problems now carry a key and arguments next to the English
sentence, so the dashboard can translate them while the CLI keeps its
wording. Inventory asks every Agent CLI in parallel and Packages answers
from config alone, so the plugin list no longer waits on the slowest CLI.
* feat(mcp): sync to Pi, show native config, and lay out written entries
Pi has no built-in MCP support, so a server targeting it must name the
third-party extension that will read the file. `--pi-extension` and the
`piExtension` source field record that choice, and sync writes the file
format of the chosen package instead of guessing.
RenderNative and POST /api/mcp/render return what each Agent would
receive for a definition, with secrets kept as references, so the
dashboard can show the result before anything is written.
Sync used to insert entries on a single line and never revisit them. A
managed entry that still sits on one line is now reported as an update
and rewritten one field per line; entries formatted by hand are left
alone.
* feat(ui): choose plugin Agents like MCP, browse plugin files, view MCP config
The plugin fold listed bound Agents with a per-Agent menu, while MCP let
you simply tick the Agents you want. Plugins now work the same way: the
fold discovers where the source can also go, shows those Agents as
unticked toggles, and a tick previews an install. The per-Agent menu is
gone, and updating a plugin targets only the Agents that support it
instead of hiding the action when one of them does not.
A plugin with a local copy can be browsed in a read-only files dialog,
using the same tree as a skill's Files tab. The MCP "view config" moved
out of a fold in the server form into its own view, reachable from the
server menu, so the native result has room to be read. The MCP dialogs
also ask for the Pi extension when Pi is selected.
Playful tile names drop from 25px to 22px: "brainstorming" was 1px wider
than the tile and lost its last letter to the next line.
* docs: reshoot dashboard screenshots for the redesigned UI
The README and website still showed the pre-redesign dashboard, which no longer matches what users see after upgrading.
* docs: describe MCP, plugins and the new dashboard for v0.21.0
The README still announced v0.20.0 and never mentioned plugins, and its
MCP section listed four clients. The built-in skill and the docs pick up
the Pi extension setup, the formatting-only MCP update, and the plugin
fold and files dialog, so agents and users are not surprised by them.
1060 lines
30 KiB
Go
1060 lines
30 KiB
Go
package git
|
|
|
|
import (
|
|
"bufio"
|
|
"bytes"
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"os/exec"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"skillshare/internal/install"
|
|
)
|
|
|
|
// DiffStats holds git diff statistics
|
|
type DiffStats struct {
|
|
FilesChanged int `json:"filesChanged"`
|
|
Insertions int `json:"insertions"`
|
|
Deletions int `json:"deletions"`
|
|
}
|
|
|
|
// CommitInfo holds a single commit info
|
|
type CommitInfo struct {
|
|
Hash string `json:"hash"`
|
|
Message string `json:"message"`
|
|
}
|
|
|
|
// UpdateInfo holds info about changes from an update
|
|
type UpdateInfo struct {
|
|
Commits []CommitInfo
|
|
Stats DiffStats
|
|
UpToDate bool
|
|
BeforeHash string
|
|
AfterHash string
|
|
}
|
|
|
|
// ErrNoRemoteBranches indicates the origin remote currently has no branches.
|
|
var ErrNoRemoteBranches = errors.New("no remote branches found")
|
|
|
|
// GetCurrentHash returns the current HEAD hash (short)
|
|
func GetCurrentHash(repoPath string) (string, error) {
|
|
cmd := exec.Command("git", "rev-parse", "--short", "HEAD")
|
|
cmd.Dir = repoPath
|
|
out, err := cmd.Output()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return strings.TrimSpace(string(out)), nil
|
|
}
|
|
|
|
// GetCurrentFullHash returns the current HEAD hash (full 40-char).
|
|
func GetCurrentFullHash(repoPath string) (string, error) {
|
|
cmd := exec.Command("git", "rev-parse", "HEAD")
|
|
cmd.Dir = repoPath
|
|
out, err := cmd.Output()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return strings.TrimSpace(string(out)), nil
|
|
}
|
|
|
|
// ResetHard resets the working tree to the given revision.
|
|
func ResetHard(repoPath, rev string) error {
|
|
cmd := exec.Command("git", "reset", "--hard", rev)
|
|
cmd.Dir = repoPath
|
|
return cmd.Run()
|
|
}
|
|
|
|
// Fetch runs git fetch
|
|
func Fetch(repoPath string) error {
|
|
return FetchWithEnv(repoPath, nil)
|
|
}
|
|
|
|
// FetchWithEnv runs git fetch with additional environment variables.
|
|
func FetchWithEnv(repoPath string, extraEnv []string) error {
|
|
cmd := exec.Command("git", "fetch")
|
|
cmd.Dir = repoPath
|
|
if len(extraEnv) > 0 {
|
|
cmd.Env = append(os.Environ(), extraEnv...)
|
|
}
|
|
return cmd.Run()
|
|
}
|
|
|
|
// GetCommitsBetween returns commits between two refs
|
|
func GetCommitsBetween(repoPath, from, to string) ([]CommitInfo, error) {
|
|
cmd := exec.Command("git", "-c", "color.ui=false", "log", "--oneline", from+".."+to)
|
|
cmd.Dir = repoPath
|
|
out, err := cmd.Output()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
lines := strings.Split(strings.TrimSpace(string(out)), "\n")
|
|
var commits []CommitInfo
|
|
for _, line := range lines {
|
|
if line == "" {
|
|
continue
|
|
}
|
|
parts := strings.SplitN(line, " ", 2)
|
|
if len(parts) == 2 {
|
|
commits = append(commits, CommitInfo{
|
|
Hash: parts[0],
|
|
Message: parts[1],
|
|
})
|
|
}
|
|
}
|
|
return commits, nil
|
|
}
|
|
|
|
// GetDiffStats returns diff statistics between two refs
|
|
func GetDiffStats(repoPath, from, to string) (DiffStats, error) {
|
|
cmd := exec.Command("git", "diff", "--shortstat", from+".."+to)
|
|
cmd.Dir = repoPath
|
|
out, err := cmd.Output()
|
|
if err != nil {
|
|
return DiffStats{}, err
|
|
}
|
|
|
|
return parseDiffStats(string(out)), nil
|
|
}
|
|
|
|
// parseDiffStats parses git diff --shortstat output
|
|
// Example: " 5 files changed, 120 insertions(+), 30 deletions(-)"
|
|
func parseDiffStats(output string) DiffStats {
|
|
stats := DiffStats{}
|
|
output = strings.TrimSpace(output)
|
|
if output == "" {
|
|
return stats
|
|
}
|
|
|
|
parts := strings.Split(output, ", ")
|
|
for _, part := range parts {
|
|
part = strings.TrimSpace(part)
|
|
if strings.Contains(part, "file") {
|
|
stats.FilesChanged = extractNumber(part)
|
|
} else if strings.Contains(part, "insertion") {
|
|
stats.Insertions = extractNumber(part)
|
|
} else if strings.Contains(part, "deletion") {
|
|
stats.Deletions = extractNumber(part)
|
|
}
|
|
}
|
|
return stats
|
|
}
|
|
|
|
func extractNumber(s string) int {
|
|
var numStr string
|
|
for _, c := range s {
|
|
if c >= '0' && c <= '9' {
|
|
numStr += string(c)
|
|
} else if numStr != "" {
|
|
break
|
|
}
|
|
}
|
|
n, _ := strconv.Atoi(numStr)
|
|
return n
|
|
}
|
|
|
|
func runGitWithProgress(repoPath string, args []string, extraEnv []string, onProgress func(string)) error {
|
|
cmd := exec.Command("git", args...)
|
|
cmd.Dir = repoPath
|
|
if len(extraEnv) > 0 {
|
|
cmd.Env = append(os.Environ(), extraEnv...)
|
|
}
|
|
|
|
tokenAuth := install.UsedTokenAuth(extraEnv)
|
|
|
|
if onProgress == nil {
|
|
var stderr bytes.Buffer
|
|
cmd.Stderr = &stderr
|
|
if err := cmd.Run(); err != nil {
|
|
return install.WrapGitError(stderr.String(), err, tokenAuth)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
stderrPipe, err := cmd.StderrPipe()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err := cmd.Start(); err != nil {
|
|
return err
|
|
}
|
|
|
|
var allStderr strings.Builder
|
|
captureProgress := func(line string) {
|
|
allStderr.WriteString(line)
|
|
allStderr.WriteByte('\n')
|
|
onProgress(line)
|
|
}
|
|
if scanErr := streamGitProgress(stderrPipe, captureProgress); scanErr != nil {
|
|
_ = cmd.Wait()
|
|
return scanErr
|
|
}
|
|
if err := cmd.Wait(); err != nil {
|
|
return install.WrapGitError(allStderr.String(), err, tokenAuth)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func streamGitProgress(stderr io.Reader, onProgress func(string)) error {
|
|
scanner := bufio.NewScanner(stderr)
|
|
scanner.Buffer(make([]byte, 0, 64*1024), 1024*1024)
|
|
scanner.Split(scanGitProgress)
|
|
|
|
for scanner.Scan() {
|
|
line := strings.TrimSpace(scanner.Text())
|
|
if line != "" {
|
|
onProgress(line)
|
|
}
|
|
}
|
|
return scanner.Err()
|
|
}
|
|
|
|
func scanGitProgress(data []byte, atEOF bool) (advance int, token []byte, err error) {
|
|
for i, b := range data {
|
|
if b == '\n' || b == '\r' {
|
|
return i + 1, data[:i], nil
|
|
}
|
|
}
|
|
if atEOF && len(data) > 0 {
|
|
return len(data), data, nil
|
|
}
|
|
return 0, nil, nil
|
|
}
|
|
|
|
// Pull runs git pull and returns update info (quiet mode)
|
|
func Pull(repoPath string) (*UpdateInfo, error) {
|
|
return PullWithEnv(repoPath, nil)
|
|
}
|
|
|
|
// PullWithAuth runs git pull with token auth env inferred from origin remote.
|
|
func PullWithAuth(repoPath string) (*UpdateInfo, error) {
|
|
return PullWithEnv(repoPath, AuthEnvForRepo(repoPath))
|
|
}
|
|
|
|
// PullWithProgress runs git pull and optionally streams progress lines to
|
|
// onProgress when non-nil.
|
|
func PullWithProgress(repoPath string, extraEnv []string, onProgress func(string)) (*UpdateInfo, error) {
|
|
info := &UpdateInfo{}
|
|
|
|
beforeHash, err := GetCurrentFullHash(repoPath)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
info.BeforeHash = beforeHash
|
|
|
|
args := []string{"pull", "--quiet"}
|
|
if onProgress != nil {
|
|
args = []string{"pull", "--progress"}
|
|
}
|
|
if err := runGitWithProgress(repoPath, args, extraEnv, onProgress); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
afterHash, err := GetCurrentFullHash(repoPath)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
info.AfterHash = afterHash
|
|
|
|
if beforeHash == afterHash {
|
|
info.UpToDate = true
|
|
return info, nil
|
|
}
|
|
|
|
commits, _ := GetCommitsBetween(repoPath, beforeHash, afterHash)
|
|
info.Commits = commits
|
|
|
|
stats, _ := GetDiffStats(repoPath, beforeHash, afterHash)
|
|
info.Stats = stats
|
|
|
|
return info, nil
|
|
}
|
|
|
|
// PullWithEnv runs git pull and returns update info (quiet mode) with
|
|
// additional environment variables.
|
|
func PullWithEnv(repoPath string, extraEnv []string) (*UpdateInfo, error) {
|
|
return PullWithProgress(repoPath, extraEnv, nil)
|
|
}
|
|
|
|
// FileChange describes a single file change between two git revisions.
|
|
type FileChange struct {
|
|
Status string // A=added, M=modified, D=deleted, R=renamed
|
|
Path string
|
|
OldPath string // non-empty for renames
|
|
LinesAdded int
|
|
LinesDeleted int
|
|
}
|
|
|
|
// GetChangedFiles returns file-level changes between two revisions.
|
|
// Uses NUL-delimited output (-z) for safe handling of special filenames.
|
|
func GetChangedFiles(repoPath, from, to string) ([]FileChange, error) {
|
|
// Get name-status with NUL delimiter
|
|
statusCmd := exec.Command("git", "diff", "--name-status", "-z", "-M", from+".."+to)
|
|
statusCmd.Dir = repoPath
|
|
statusOut, err := statusCmd.Output()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Get numstat with NUL delimiter
|
|
numCmd := exec.Command("git", "diff", "--numstat", "-z", "-M", from+".."+to)
|
|
numCmd.Dir = repoPath
|
|
numOut, err := numCmd.Output()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Parse NUL-delimited name-status.
|
|
// Format: status\0path\0 (for A/M/D)
|
|
// Rxxx\0oldpath\0newpath\0 (for renames)
|
|
type statusEntry struct {
|
|
status string
|
|
path string
|
|
oldPath string
|
|
}
|
|
var entries []statusEntry
|
|
fields := strings.Split(string(statusOut), "\x00")
|
|
for i := 0; i < len(fields); {
|
|
s := fields[i]
|
|
if s == "" {
|
|
i++
|
|
continue
|
|
}
|
|
if strings.HasPrefix(s, "R") {
|
|
// Rename: status, oldpath, newpath
|
|
if i+2 >= len(fields) {
|
|
break
|
|
}
|
|
entries = append(entries, statusEntry{
|
|
status: "R",
|
|
oldPath: fields[i+1],
|
|
path: fields[i+2],
|
|
})
|
|
i += 3
|
|
} else {
|
|
// A, M, D, etc.: status, path
|
|
if i+1 >= len(fields) {
|
|
break
|
|
}
|
|
entries = append(entries, statusEntry{
|
|
status: s[:1],
|
|
path: fields[i+1],
|
|
})
|
|
i += 2
|
|
}
|
|
}
|
|
|
|
// Parse NUL-delimited numstat.
|
|
// Normal: added\tdeleted\tpath\0
|
|
// Rename: added\tdeleted\t\0oldpath\0newpath\0
|
|
// When -z is used, renames have an empty path field followed by NUL-separated old/new paths.
|
|
numMap := map[string][2]int{} // path -> [added, deleted]
|
|
numFields := strings.Split(string(numOut), "\x00")
|
|
for i := 0; i < len(numFields); {
|
|
record := numFields[i]
|
|
if record == "" {
|
|
i++
|
|
continue
|
|
}
|
|
parts := strings.SplitN(record, "\t", 3)
|
|
if len(parts) < 3 {
|
|
i++
|
|
continue
|
|
}
|
|
added, _ := strconv.Atoi(parts[0])
|
|
deleted, _ := strconv.Atoi(parts[1])
|
|
pathField := parts[2]
|
|
if pathField == "" {
|
|
// Rename: next two NUL-delimited fields are oldpath and newpath
|
|
if i+2 < len(numFields) {
|
|
newPath := numFields[i+2]
|
|
numMap[newPath] = [2]int{added, deleted}
|
|
i += 3
|
|
} else {
|
|
i++
|
|
}
|
|
} else {
|
|
numMap[pathField] = [2]int{added, deleted}
|
|
i++
|
|
}
|
|
}
|
|
|
|
var changes []FileChange
|
|
for _, e := range entries {
|
|
fc := FileChange{
|
|
Status: e.status,
|
|
Path: e.path,
|
|
OldPath: e.oldPath,
|
|
}
|
|
if nums, ok := numMap[e.path]; ok {
|
|
fc.LinesAdded = nums[0]
|
|
fc.LinesDeleted = nums[1]
|
|
}
|
|
changes = append(changes, fc)
|
|
}
|
|
|
|
return changes, nil
|
|
}
|
|
|
|
// IsDirty checks if repo has uncommitted changes
|
|
func IsDirty(repoPath string) (bool, error) {
|
|
cmd := exec.Command("git", "status", "--porcelain")
|
|
cmd.Dir = repoPath
|
|
out, err := cmd.Output()
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
return strings.TrimSpace(string(out)) != "", nil
|
|
}
|
|
|
|
// GetDirtyFiles returns list of modified files
|
|
func GetDirtyFiles(repoPath string) ([]string, error) {
|
|
cmd := exec.Command("git", "-c", "color.status=false", "status", "--short")
|
|
cmd.Dir = repoPath
|
|
out, err := cmd.Output()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
lines := strings.Split(strings.TrimSpace(string(out)), "\n")
|
|
var files []string
|
|
for _, line := range lines {
|
|
if line != "" {
|
|
files = append(files, line)
|
|
}
|
|
}
|
|
return files, nil
|
|
}
|
|
|
|
// Restore discards all local changes
|
|
func Restore(repoPath string) error {
|
|
cmd := exec.Command("git", "restore", ".")
|
|
cmd.Dir = repoPath
|
|
return cmd.Run()
|
|
}
|
|
|
|
// IsRepo checks if the directory is a git repository
|
|
func IsRepo(dir string) bool {
|
|
cmd := exec.Command("git", "rev-parse", "--git-dir")
|
|
cmd.Dir = dir
|
|
return cmd.Run() == nil
|
|
}
|
|
|
|
// IsInstalled reports whether the git executable is available on PATH. Every
|
|
// other helper shells out to git, so callers can use this to surface a clear
|
|
// "git is not installed" message instead of a raw exec error.
|
|
func IsInstalled() bool {
|
|
_, err := exec.LookPath("git")
|
|
return err == nil
|
|
}
|
|
|
|
// HasRemote checks if the repo has at least one remote configured
|
|
func HasRemote(dir string) bool {
|
|
cmd := exec.Command("git", "remote")
|
|
cmd.Dir = dir
|
|
out, err := cmd.Output()
|
|
if err != nil {
|
|
return false
|
|
}
|
|
return strings.TrimSpace(string(out)) != ""
|
|
}
|
|
|
|
// StageAll stages all changes (git add -A)
|
|
func StageAll(dir string) error {
|
|
cmd := exec.Command("git", "add", "-A")
|
|
cmd.Dir = dir
|
|
return cmd.Run()
|
|
}
|
|
|
|
// Commit creates a commit with the given message
|
|
func Commit(dir, msg string) error {
|
|
cmd := exec.Command("git", "commit", "-m", msg)
|
|
cmd.Dir = dir
|
|
out, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
return fmt.Errorf("git commit failed: %s", strings.TrimSpace(string(out)))
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// PushRemote pushes to the default remote
|
|
func PushRemote(dir string) error {
|
|
return PushRemoteWithEnv(dir, nil)
|
|
}
|
|
|
|
// PushRemoteWithAuth pushes to the default remote with token auth env inferred
|
|
// from origin remote.
|
|
func PushRemoteWithAuth(dir string) error {
|
|
return PushRemoteWithEnv(dir, AuthEnvForRepo(dir))
|
|
}
|
|
|
|
// PushRemoteWithEnv pushes to the default remote with additional environment
|
|
// variables, setting upstream on the first push (see PushArgs). Error output is
|
|
// sanitized of credential values via WrapGitError.
|
|
func PushRemoteWithEnv(dir string, extraEnv []string) error {
|
|
cmd := exec.Command("git", PushArgs(dir, extraEnv)...)
|
|
cmd.Dir = dir
|
|
cmd.Env = append(append(os.Environ(), "LC_ALL=C"), extraEnv...)
|
|
|
|
var outBuf bytes.Buffer
|
|
cmd.Stdout = &outBuf
|
|
cmd.Stderr = &outBuf
|
|
|
|
err := cmd.Run()
|
|
if err != nil {
|
|
return install.WrapGitError(outBuf.String(), err, install.UsedTokenAuth(extraEnv))
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// PushArgs returns the git push arguments for dir. The first push sets
|
|
// upstream, targeting origin's default branch when it is named differently
|
|
// from the local branch (origin is fetched to find it). Later pushes name a
|
|
// differently named upstream branch explicitly, which push.default=simple
|
|
// otherwise refuses.
|
|
func PushArgs(dir string, extraEnv []string) []string {
|
|
local, err := GetCurrentBranch(dir)
|
|
if err != nil {
|
|
local = "main"
|
|
}
|
|
if !HasUpstream(dir) {
|
|
fetch := exec.Command("git", "fetch", "origin")
|
|
fetch.Dir = dir
|
|
fetch.Env = append(os.Environ(), extraEnv...)
|
|
if fetch.Run() == nil {
|
|
if remote, err := GetRemoteDefaultBranch(dir); err == nil && remote != local {
|
|
return []string{"push", "-u", "origin", local + ":" + remote}
|
|
}
|
|
}
|
|
return []string{"push", "-u", "origin", local}
|
|
}
|
|
upstream, _ := GetTrackingBranch(dir)
|
|
if remote, branch, ok := strings.Cut(upstream, "/"); ok && remote != "" && branch != "" && branch != local {
|
|
return []string{"push", remote, "HEAD:" + branch}
|
|
}
|
|
return []string{"push"}
|
|
}
|
|
|
|
// AheadCount returns how many commits on HEAD are not on any remote-tracking
|
|
// branch, which is what a push would upload. It returns 0 when unknown, e.g.
|
|
// before the first commit.
|
|
func AheadCount(dir string) int {
|
|
cmd := exec.Command("git", "rev-list", "--count", "HEAD", "--not", "--remotes")
|
|
cmd.Dir = dir
|
|
out, err := cmd.Output()
|
|
if err != nil {
|
|
return 0
|
|
}
|
|
n, _ := strconv.Atoi(strings.TrimSpace(string(out)))
|
|
return n
|
|
}
|
|
|
|
// ErrMergeFailed reports that merging origin's history during a first pull
|
|
// failed, usually on a conflict. The merge has been aborted.
|
|
var ErrMergeFailed = errors.New("merging remote history failed")
|
|
|
|
// FirstPull attaches a branch without upstream tracking to origin's default
|
|
// branch. Local directories are kept by merging the remote history (it may be
|
|
// unrelated); with force, or with nothing local, the branch is reset to the
|
|
// remote instead. Returns ErrNoRemoteBranches while origin is still empty.
|
|
func FirstPull(dir string, force bool) (*UpdateInfo, error) {
|
|
authEnv := AuthEnvForRepo(dir)
|
|
fetch := exec.Command("git", "fetch", "origin")
|
|
fetch.Dir = dir
|
|
fetch.Env = append(append(os.Environ(), "LC_ALL=C"), authEnv...)
|
|
if out, err := fetch.CombinedOutput(); err != nil {
|
|
return nil, install.WrapGitError(string(out), err, install.UsedTokenAuth(authEnv))
|
|
}
|
|
|
|
branch, err := GetRemoteDefaultBranch(dir)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
hasLocal, err := HasLocalSkillDirs(dir)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
info := &UpdateInfo{}
|
|
info.BeforeHash, _ = GetCurrentFullHash(dir) // empty before the first commit
|
|
remote := "origin/" + branch
|
|
if hasLocal && !force {
|
|
merge := exec.Command("git", "-c", "merge.ff=false", "merge", "--allow-unrelated-histories", "--no-edit", remote)
|
|
merge.Dir = dir
|
|
if out, err := merge.CombinedOutput(); err != nil {
|
|
abort := exec.Command("git", "merge", "--abort")
|
|
abort.Dir = dir
|
|
abort.Run() // best-effort cleanup
|
|
return nil, fmt.Errorf("%w with %s: %s", ErrMergeFailed, remote, strings.TrimSpace(string(out)))
|
|
}
|
|
} else {
|
|
reset := exec.Command("git", "reset", "--hard", remote)
|
|
reset.Dir = dir
|
|
if out, err := reset.CombinedOutput(); err != nil {
|
|
return nil, fmt.Errorf("reset to %s failed: %s", remote, strings.TrimSpace(string(out)))
|
|
}
|
|
}
|
|
|
|
local, _ := GetCurrentBranch(dir)
|
|
if local == "" {
|
|
local = "main"
|
|
}
|
|
track := exec.Command("git", "branch", "--set-upstream-to="+remote, local)
|
|
track.Dir = dir
|
|
track.Run() // best-effort
|
|
|
|
info.AfterHash, _ = GetCurrentFullHash(dir)
|
|
info.UpToDate = info.BeforeHash == info.AfterHash
|
|
if info.BeforeHash != "" && !info.UpToDate {
|
|
info.Commits, _ = GetCommitsBetween(dir, info.BeforeHash, info.AfterHash)
|
|
info.Stats, _ = GetDiffStats(dir, info.BeforeHash, info.AfterHash)
|
|
}
|
|
return info, nil
|
|
}
|
|
|
|
// GetStatus returns git status --porcelain output
|
|
func GetStatus(dir string) (string, error) {
|
|
cmd := exec.Command("git", "status", "--porcelain")
|
|
cmd.Dir = dir
|
|
out, err := cmd.Output()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return strings.TrimSpace(string(out)), nil
|
|
}
|
|
|
|
// HasUpstream checks if the current branch has upstream tracking configured.
|
|
func HasUpstream(dir string) bool {
|
|
cmd := exec.Command("git", "rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}")
|
|
cmd.Dir = dir
|
|
return cmd.Run() == nil
|
|
}
|
|
|
|
// GetCurrentBranch returns the current branch name
|
|
func GetCurrentBranch(repoPath string) (string, error) {
|
|
cmd := exec.Command("git", "rev-parse", "--abbrev-ref", "HEAD")
|
|
cmd.Dir = repoPath
|
|
out, err := cmd.Output()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return strings.TrimSpace(string(out)), nil
|
|
}
|
|
|
|
// GetRemoteDefaultBranch returns the default branch name for origin.
|
|
// Resolution order:
|
|
// 1. refs/remotes/origin/HEAD
|
|
// 2. common branch names (main, master)
|
|
// 3. first discovered refs/remotes/origin/* branch
|
|
func GetRemoteDefaultBranch(repoPath string) (string, error) {
|
|
cmd := exec.Command("git", "symbolic-ref", "--quiet", "--short", "refs/remotes/origin/HEAD")
|
|
cmd.Dir = repoPath
|
|
if out, err := cmd.Output(); err == nil {
|
|
branch := strings.TrimSpace(string(out))
|
|
branch = strings.TrimPrefix(branch, "origin/")
|
|
if branch != "" {
|
|
return branch, nil
|
|
}
|
|
}
|
|
|
|
for _, branch := range []string{"main", "master"} {
|
|
checkCmd := exec.Command("git", "rev-parse", "--verify", "refs/remotes/origin/"+branch)
|
|
checkCmd.Dir = repoPath
|
|
if err := checkCmd.Run(); err == nil {
|
|
return branch, nil
|
|
}
|
|
}
|
|
|
|
listCmd := exec.Command("git", "for-each-ref", "--format=%(refname:short)", "refs/remotes/origin")
|
|
listCmd.Dir = repoPath
|
|
out, err := listCmd.Output()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
for _, line := range strings.Split(strings.TrimSpace(string(out)), "\n") {
|
|
ref := strings.TrimSpace(line)
|
|
if ref == "" || ref == "origin/HEAD" {
|
|
continue
|
|
}
|
|
ref = strings.TrimPrefix(ref, "origin/")
|
|
if ref != "" {
|
|
return ref, nil
|
|
}
|
|
}
|
|
|
|
return "", ErrNoRemoteBranches
|
|
}
|
|
|
|
// HasRemoteSkillDirs reports whether origin/<remoteBranch> has at least one top-level directory.
|
|
func HasRemoteSkillDirs(repoPath, remoteBranch string) (bool, error) {
|
|
lsCmd := exec.Command("git", "ls-tree", "-d", "--name-only", "origin/"+remoteBranch)
|
|
lsCmd.Dir = repoPath
|
|
lsOut, err := lsCmd.Output()
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
return strings.TrimSpace(string(lsOut)) != "", nil
|
|
}
|
|
|
|
// HasLocalSkillDirs reports whether the repo root has at least one directory besides .git.
|
|
func HasLocalSkillDirs(repoPath string) (bool, error) {
|
|
entries, err := os.ReadDir(repoPath)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
for _, e := range entries {
|
|
if e.IsDir() && e.Name() != ".git" {
|
|
return true, nil
|
|
}
|
|
}
|
|
return false, nil
|
|
}
|
|
|
|
// GetBehindCount fetches from origin and returns how many commits local is behind
|
|
func GetBehindCount(repoPath string) (int, error) {
|
|
return GetBehindCountWithEnv(repoPath, nil)
|
|
}
|
|
|
|
// GetBehindCountWithAuth fetches from origin and returns how many commits local
|
|
// is behind, injecting HTTPS token auth based on origin remote when available.
|
|
func GetBehindCountWithAuth(repoPath string) (int, error) {
|
|
return GetBehindCountWithEnv(repoPath, AuthEnvForRepo(repoPath))
|
|
}
|
|
|
|
// GetBehindCountWithEnv is like GetBehindCount but with additional env vars.
|
|
func GetBehindCountWithEnv(repoPath string, extraEnv []string) (int, error) {
|
|
if err := FetchWithEnv(repoPath, extraEnv); err != nil {
|
|
return 0, err
|
|
}
|
|
branch, err := GetCurrentBranch(repoPath)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
cmd := exec.Command("git", "rev-list", "--count", "HEAD..origin/"+branch)
|
|
cmd.Dir = repoPath
|
|
out, err := cmd.Output()
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
n, _ := strconv.Atoi(strings.TrimSpace(string(out)))
|
|
return n, nil
|
|
}
|
|
|
|
// GetRemoteHeadHash returns the HEAD hash of a remote repo without cloning
|
|
func GetRemoteHeadHash(repoURL string) (string, error) {
|
|
return GetRemoteHeadHashWithEnv(repoURL, nil)
|
|
}
|
|
|
|
// GetRemoteHeadHashWithAuth returns remote HEAD hash with HTTPS token auth
|
|
// injection when token env vars are available.
|
|
func GetRemoteHeadHashWithAuth(repoURL string) (string, error) {
|
|
return GetRemoteHeadHashWithEnv(repoURL, install.AuthEnvForURL(repoURL))
|
|
}
|
|
|
|
// remoteHashTimeout bounds lightweight remote probes used by check/status flows.
|
|
var remoteHashTimeout = 15 * time.Second
|
|
|
|
// GetRemoteHeadHashWithEnv is like GetRemoteHeadHash but with additional env vars.
|
|
func GetRemoteHeadHashWithEnv(repoURL string, extraEnv []string) (string, error) {
|
|
out, err := runRemoteLsRemote([]string{repoURL, "HEAD"}, extraEnv)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return parseRemoteHash(out, "")
|
|
}
|
|
|
|
// GetRemoteRefHash returns the hash of a specific branch on a remote repo.
|
|
// If branch is empty, returns HEAD hash (same as GetRemoteHeadHash).
|
|
// The returned hash is truncated to 7 characters.
|
|
func GetRemoteRefHash(repoURL, branch string) (string, error) {
|
|
return GetRemoteRefHashWithEnv(repoURL, branch, nil)
|
|
}
|
|
|
|
// GetRemoteRefHashWithAuth returns the remote ref hash with HTTPS token auth.
|
|
func GetRemoteRefHashWithAuth(repoURL, branch string) (string, error) {
|
|
return GetRemoteRefHashWithEnv(repoURL, branch, install.AuthEnvForURL(repoURL))
|
|
}
|
|
|
|
// GetRemoteRefHashWithEnv returns the hash of a specific ref on a remote repo.
|
|
func GetRemoteRefHashWithEnv(repoURL, branch string, extraEnv []string) (string, error) {
|
|
ref := "HEAD"
|
|
if branch != "" {
|
|
ref = "refs/heads/" + branch
|
|
}
|
|
|
|
out, err := runRemoteLsRemote([]string{repoURL, ref}, extraEnv)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
return parseRemoteHash(out, branch)
|
|
}
|
|
|
|
func runRemoteLsRemote(args []string, extraEnv []string) (string, error) {
|
|
ctx, cancel := context.WithTimeout(context.Background(), remoteHashTimeout)
|
|
defer cancel()
|
|
|
|
cmd := exec.CommandContext(ctx, "git", append([]string{"ls-remote"}, args...)...)
|
|
cmd.Env = append(os.Environ(),
|
|
"GIT_TERMINAL_PROMPT=0",
|
|
"GIT_ASKPASS=",
|
|
"SSH_ASKPASS=",
|
|
)
|
|
if len(extraEnv) > 0 {
|
|
cmd.Env = append(cmd.Env, extraEnv...)
|
|
}
|
|
|
|
var stderr bytes.Buffer
|
|
cmd.Stderr = &stderr
|
|
out, err := cmd.Output()
|
|
if ctx.Err() == context.DeadlineExceeded {
|
|
return "", fmt.Errorf("git ls-remote timed out after %s", remoteHashTimeout)
|
|
}
|
|
if err != nil {
|
|
return "", install.WrapGitError(stderr.String(), err, install.UsedTokenAuth(extraEnv))
|
|
}
|
|
return string(out), nil
|
|
}
|
|
|
|
func parseRemoteHash(out, branch string) (string, error) {
|
|
parts := strings.Fields(strings.TrimSpace(out))
|
|
if len(parts) == 0 {
|
|
if branch != "" {
|
|
return "", fmt.Errorf("remote branch %q not found", branch)
|
|
}
|
|
return "", fmt.Errorf("no HEAD ref found")
|
|
}
|
|
hash := parts[0]
|
|
if len(hash) > 7 {
|
|
hash = hash[:7]
|
|
}
|
|
return hash, nil
|
|
}
|
|
|
|
// ForcePull fetches and resets to origin (handles force push)
|
|
func ForcePull(repoPath string) (*UpdateInfo, error) {
|
|
return ForcePullWithEnv(repoPath, nil)
|
|
}
|
|
|
|
// ForcePullWithAuth runs force-pull flow with token auth env inferred from origin remote.
|
|
func ForcePullWithAuth(repoPath string) (*UpdateInfo, error) {
|
|
return ForcePullWithEnv(repoPath, AuthEnvForRepo(repoPath))
|
|
}
|
|
|
|
// ForcePullWithProgress runs fetch+hard-reset and optionally streams fetch
|
|
// progress lines when onProgress is non-nil.
|
|
func ForcePullWithProgress(repoPath string, extraEnv []string, onProgress func(string)) (*UpdateInfo, error) {
|
|
info := &UpdateInfo{}
|
|
|
|
beforeHash, err := GetCurrentFullHash(repoPath)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
info.BeforeHash = beforeHash
|
|
|
|
branch, err := GetCurrentBranch(repoPath)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
fetchArgs := []string{"fetch"}
|
|
if onProgress == nil {
|
|
fetchArgs = []string{"fetch", "--quiet"}
|
|
} else {
|
|
fetchArgs = []string{"fetch", "--progress"}
|
|
}
|
|
if err := runGitWithProgress(repoPath, fetchArgs, extraEnv, onProgress); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
cmd := exec.Command("git", "reset", "--hard", "origin/"+branch)
|
|
cmd.Dir = repoPath
|
|
if err := cmd.Run(); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
afterHash, err := GetCurrentFullHash(repoPath)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
info.AfterHash = afterHash
|
|
|
|
if beforeHash == afterHash {
|
|
info.UpToDate = true
|
|
return info, nil
|
|
}
|
|
|
|
commits, _ := GetCommitsBetween(repoPath, beforeHash, afterHash)
|
|
info.Commits = commits
|
|
|
|
stats, _ := GetDiffStats(repoPath, beforeHash, afterHash)
|
|
info.Stats = stats
|
|
|
|
return info, nil
|
|
}
|
|
|
|
// ForcePullWithEnv fetches and resets to origin with additional env vars.
|
|
func ForcePullWithEnv(repoPath string, extraEnv []string) (*UpdateInfo, error) {
|
|
return ForcePullWithProgress(repoPath, extraEnv, nil)
|
|
}
|
|
|
|
// AuthEnvForRepo returns HTTPS token auth env vars for the repo's origin remote.
|
|
func AuthEnvForRepo(repoPath string) []string {
|
|
url, _ := GetRemoteURL(repoPath)
|
|
return install.AuthEnvForURL(url)
|
|
}
|
|
|
|
// GetRemoteURL returns the fetch URL for the "origin" remote.
|
|
func GetRemoteURL(repoPath string) (string, error) {
|
|
cmd := exec.Command("git", "remote", "get-url", "origin")
|
|
cmd.Dir = repoPath
|
|
out, err := cmd.Output()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return strings.TrimSpace(string(out)), nil
|
|
}
|
|
|
|
// validRemoteArg rejects values that git could parse as an option flag. A
|
|
// remote URL beginning with "-" enables argv flag smuggling (e.g. "--upload-pack=…"),
|
|
// so reject it; a legitimate remote URL never starts with a dash.
|
|
func validRemoteArg(url string) error {
|
|
if url == "" {
|
|
return fmt.Errorf("empty remote URL")
|
|
}
|
|
if strings.HasPrefix(url, "-") {
|
|
return fmt.Errorf("invalid remote URL %q: must not start with '-'", url)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// SetRemoteURL updates the fetch/push URL for the "origin" remote.
|
|
func SetRemoteURL(repoPath, newURL string) error {
|
|
if err := validRemoteArg(newURL); err != nil {
|
|
return err
|
|
}
|
|
cmd := exec.Command("git", "remote", "set-url", "--", "origin", newURL)
|
|
cmd.Dir = repoPath
|
|
return cmd.Run()
|
|
}
|
|
|
|
// SetOrAddRemote points the "origin" remote at url: it updates the URL when
|
|
// origin already exists and adds the remote otherwise. ("git remote set-url"
|
|
// fails when origin is absent and "git remote add" fails when it exists, so the
|
|
// correct command depends on the current state.)
|
|
func SetOrAddRemote(repoPath, url string) error {
|
|
if err := validRemoteArg(url); err != nil {
|
|
return err
|
|
}
|
|
if _, err := GetRemoteURL(repoPath); err == nil {
|
|
return SetRemoteURL(repoPath, url)
|
|
}
|
|
cmd := exec.Command("git", "remote", "add", "--", "origin", url)
|
|
cmd.Dir = repoPath
|
|
return cmd.Run()
|
|
}
|
|
|
|
// GetHeadMessage returns the subject line of the HEAD commit.
|
|
func GetHeadMessage(repoPath string) (string, error) {
|
|
cmd := exec.Command("git", "log", "-1", "--format=%s")
|
|
cmd.Dir = repoPath
|
|
out, err := cmd.Output()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return strings.TrimSpace(string(out)), nil
|
|
}
|
|
|
|
// ListLocalBranches returns local branch names sorted alphabetically.
|
|
func ListLocalBranches(repoPath string) ([]string, error) {
|
|
cmd := exec.Command("git", "branch", "--format=%(refname:short)")
|
|
cmd.Dir = repoPath
|
|
out, err := cmd.Output()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var branches []string
|
|
for _, line := range strings.Split(strings.TrimSpace(string(out)), "\n") {
|
|
if b := strings.TrimSpace(line); b != "" {
|
|
branches = append(branches, b)
|
|
}
|
|
}
|
|
return branches, nil
|
|
}
|
|
|
|
// ListRemoteBranches returns remote-only branch names (stripping "origin/" prefix).
|
|
// Branches that already exist locally are excluded.
|
|
func ListRemoteBranches(repoPath string) ([]string, error) {
|
|
cmd := exec.Command("git", "branch", "-r", "--format=%(refname:short)")
|
|
cmd.Dir = repoPath
|
|
out, err := cmd.Output()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
locals, _ := ListLocalBranches(repoPath)
|
|
localSet := make(map[string]struct{}, len(locals))
|
|
for _, l := range locals {
|
|
localSet[l] = struct{}{}
|
|
}
|
|
|
|
var branches []string
|
|
for _, line := range strings.Split(strings.TrimSpace(string(out)), "\n") {
|
|
ref := strings.TrimSpace(line)
|
|
if ref == "" || ref == "origin/HEAD" || strings.Contains(ref, "->") {
|
|
continue
|
|
}
|
|
name := strings.TrimPrefix(ref, "origin/")
|
|
if _, exists := localSet[name]; exists {
|
|
continue
|
|
}
|
|
branches = append(branches, name)
|
|
}
|
|
return branches, nil
|
|
}
|
|
|
|
// Checkout switches to the given branch. If the branch exists only on
|
|
// the remote, a new local tracking branch is created automatically.
|
|
func Checkout(repoPath, branch string) error {
|
|
// Check if local branch exists
|
|
check := exec.Command("git", "rev-parse", "--verify", "refs/heads/"+branch)
|
|
check.Dir = repoPath
|
|
if check.Run() == nil {
|
|
// Local branch exists — simple checkout
|
|
cmd := exec.Command("git", "checkout", branch)
|
|
cmd.Dir = repoPath
|
|
out, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
return fmt.Errorf("git checkout failed: %s", strings.TrimSpace(string(out)))
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Try remote tracking branch
|
|
cmd := exec.Command("git", "checkout", "-b", branch, "origin/"+branch)
|
|
cmd.Dir = repoPath
|
|
out, err := cmd.CombinedOutput()
|
|
if err != nil {
|
|
return fmt.Errorf("git checkout failed: %s", strings.TrimSpace(string(out)))
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// GetTrackingBranch returns the upstream tracking branch (e.g. "origin/main").
|
|
// Returns empty string (no error) if no upstream is set.
|
|
func GetTrackingBranch(repoPath string) (string, error) {
|
|
cmd := exec.Command("git", "rev-parse", "--abbrev-ref", "@{upstream}")
|
|
cmd.Dir = repoPath
|
|
out, err := cmd.Output()
|
|
if err != nil {
|
|
return "", nil
|
|
}
|
|
return strings.TrimSpace(string(out)), nil
|
|
}
|