diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0297bb7..cbe5260 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,6 +11,8 @@ name: Release # leaves `release` where it is. on: + # Manual runs rehearse the build and packaging without publishing. + workflow_dispatch: push: tags: - 'v*' @@ -40,7 +42,11 @@ jobs: id: version env: TAG: ${{ github.ref_name }} + EVENT: ${{ github.event_name }} run: | + if [ "$EVENT" = workflow_dispatch ]; then + TAG="v$(sed -n 's/^version = "\(.*\)"$/\1/p' herdr-plugin.toml | head -n 1)" + fi case "$TAG" in *-bin) echo "::error::$TAG is an install tag, not a release tag"; exit 1 ;; v[0-9]*) ;; @@ -111,6 +117,7 @@ jobs: publish: name: Publish + if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') needs: build runs-on: ubuntu-latest # The only job that can write: it runs no project code. diff --git a/.golangci.yaml b/.golangci.yaml index cf6671b..95980dc 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -21,7 +21,7 @@ formatters: # with the given prefixes are grouped after 3rd-party packages. # Default: [] local-prefixes: - - github.com/kriuchkov/herdr-scope + - github.com/killallgit/herdr-scope golines: max-len: 140 diff --git a/CONFIGURATION-SUMMARY.md b/CONFIGURATION-SUMMARY.md new file mode 100644 index 0000000..4ebc8cf --- /dev/null +++ b/CONFIGURATION-SUMMARY.md @@ -0,0 +1,148 @@ +# Configuration and keyboard shortcuts + +Scope’s settings and Herdr’s keyboard bindings go in **different configuration files**. + +## Keyboard shortcuts + +`--keys` belongs to the `configure` subcommand: + +```sh +bin/herdr-scope configure --keys +``` + +This **prints a template only**; it does not install the shortcuts. Scope binds no keys itself. + +Paste the following into **Herdr’s `config.toml`**, not Scope’s plugin configuration: + +```toml +[[keys.command]] +key = "prefix+a" +type = "plugin_action" +command = "killallgit.herdr-scope.view-flip" +description = "Agents: active <-> recent" + +[[keys.command]] +key = "prefix+u" +type = "plugin_action" +command = "killallgit.herdr-scope.jump" +description = "Agents: next one waiting on you" + +[[keys.command]] +key = "prefix+f" +type = "plugin_action" +command = "killallgit.herdr-scope.view-here" +description = "Agents: only this workspace <-> all" + +[[keys.command]] +key = "prefix+m" +type = "plugin_action" +command = "killallgit.herdr-scope.fold" +description = "Agents: fold <-> unfold this folder" + +[[keys.command]] +key = "prefix+comma" +type = "plugin_action" +command = "killallgit.herdr-scope.settings" +description = "herdr-scope settings" +``` + +With Herdr’s default prefix, press **Ctrl+B, then the second key**: + +| Second key | What happens | +| --- | --- | +| `a` | Switch between grouped activity order and a flat recent-activity list | +| `u` | Jump to an agent needing attention: questions first, then unseen results | +| `f` | Toggle this workspace versus all workspaces | +| `m` | Fold/unfold the current folder; agents needing attention remain visible | +| `,` | Open Scope settings | + +The README describes the comma shortcut as `prefix+,`, but the generated configuration uses **`prefix+comma`**. Use the latter in the file. + +This fork uses the plugin ID `killallgit.herdr-scope`. Existing upstream installations +use a different ID and keep separate configuration and state directories; these are +not migrated automatically. + +## Where to change Scope’s settings + +Scope’s configuration file is: + +```sh +$(herdr plugin config-dir killallgit.herdr-scope)/config.toml +``` + +The easiest interface is the settings popup: + +- **↑/↓:** select an option +- **←/→:** change it +- **Enter:** edit +- **r:** restore its default +- **s:** save and apply +- **q:** close + +Manual file edits are picked up within about two seconds. + +## Panel and organization + +| Option | Default | Meaning | +| --- | --- | --- | +| `agents_panel` | `plugin` | Use Scope’s Agents panel or Herdr’s native one | +| `order` | `active` | `active`: grouped, busiest first; `recent`: flat activity list; `here`: current workspace and family; `off`: Herdr’s order | +| `nest_folders` | `true` | Nest workspaces whose folders are inside another workspace; also moves them together in Herdr’s list | +| `reorder_workspaces` | `false` | Make Herdr’s workspace numbering follow Scope’s activity order | +| `group_indent` | `2` | Indentation per tree level; `0` removes tree lines | +| `group_gap` | `true` | Blank line between groups; defaults to `false` with compact layout | +| `split_corner` | `false` | Visually branch additional split panes beneath the first | + +**Code detail:** `agents_panel` and `order` are special live controls in the popup, not ordinary saved settings. The file’s `order`/`sort` supplies an initial ordering choice; `agents_panel` is not parsed as a normal file setting. + +## Appearance + +| Option | Default | Meaning | +| --- | --- | --- | +| `layout` | `classic` | Separate logo/status cells; `compact` makes denser rows | +| `variant` | `auto` | Icons: automatically choose, force `font`, use Unicode `text`, or `none` | +| `space_mark` | `logo` | Mark workspaces with an agent logo or a `state` symbol | +| `logo_color` | `active` | Vendor colors only while working/waiting, or `always` | +| `row_label` | `title` | Show the session `title`, `tab` name, or `both` | +| `trim_group_prefix` | `true` | Remove redundant workspace names from titles | +| `worktree_mark` | `U+F418` | Worktree-header symbol; empty disables it; requires a compatible font | +| `follow_appearance` | `false` | Follow desktop light/dark appearance; requires Herdr’s `[theme]` table | +| `colors.active_row_bg_light` | `#b9cdf2` | Selected-row background for light themes | +| `colors.active_row_bg_dark` | `#232636` | Selected-row background for dark themes | + +Set either color override to `""` to retain the theme’s own background. + +## Status and attention + +| Option | Default | Meaning | +| --- | --- | --- | +| `done_hold` | `until_seen` | Keep ✓ until you focus the pane; alternatively specify seconds or `"30s"` | +| `blocked_hold` | `true` | Keep ? until the agent resumes working | +| `idle_grace_seconds` | `2.5` | Wait this long before treating idle as a completed turn | +| `activity_fresh_minutes` | `15` | How long an inactive agent looks “fresh” | +| `activity_stale_minutes` | `120` | When an inactive agent starts looking dim/stale | +| `show_age` | `waiting` | Show elapsed time only for attention-needed rows, for `all`, or `off` | +| `mark_tabs` | `true` | Append ? or ✓ to tabs needing attention | + +## Advanced, file-only settings + +```toml +log_level = "info" # debug, info, warn, error +led_glyph = "●" # Shared blocked/idle symbol + +[observer] +heartbeat_interval = "1s" # Agent-list refresh; 250ms–1m +reconcile_interval = "30s" # Full-session refresh; 1s–1h + +[glyphs] +done = "✔" # Override individual status symbols +``` + +Other glyph names: `working`, `blocked`, `idle_fresh`, `idle`, `idle_stale`, `unknown`. + +## Sources + +- [Shortcut generation and configure command](internal/bootstrap/cli.go) +- [Settings popup fields](internal/adapters/config/fields.go) +- [Configuration parsing and saving](internal/adapters/config/plugin.go) +- [Full configuration documentation](docs/configuration.md) diff --git a/README.md b/README.md index 972e523..c15d427 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Herdr Scope

- tests + tests Go 1.26 Herdr 0.9+ license MIT @@ -21,6 +21,14 @@ A sidebar for [Herdr](https://herdr.dev) that shows which agent is working, whic you, and which finished while you were away. It only watches and paints: it never starts, prompts or stops an agent. +## Upstream credit + +This repository, [killallgit/herdr-scope](https://github.com/killallgit/herdr-scope), +is a fork of [kriuchkov/herdr-scope](https://github.com/kriuchkov/herdr-scope) +by **Nikita Kriuchkov**. His original Herdr Scope implementation is the foundation +for this fork's development. The original MIT copyright and license remain in +[LICENSE](LICENSE); additional attributions are in [THIRD_PARTY_NOTICES.md](THIRD_PARTY_NOTICES.md). + ## Features ![Herdr with Scope: a folder of five agents folds to one line, a finished turn and a question stay in sight, ctrl+b u jumps to each](docs/demo/scope.gif) @@ -47,30 +55,29 @@ prompts or stops an agent. ## Install ```sh -herdr plugin install kriuchkov/herdr-scope --ref release +herdr plugin install killallgit/herdr-scope --ref release ``` -The `release` branch carries prebuilt binaries for macOS, Linux and Windows. Without `--ref`, -as the [plugin catalog](https://herdr.dev/plugins/) installs it, Herdr builds from source -with Go 1.26+. Without Go, it downloads the release binary and checks its checksum. Setup +The `release` branch carries prebuilt binaries for macOS, Linux and Windows once +published for this fork. Without `--ref`, Herdr builds from source with Go 1.26+. Without Go, it downloads the release binary and checks its checksum. Setup adds Scope's blocks to Herdr's `config.toml` between `HERDR-SCOPE` markers and installs the icon font for your user. It requires Herdr 0.9+ (protocol 22). > [!IMPORTANT] > If the sidebar has not changed, start the daemon: -> `herdr plugin action invoke kriuchkov.herdr-scope.state-start`. +> `herdr plugin action invoke killallgit.herdr-scope.state-start`. > Never run `herdr server stop` to restart anything: it ends every pane. To update, restart the daemon after updating the plugin. To uninstall, run these in order; your `config.toml` comes back byte for byte: ```sh -herdr plugin update kriuchkov.herdr-scope # update -herdr plugin action invoke kriuchkov.herdr-scope.state-start +herdr plugin update killallgit.herdr-scope # update +herdr plugin action invoke killallgit.herdr-scope.state-start -herdr plugin action invoke kriuchkov.herdr-scope.unconfigure # uninstall -herdr plugin action invoke kriuchkov.herdr-scope.uninstall-font -herdr plugin uninstall kriuchkov.herdr-scope +herdr plugin action invoke killallgit.herdr-scope.unconfigure # uninstall +herdr plugin action invoke killallgit.herdr-scope.uninstall-font +herdr plugin uninstall killallgit.herdr-scope ``` ## Keys @@ -90,11 +97,16 @@ Scope binds no keys itself. `bin/herdr-scope configure --keys` prints the snippe [[keys.command]] key = "prefix+u" type = "plugin_action" -command = "kriuchkov.herdr-scope.jump" +command = "killallgit.herdr-scope.jump" ``` ## Configuration +This fork uses plugin ID `killallgit.herdr-scope`, with separate configuration and +state directories from upstream installations. Existing settings and key bindings +are not migrated automatically. Before switching, unconfigure and uninstall the +upstream plugin using its own instructions; keep a backup of your settings. + `prefix+,` opens the popup: `↑↓` select, `←→` change, `s` save. A save is validated and applied at once. The most used options: @@ -142,6 +154,20 @@ From a checkout: `make build && herdr plugin link .` (`plugin link` runs no buil [Architecture](docs/architecture.md), [Herdr protocol notes](docs/protocol.md), [design decisions](docs/design.md). `docs/demo/record.sh` re-records the GIF. +### Release verification + +Run a non-publishing release rehearsal on the branch to test and package all six +platform binaries: + +```sh +gh workflow run release.yml --ref +``` + +Manual runs upload the release artifacts but skip publishing. To publish after +merging, keep `herdr-plugin.toml` and `internal/bootstrap/version.go` at the same +new version, then push its `vX.Y.Z` tag. The release workflow publishes the +archives, checksums, `vX.Y.Z-bin` tag, and (for stable versions) `release` branch. + ## License MIT, see [LICENSE](LICENSE). The icon font is forked from qintmb/herdr-icon-agent-ui (MIT), diff --git a/cmd/herdr-scope/main.go b/cmd/herdr-scope/main.go index 1f56475..be8746f 100644 --- a/cmd/herdr-scope/main.go +++ b/cmd/herdr-scope/main.go @@ -6,7 +6,7 @@ import ( "context" "os" - "github.com/kriuchkov/herdr-scope/internal/bootstrap" + "github.com/killallgit/herdr-scope/internal/bootstrap" ) // version overrides bootstrap.Version at build time diff --git a/docs/configuration.md b/docs/configuration.md index 6c8702d..197f77f 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -1,6 +1,6 @@ # Configuration -The file is `$(herdr plugin config-dir kriuchkov.herdr-scope)/config.toml`. The settings popup +The file is `$(herdr plugin config-dir killallgit.herdr-scope)/config.toml`. The settings popup (`prefix+,`) edits it: `↑↓` select, `←→` change, `↵` edit, `r` default, `s` save, `q` close. A save validates every value, rewrites only the lines that changed (your comments stay), and the daemon applies it at once. Hand edits are picked up within two seconds. diff --git a/docs/protocol.md b/docs/protocol.md index 775b003..ea77fef 100644 --- a/docs/protocol.md +++ b/docs/protocol.md @@ -92,7 +92,7 @@ model dirty, and the next frame reads the authoritative snapshot. `null` clears a token. Indentation rides on a leading U+200B, which `trim()` keeps. A report to a target that is gone (`pane_not_found`, `workspace_not_found`) counts as landed. Every -write carries `source = "plugin:kriuchkov.herdr-scope"`, so Scope's clears cannot touch +write carries `source = "plugin:killallgit.herdr-scope"`, so Scope's clears cannot touch another plugin's token. ## Sidebar rows diff --git a/go.mod b/go.mod index cc50ffb..88072c1 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/kriuchkov/herdr-scope +module github.com/killallgit/herdr-scope go 1.26.5 diff --git a/herdr-plugin.toml b/herdr-plugin.toml index a8f7d5c..118afdf 100644 --- a/herdr-plugin.toml +++ b/herdr-plugin.toml @@ -1,4 +1,4 @@ -id = "kriuchkov.herdr-scope" +id = "killallgit.herdr-scope" name = "Herdr Scope" version = "1.1.2" min_herdr_version = "0.9.0" @@ -10,7 +10,7 @@ platforms = ["linux", "macos", "windows"] # three ways: # # - Release install, no Go needed: `herdr plugin install -# kriuchkov/herdr-scope --ref release` (or `--ref vX.Y.Z-bin` to pin a +# killallgit/herdr-scope --ref release` (or `--ref vX.Y.Z-bin` to pin a # version) checks out the tree the release workflow publishes: the tagged # source plus prebuilt bin/herdr-scope--[.exe] for macOS, Linux # and Windows on amd64 and arm64. The step copies this machine's binary. diff --git a/internal/adapters/appearance/probe.go b/internal/adapters/appearance/probe.go index c99b9f6..dd28d9e 100644 --- a/internal/adapters/appearance/probe.go +++ b/internal/adapters/appearance/probe.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/ports" ) const ( diff --git a/internal/adapters/appearance/probe_test.go b/internal/adapters/appearance/probe_test.go index e5c708e..a840a37 100644 --- a/internal/adapters/appearance/probe_test.go +++ b/internal/adapters/appearance/probe_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/ports" ) type answer struct { diff --git a/internal/adapters/config/fields.go b/internal/adapters/config/fields.go index f7e94c2..2269fbd 100644 --- a/internal/adapters/config/fields.go +++ b/internal/adapters/config/fields.go @@ -5,8 +5,8 @@ import ( "strconv" "time" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // FieldKind is how a setting is edited. diff --git a/internal/adapters/config/managed.go b/internal/adapters/config/managed.go index c8b7553..07181f5 100644 --- a/internal/adapters/config/managed.go +++ b/internal/adapters/config/managed.go @@ -15,8 +15,8 @@ import ( "sync" "time" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // Managed block names. diff --git a/internal/adapters/config/managed_test.go b/internal/adapters/config/managed_test.go index acbe349..fe375b2 100644 --- a/internal/adapters/config/managed_test.go +++ b/internal/adapters/config/managed_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/ports" ) type managedFixture struct { diff --git a/internal/adapters/config/plugin.go b/internal/adapters/config/plugin.go index b0bb268..3b31063 100644 --- a/internal/adapters/config/plugin.go +++ b/internal/adapters/config/plugin.go @@ -15,8 +15,8 @@ import ( "github.com/BurntSushi/toml" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // PluginFile is the plugin's own config.toml. Every key has a default, so a diff --git a/internal/adapters/config/plugin_test.go b/internal/adapters/config/plugin_test.go index 17d528c..b0b1ef0 100644 --- a/internal/adapters/config/plugin_test.go +++ b/internal/adapters/config/plugin_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) func plainWrite(path string, data []byte) error { return os.WriteFile(path, data, 0o600) } diff --git a/internal/adapters/control/control.go b/internal/adapters/control/control.go index 5501179..ea0ec05 100644 --- a/internal/adapters/control/control.go +++ b/internal/adapters/control/control.go @@ -15,7 +15,7 @@ import ( "sync" "time" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/ports" ) // ErrAlreadyRunning means a live daemon answers the endpoint. diff --git a/internal/adapters/control/control_test.go b/internal/adapters/control/control_test.go index df948e5..dcb7ab5 100644 --- a/internal/adapters/control/control_test.go +++ b/internal/adapters/control/control_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) func endpoint(t *testing.T) string { diff --git a/internal/adapters/control/endpoint_unix_test.go b/internal/adapters/control/endpoint_unix_test.go index 11a34fc..7961cf2 100644 --- a/internal/adapters/control/endpoint_unix_test.go +++ b/internal/adapters/control/endpoint_unix_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/ports" ) func TestALongRuntimeDirGetsAShortEndpoint(t *testing.T) { - long := "/Users/someone-with-a-long-name/.local/state/herdr/plugins/kriuchkov.herdr-scope/runtime-a-named-session" + long := "/Users/someone-with-a-long-name/.local/state/herdr/plugins/killallgit.herdr-scope/runtime-a-named-session" at := Endpoint(long, "") assert.LessOrEqual(t, len(at), maxSocketPath) assert.Equal(t, at, Endpoint(long, ""), "the same session always gets the same endpoint") diff --git a/internal/adapters/control/wire.go b/internal/adapters/control/wire.go index 6a74787..df7b3fe 100644 --- a/internal/adapters/control/wire.go +++ b/internal/adapters/control/wire.go @@ -3,8 +3,8 @@ package control import ( "time" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // The channel's wire shape: one JSON object a line. Two builds talk across a diff --git a/internal/adapters/filesystem/activity.go b/internal/adapters/filesystem/activity.go index 050e383..fdd3e84 100644 --- a/internal/adapters/filesystem/activity.go +++ b/internal/adapters/filesystem/activity.go @@ -15,8 +15,8 @@ import ( "strings" "time" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // tailBytes is how much of a transcript is read: only its end, enough to diff --git a/internal/adapters/filesystem/filesystem_test.go b/internal/adapters/filesystem/filesystem_test.go index 5a21623..702b383 100644 --- a/internal/adapters/filesystem/filesystem_test.go +++ b/internal/adapters/filesystem/filesystem_test.go @@ -12,14 +12,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kriuchkov/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/domain" ) func envOf(m map[string]string) Env { return func(k string) string { return m[k] } } func TestResolvePathsFromHerdrEnv(t *testing.T) { p := ResolvePaths(envOf(map[string]string{ - "HERDR_PLUGIN_ID": "kriuchkov.herdr-scope", + "HERDR_PLUGIN_ID": "killallgit.herdr-scope", "HERDR_PLUGIN_ROOT": "/plugins/scope", "HERDR_PLUGIN_CONFIG_DIR": "/cfg/scope", "HERDR_PLUGIN_STATE_DIR": "/state/scope", diff --git a/internal/adapters/filesystem/herdr.go b/internal/adapters/filesystem/herdr.go index 3bf041e..144969b 100644 --- a/internal/adapters/filesystem/herdr.go +++ b/internal/adapters/filesystem/herdr.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/kriuchkov/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/domain" ) // InvokedByHook tells Herdr's own hooks — the startup hooks and the diff --git a/internal/adapters/filesystem/paths.go b/internal/adapters/filesystem/paths.go index 517f413..010a082 100644 --- a/internal/adapters/filesystem/paths.go +++ b/internal/adapters/filesystem/paths.go @@ -12,7 +12,7 @@ import ( // defaultPluginID is the plugin id when Herdr did not inject one (a bare // shell run). Herdr's convention is .. -const defaultPluginID = "kriuchkov.herdr-scope" +const defaultPluginID = "killallgit.herdr-scope" // Env reads one environment variable. type Env func(key string) string diff --git a/internal/adapters/filesystem/stamp.go b/internal/adapters/filesystem/stamp.go index 31a371f..2636fe8 100644 --- a/internal/adapters/filesystem/stamp.go +++ b/internal/adapters/filesystem/stamp.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/ports" ) // Stamp implements ports.SetupStamp as a one-line file: which build ran diff --git a/internal/adapters/filesystem/tabbar.go b/internal/adapters/filesystem/tabbar.go index f8b7a7c..311afc3 100644 --- a/internal/adapters/filesystem/tabbar.go +++ b/internal/adapters/filesystem/tabbar.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // Tab-bar budget, calibrated on a real row: the status area shares diff --git a/internal/adapters/font/font.go b/internal/adapters/font/font.go index 1da8c20..da8c020 100644 --- a/internal/adapters/font/font.go +++ b/internal/adapters/font/font.go @@ -20,8 +20,8 @@ import ( "strings" "time" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // iconFamily is the icon font's family name. It never changes between builds: a diff --git a/internal/adapters/font/patch_test.go b/internal/adapters/font/patch_test.go index f3fe01a..ed688ff 100644 --- a/internal/adapters/font/patch_test.go +++ b/internal/adapters/font/patch_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kriuchkov/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/domain" ) func bundledIcons(t *testing.T) []byte { diff --git a/internal/adapters/font/sfnt.go b/internal/adapters/font/sfnt.go index 82fffea..3d8bd57 100644 --- a/internal/adapters/font/sfnt.go +++ b/internal/adapters/font/sfnt.go @@ -6,7 +6,7 @@ import ( "math/bits" "sort" - "github.com/kriuchkov/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/domain" ) // sfnt is a TrueType font held as its tables: enough to graft glyphs from diff --git a/internal/adapters/font/terminalfont.go b/internal/adapters/font/terminalfont.go index 8f4559d..e4c1393 100644 --- a/internal/adapters/font/terminalfont.go +++ b/internal/adapters/font/terminalfont.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - "github.com/kriuchkov/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/domain" ) // iTerm2's preferences domain, read with `defaults export` (read-only: it diff --git a/internal/adapters/font/terminals.go b/internal/adapters/font/terminals.go index d8825c9..8cbe343 100644 --- a/internal/adapters/font/terminals.go +++ b/internal/adapters/font/terminals.go @@ -10,7 +10,7 @@ import ( "regexp" "strings" - "github.com/kriuchkov/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/domain" ) // The markers fence the block in a terminal config. Nothing outside them is diff --git a/internal/adapters/git/resolver.go b/internal/adapters/git/resolver.go index 8065d5d..d69fd3d 100644 --- a/internal/adapters/git/resolver.go +++ b/internal/adapters/git/resolver.go @@ -11,8 +11,8 @@ import ( "regexp" "strings" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // Resolver implements ports.RepositoryResolver. diff --git a/internal/adapters/git/resolver_test.go b/internal/adapters/git/resolver_test.go index 688af3b..fe91a12 100644 --- a/internal/adapters/git/resolver_test.go +++ b/internal/adapters/git/resolver_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kriuchkov/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/domain" ) // fakeRepo lays out a main checkout and a linked worktree by hand, the way diff --git a/internal/adapters/herdr/cli.go b/internal/adapters/herdr/cli.go index 0ec2a36..d496ed0 100644 --- a/internal/adapters/herdr/cli.go +++ b/internal/adapters/herdr/cli.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/kriuchkov/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/domain" ) const cliTimeout = 10 * time.Second diff --git a/internal/adapters/herdr/client.go b/internal/adapters/herdr/client.go index 5843954..73374c3 100644 --- a/internal/adapters/herdr/client.go +++ b/internal/adapters/herdr/client.go @@ -14,7 +14,7 @@ import ( herdrapi "github.com/cyperx84/herdr-api" - "github.com/kriuchkov/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/domain" ) const ( diff --git a/internal/adapters/herdr/client_test.go b/internal/adapters/herdr/client_test.go index ff70776..0c9f29e 100644 --- a/internal/adapters/herdr/client_test.go +++ b/internal/adapters/herdr/client_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kriuchkov/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/domain" ) // fakeServer speaks Herdr's framing: one request per connection, except diff --git a/internal/adapters/herdr/decode.go b/internal/adapters/herdr/decode.go index 649463b..0fbb448 100644 --- a/internal/adapters/herdr/decode.go +++ b/internal/adapters/herdr/decode.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/kriuchkov/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/domain" ) // envelope accepts either a whole response line or just its result. diff --git a/internal/adapters/herdr/events.go b/internal/adapters/herdr/events.go index 0bd7e90..cc7a040 100644 --- a/internal/adapters/herdr/events.go +++ b/internal/adapters/herdr/events.go @@ -9,8 +9,8 @@ import ( herdrapi "github.com/cyperx84/herdr-api" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // Events opens event subscriptions; it implements ports.EventSource. diff --git a/internal/adapters/herdr/mapping.go b/internal/adapters/herdr/mapping.go index 1bab4c7..75610c9 100644 --- a/internal/adapters/herdr/mapping.go +++ b/internal/adapters/herdr/mapping.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/kriuchkov/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/domain" ) // ShowingReader reads which display state Scope's published tokens say a diff --git a/internal/adapters/herdr/metadata.go b/internal/adapters/herdr/metadata.go index 2f94580..b68d49a 100644 --- a/internal/adapters/herdr/metadata.go +++ b/internal/adapters/herdr/metadata.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/kriuchkov/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/domain" ) // maxTokensPerReport is the server's ceiling on one metadata report; a patch diff --git a/internal/adapters/herdr/sources.go b/internal/adapters/herdr/sources.go index 017a8df..9b6ec50 100644 --- a/internal/adapters/herdr/sources.go +++ b/internal/adapters/herdr/sources.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/kriuchkov/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/domain" ) // Observer reads agents and sessions; it implements ports.AgentSource, diff --git a/internal/adapters/scenario/scenario.go b/internal/adapters/scenario/scenario.go index 3aecc76..7fae302 100644 --- a/internal/adapters/scenario/scenario.go +++ b/internal/adapters/scenario/scenario.go @@ -14,11 +14,11 @@ import ( "sync" "time" - "github.com/kriuchkov/herdr-scope/internal/adapters/config" - "github.com/kriuchkov/herdr-scope/internal/adapters/herdr" - "github.com/kriuchkov/herdr-scope/internal/adapters/sidebar" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/adapters/config" + "github.com/killallgit/herdr-scope/internal/adapters/herdr" + "github.com/killallgit/herdr-scope/internal/adapters/sidebar" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // Home is the home directory scenarios are written against. diff --git a/internal/adapters/sidebar/block.go b/internal/adapters/sidebar/block.go index 67112c7..cae6b93 100644 --- a/internal/adapters/sidebar/block.go +++ b/internal/adapters/sidebar/block.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // Herdr's ceilings: rules per cell, tokens per row. A row over the token diff --git a/internal/adapters/sidebar/block_test.go b/internal/adapters/sidebar/block_test.go index 12157b8..3ff023a 100644 --- a/internal/adapters/sidebar/block_test.go +++ b/internal/adapters/sidebar/block_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) func presentationFor(variant ports.Variant, layout ports.Layout) Presentation { diff --git a/internal/adapters/sidebar/fold_test.go b/internal/adapters/sidebar/fold_test.go index 8e7d884..d0462f2 100644 --- a/internal/adapters/sidebar/fold_test.go +++ b/internal/adapters/sidebar/fold_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // foldedView is acme folded: its own working row carries the line, and diff --git a/internal/adapters/sidebar/glyphs.go b/internal/adapters/sidebar/glyphs.go index 16b7909..8a7e0e7 100644 --- a/internal/adapters/sidebar/glyphs.go +++ b/internal/adapters/sidebar/glyphs.go @@ -4,8 +4,8 @@ package sidebar import ( - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // GenericMark is worn by an agent Scope has no mark for: the row keeps its diff --git a/internal/adapters/sidebar/palette.go b/internal/adapters/sidebar/palette.go index fc64f49..6f6e5de 100644 --- a/internal/adapters/sidebar/palette.go +++ b/internal/adapters/sidebar/palette.go @@ -1,8 +1,8 @@ package sidebar import ( - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // The palette is every colour Scope puts on screen. Sidebar token colours diff --git a/internal/adapters/sidebar/tabs.go b/internal/adapters/sidebar/tabs.go index 387a4a6..0818ede 100644 --- a/internal/adapters/sidebar/tabs.go +++ b/internal/adapters/sidebar/tabs.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/kriuchkov/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/domain" ) // renamed is a rename Scope sent: the label it replaced and the label it diff --git a/internal/adapters/sidebar/tabs_test.go b/internal/adapters/sidebar/tabs_test.go index 1d64b0f..ff244ba 100644 --- a/internal/adapters/sidebar/tabs_test.go +++ b/internal/adapters/sidebar/tabs_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kriuchkov/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/domain" ) func tabView(marks ...domain.TabMark) domain.SidebarView { diff --git a/internal/adapters/sidebar/tokens.go b/internal/adapters/sidebar/tokens.go index 7eaf238..df12e64 100644 --- a/internal/adapters/sidebar/tokens.go +++ b/internal/adapters/sidebar/tokens.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // Token names, published under Scope's own source. diff --git a/internal/adapters/sidebar/tokens_test.go b/internal/adapters/sidebar/tokens_test.go index 87d1a74..36779ba 100644 --- a/internal/adapters/sidebar/tokens_test.go +++ b/internal/adapters/sidebar/tokens_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // textPresentation is the classic layout with state marks in Spaces, logos diff --git a/internal/adapters/sidebar/writer.go b/internal/adapters/sidebar/writer.go index 097bcab..a07b2ee 100644 --- a/internal/adapters/sidebar/writer.go +++ b/internal/adapters/sidebar/writer.go @@ -12,8 +12,8 @@ import ( "sync" "time" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // maxTokensPerReport is Herdr's ceiling on one metadata report. diff --git a/internal/adapters/sidebar/writer_test.go b/internal/adapters/sidebar/writer_test.go index 5a377d9..1112749 100644 --- a/internal/adapters/sidebar/writer_test.go +++ b/internal/adapters/sidebar/writer_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // fakeHost records reports and keeps a token store like Herdr's. diff --git a/internal/adapters/state/repository.go b/internal/adapters/state/repository.go index 1da973a..d7c6903 100644 --- a/internal/adapters/state/repository.go +++ b/internal/adapters/state/repository.go @@ -14,8 +14,8 @@ import ( "sync" "time" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // SchemaVersion is the state file's format version. diff --git a/internal/adapters/state/repository_test.go b/internal/adapters/state/repository_test.go index c7ba1a7..e324c56 100644 --- a/internal/adapters/state/repository_test.go +++ b/internal/adapters/state/repository_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kriuchkov/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/domain" ) type recordingLogger struct{ warnings []string } diff --git a/internal/adapters/tui/editor.go b/internal/adapters/tui/editor.go index 6e476a8..dbda929 100644 --- a/internal/adapters/tui/editor.go +++ b/internal/adapters/tui/editor.go @@ -14,10 +14,10 @@ import ( "strings" "unicode/utf8" - "github.com/kriuchkov/herdr-scope/internal/adapters/config" - "github.com/kriuchkov/herdr-scope/internal/application" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/adapters/config" + "github.com/killallgit/herdr-scope/internal/application" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // Deps is what the popup reads and saves through. The two live switches diff --git a/internal/adapters/tui/editor_test.go b/internal/adapters/tui/editor_test.go index 353b46d..012a170 100644 --- a/internal/adapters/tui/editor_test.go +++ b/internal/adapters/tui/editor_test.go @@ -11,10 +11,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kriuchkov/herdr-scope/internal/adapters/config" - "github.com/kriuchkov/herdr-scope/internal/application" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/adapters/config" + "github.com/killallgit/herdr-scope/internal/application" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // fakeBackend stands in for the config file, the two live switches and the diff --git a/internal/adapters/tui/render.go b/internal/adapters/tui/render.go index 3c24996..6d4263a 100644 --- a/internal/adapters/tui/render.go +++ b/internal/adapters/tui/render.go @@ -5,8 +5,8 @@ import ( "strconv" "strings" - "github.com/kriuchkov/herdr-scope/internal/adapters/config" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/adapters/config" + "github.com/killallgit/herdr-scope/internal/ports" ) // SGR sequences, the popup's palette. diff --git a/internal/application/configuration.go b/internal/application/configuration.go index 85f0e60..a457536 100644 --- a/internal/application/configuration.go +++ b/internal/application/configuration.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // UpdateConfiguration validates and saves settings, then tells the daemon to diff --git a/internal/application/daemon.go b/internal/application/daemon.go index 1b75159..944961d 100644 --- a/internal/application/daemon.go +++ b/internal/application/daemon.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // MinProtocol is the oldest Herdr socket protocol Scope supports. diff --git a/internal/application/daemon_test.go b/internal/application/daemon_test.go index 0f53af8..8737915 100644 --- a/internal/application/daemon_test.go +++ b/internal/application/daemon_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) type fakeStream struct { diff --git a/internal/application/fakes_test.go b/internal/application/fakes_test.go index d66a839..c532c12 100644 --- a/internal/application/fakes_test.go +++ b/internal/application/fakes_test.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) var errDown = errors.New("socket down") diff --git a/internal/application/lifecycle.go b/internal/application/lifecycle.go index 9da50da..eebff77 100644 --- a/internal/application/lifecycle.go +++ b/internal/application/lifecycle.go @@ -6,8 +6,8 @@ import ( "fmt" "time" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // Health thresholds for a daemon that answers but may not be drawing. diff --git a/internal/application/observer.go b/internal/application/observer.go index 8da2a1d..584669c 100644 --- a/internal/application/observer.go +++ b/internal/application/observer.go @@ -10,8 +10,8 @@ import ( "slices" "time" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // Observer timings that are not settings. diff --git a/internal/application/observer_test.go b/internal/application/observer_test.go index 452ca0d..2401f41 100644 --- a/internal/application/observer_test.go +++ b/internal/application/observer_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) func frame(t *testing.T, f *fixture) FrameResult { diff --git a/internal/application/settings.go b/internal/application/settings.go index 801dc0b..29a9951 100644 --- a/internal/application/settings.go +++ b/internal/application/settings.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // SettingsRequest is what the settings popup saves: the config file's values diff --git a/internal/application/sortmode.go b/internal/application/sortmode.go index cd0060f..aa72077 100644 --- a/internal/application/sortmode.go +++ b/internal/application/sortmode.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // SortModeToggle switches the panel order. The daemon runs it on a control diff --git a/internal/application/usecases_test.go b/internal/application/usecases_test.go index ae9078d..10e77bc 100644 --- a/internal/application/usecases_test.go +++ b/internal/application/usecases_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // fakeManaged records managed-block operations in order. diff --git a/internal/bootstrap/cli.go b/internal/bootstrap/cli.go index 0b3d6ed..1f25398 100644 --- a/internal/bootstrap/cli.go +++ b/internal/bootstrap/cli.go @@ -12,13 +12,13 @@ import ( "github.com/spf13/cobra" - "github.com/kriuchkov/herdr-scope/internal/adapters/config" - "github.com/kriuchkov/herdr-scope/internal/adapters/control" - "github.com/kriuchkov/herdr-scope/internal/adapters/filesystem" - "github.com/kriuchkov/herdr-scope/internal/adapters/tui" - "github.com/kriuchkov/herdr-scope/internal/application" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/adapters/config" + "github.com/killallgit/herdr-scope/internal/adapters/control" + "github.com/killallgit/herdr-scope/internal/adapters/filesystem" + "github.com/killallgit/herdr-scope/internal/adapters/tui" + "github.com/killallgit/herdr-scope/internal/application" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // Main runs the command line and returns the exit code. diff --git a/internal/bootstrap/daemon.go b/internal/bootstrap/daemon.go index fd6b7e7..99fb3bf 100644 --- a/internal/bootstrap/daemon.go +++ b/internal/bootstrap/daemon.go @@ -9,9 +9,9 @@ import ( "strconv" "time" - "github.com/kriuchkov/herdr-scope/internal/adapters/control" - "github.com/kriuchkov/herdr-scope/internal/application" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/adapters/control" + "github.com/killallgit/herdr-scope/internal/application" + "github.com/killallgit/herdr-scope/internal/ports" ) // Binding the endpoint can lose a race with a daemon that was just told to diff --git a/internal/bootstrap/diagnostics.go b/internal/bootstrap/diagnostics.go index b3464e4..3195723 100644 --- a/internal/bootstrap/diagnostics.go +++ b/internal/bootstrap/diagnostics.go @@ -9,10 +9,10 @@ import ( "strconv" "time" - "github.com/kriuchkov/herdr-scope/internal/adapters/config" - "github.com/kriuchkov/herdr-scope/internal/adapters/filesystem" - "github.com/kriuchkov/herdr-scope/internal/application" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/adapters/config" + "github.com/killallgit/herdr-scope/internal/adapters/filesystem" + "github.com/killallgit/herdr-scope/internal/application" + "github.com/killallgit/herdr-scope/internal/ports" ) // TestedProtocol is the newest Herdr protocol Scope was checked against. diff --git a/internal/bootstrap/process.go b/internal/bootstrap/process.go index 43b5992..62b2880 100644 --- a/internal/bootstrap/process.go +++ b/internal/bootstrap/process.go @@ -11,9 +11,9 @@ import ( "sync" "time" - "github.com/kriuchkov/herdr-scope/internal/adapters/filesystem" - "github.com/kriuchkov/herdr-scope/internal/application" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/adapters/filesystem" + "github.com/killallgit/herdr-scope/internal/application" + "github.com/killallgit/herdr-scope/internal/ports" ) // maxLog bounds the daemon log; one older generation is kept. diff --git a/internal/bootstrap/runtime.go b/internal/bootstrap/runtime.go index ab99461..65c6ad2 100644 --- a/internal/bootstrap/runtime.go +++ b/internal/bootstrap/runtime.go @@ -16,18 +16,18 @@ import ( "sync" "time" - "github.com/kriuchkov/herdr-scope/internal/adapters/appearance" - "github.com/kriuchkov/herdr-scope/internal/adapters/config" - "github.com/kriuchkov/herdr-scope/internal/adapters/control" - "github.com/kriuchkov/herdr-scope/internal/adapters/filesystem" - "github.com/kriuchkov/herdr-scope/internal/adapters/font" - "github.com/kriuchkov/herdr-scope/internal/adapters/git" - "github.com/kriuchkov/herdr-scope/internal/adapters/herdr" - "github.com/kriuchkov/herdr-scope/internal/adapters/sidebar" - "github.com/kriuchkov/herdr-scope/internal/adapters/state" - "github.com/kriuchkov/herdr-scope/internal/application" - "github.com/kriuchkov/herdr-scope/internal/domain" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/adapters/appearance" + "github.com/killallgit/herdr-scope/internal/adapters/config" + "github.com/killallgit/herdr-scope/internal/adapters/control" + "github.com/killallgit/herdr-scope/internal/adapters/filesystem" + "github.com/killallgit/herdr-scope/internal/adapters/font" + "github.com/killallgit/herdr-scope/internal/adapters/git" + "github.com/killallgit/herdr-scope/internal/adapters/herdr" + "github.com/killallgit/herdr-scope/internal/adapters/sidebar" + "github.com/killallgit/herdr-scope/internal/adapters/state" + "github.com/killallgit/herdr-scope/internal/application" + "github.com/killallgit/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/ports" ) // Build identifies this binary. diff --git a/internal/bootstrap/runtime_test.go b/internal/bootstrap/runtime_test.go index 96ac020..5aad8b4 100644 --- a/internal/bootstrap/runtime_test.go +++ b/internal/bootstrap/runtime_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/kriuchkov/herdr-scope/internal/adapters/sidebar" - "github.com/kriuchkov/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/adapters/sidebar" + "github.com/killallgit/herdr-scope/internal/domain" ) // The writer's presentation probes the terminal font; a command that never diff --git a/internal/bootstrap/tools.go b/internal/bootstrap/tools.go index e695fdf..fc85f8c 100644 --- a/internal/bootstrap/tools.go +++ b/internal/bootstrap/tools.go @@ -6,9 +6,9 @@ import ( "github.com/spf13/cobra" - "github.com/kriuchkov/herdr-scope/internal/adapters/scenario" - "github.com/kriuchkov/herdr-scope/internal/adapters/sidebar" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/adapters/scenario" + "github.com/killallgit/herdr-scope/internal/adapters/sidebar" + "github.com/killallgit/herdr-scope/internal/ports" ) func renderCommand() *cobra.Command { diff --git a/internal/ports/control.go b/internal/ports/control.go index 4df9b4b..29c5ec4 100644 --- a/internal/ports/control.go +++ b/internal/ports/control.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/kriuchkov/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/domain" ) // ControlCommand names a request to the resident daemon. diff --git a/internal/ports/ports.go b/internal/ports/ports.go index 36785d6..1bbc225 100644 --- a/internal/ports/ports.go +++ b/internal/ports/ports.go @@ -6,7 +6,7 @@ import ( "context" "time" - "github.com/kriuchkov/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/domain" ) // AgentSource reads the live agent list — the cheap per-frame refresh. diff --git a/internal/ports/settings.go b/internal/ports/settings.go index 001a75c..c4a1b60 100644 --- a/internal/ports/settings.go +++ b/internal/ports/settings.go @@ -6,7 +6,7 @@ import ( "regexp" "time" - "github.com/kriuchkov/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/domain" ) // Settings is the plugin configuration as the application sees it. diff --git a/scripts/build.cmd b/scripts/build.cmd index 4a3d495..a41c24f 100644 --- a/scripts/build.cmd +++ b/scripts/build.cmd @@ -48,11 +48,11 @@ rem The release download. The script reads the version from the manifest rem (\x22 is a double quote, which cmd would take for the end of the argument) rem and the architecture from SCOPE_ARCH. set "SCOPE_ARCH=%ARCH%" -powershell -NoProfile -NonInteractive -Command "$ErrorActionPreference = 'Stop'; $v = (Select-String -Path 'herdr-plugin.toml' -Pattern '^version = \x22(.+)\x22$' | Select-Object -First 1).Matches[0].Groups[1].Value; $name = 'herdr-scope-' + $v + '-windows-' + $env:SCOPE_ARCH; $url = 'https://github.com/kriuchkov/herdr-scope/releases/download/v' + $v; $work = Join-Path ([IO.Path]::GetTempPath()) ([IO.Path]::GetRandomFileName()); New-Item -ItemType Directory -Path $work | Out-Null; try { [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; function Get-Asset($uri, $file) { for ($try = 1; $try -le 3; $try++) { try { Invoke-WebRequest -UseBasicParsing -Uri $uri -OutFile $file; return } catch { if ($try -eq 3) { throw }; Start-Sleep -Seconds $try } } }; Write-Host ('herdr-scope: downloading ' + $name + '.zip from the v' + $v + ' release'); Get-Asset ($url + '/SHA256SUMS') (Join-Path $work 'SHA256SUMS'); Get-Asset ($url + '/' + $name + '.zip') (Join-Path $work ($name + '.zip')); $line = Get-Content (Join-Path $work 'SHA256SUMS') | Where-Object { $_.EndsWith(' ' + $name + '.zip') } | Select-Object -First 1; $got = (Get-FileHash -Algorithm SHA256 -Path (Join-Path $work ($name + '.zip'))).Hash; if (-not $line -or $line.Split(' ')[0] -ne $got) { throw ($name + '.zip does not match the release SHA256SUMS') }; Expand-Archive -Path (Join-Path $work ($name + '.zip')) -DestinationPath $work; New-Item -ItemType Directory -Force -Path 'bin' | Out-Null; Copy-Item -Force -Path (Join-Path $work ($name + '\herdr-scope.exe')) -Destination 'bin\herdr-scope.exe'; $out = & 'bin\herdr-scope.exe' version; if (-not ($out -like ('herdr-scope ' + $v + ' *'))) { throw ('the downloaded binary is not version ' + $v) }; Write-Host ('herdr-scope: installed the v' + $v + ' release binary') } finally { Remove-Item -Recurse -Force -Path $work }" && exit /b 0 +powershell -NoProfile -NonInteractive -Command "$ErrorActionPreference = 'Stop'; $v = (Select-String -Path 'herdr-plugin.toml' -Pattern '^version = \x22(.+)\x22$' | Select-Object -First 1).Matches[0].Groups[1].Value; $name = 'herdr-scope-' + $v + '-windows-' + $env:SCOPE_ARCH; $url = 'https://github.com/killallgit/herdr-scope/releases/download/v' + $v; $work = Join-Path ([IO.Path]::GetTempPath()) ([IO.Path]::GetRandomFileName()); New-Item -ItemType Directory -Path $work | Out-Null; try { [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; function Get-Asset($uri, $file) { for ($try = 1; $try -le 3; $try++) { try { Invoke-WebRequest -UseBasicParsing -Uri $uri -OutFile $file; return } catch { if ($try -eq 3) { throw }; Start-Sleep -Seconds $try } } }; Write-Host ('herdr-scope: downloading ' + $name + '.zip from the v' + $v + ' release'); Get-Asset ($url + '/SHA256SUMS') (Join-Path $work 'SHA256SUMS'); Get-Asset ($url + '/' + $name + '.zip') (Join-Path $work ($name + '.zip')); $line = Get-Content (Join-Path $work 'SHA256SUMS') | Where-Object { $_.EndsWith(' ' + $name + '.zip') } | Select-Object -First 1; $got = (Get-FileHash -Algorithm SHA256 -Path (Join-Path $work ($name + '.zip'))).Hash; if (-not $line -or $line.Split(' ')[0] -ne $got) { throw ($name + '.zip does not match the release SHA256SUMS') }; Expand-Archive -Path (Join-Path $work ($name + '.zip')) -DestinationPath $work; New-Item -ItemType Directory -Force -Path 'bin' | Out-Null; Copy-Item -Force -Path (Join-Path $work ($name + '\herdr-scope.exe')) -Destination 'bin\herdr-scope.exe'; $out = & 'bin\herdr-scope.exe' version; if (-not ($out -like ('herdr-scope ' + $v + ' *'))) { throw ('the downloaded binary is not version ' + $v) }; Write-Host ('herdr-scope: installed the v' + $v + ' release binary') } finally { Remove-Item -Recurse -Force -Path $work }" && exit /b 0 1>&2 echo herdr-scope: cannot install: this checkout has no prebuilt binary for 1>&2 echo windows-%ARCH%, no Go toolchain built one, and the release binary could 1>&2 echo not be downloaded. Install a release, which ships prebuilt binaries for -1>&2 echo macOS, Linux and Windows on amd64 and arm64: herdr plugin install kriuchkov/herdr-scope --ref release +1>&2 echo macOS, Linux and Windows on amd64 and arm64: herdr plugin install killallgit/herdr-scope --ref release 1>&2 echo -- or install Go 1.26 or newer from https://go.dev/dl/ and run the install again. exit /b 1 diff --git a/scripts/build.sh b/scripts/build.sh index 5d8fe16..0957730 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -14,7 +14,8 @@ set -eu cd "$(dirname -- "$0")/.." -repo=kriuchkov/herdr-scope +# The releases this version's binaries come from. +repo=killallgit/herdr-scope version=$(sed -n 's/^version = "\(.*\)"$/\1/p' herdr-plugin.toml | head -n 1) os=$(uname -s | tr '[:upper:]' '[:lower:]') arch=$(uname -m) @@ -107,7 +108,7 @@ herdr-scope: cannot install: this checkout has no prebuilt binary for $os-$arch, no Go toolchain built one, and the v$version release binary could not be downloaded. Install a release, which ships prebuilt binaries for macOS, Linux and Windows on amd64 and arm64 (herdr plugin install -kriuchkov/herdr-scope --ref release), or install Go 1.26 or newer +$repo --ref release), or install Go 1.26 or newer (https://go.dev/dl/) and run the install again. EOF exit 1 diff --git a/tests/contract/herdr_test.go b/tests/contract/herdr_test.go index bfe977a..0f47259 100644 --- a/tests/contract/herdr_test.go +++ b/tests/contract/herdr_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kriuchkov/herdr-scope/internal/adapters/herdr" - "github.com/kriuchkov/herdr-scope/internal/domain" + "github.com/killallgit/herdr-scope/internal/adapters/herdr" + "github.com/killallgit/herdr-scope/internal/domain" ) func fixture(t *testing.T, name string) []byte { diff --git a/tests/contract/manifest_test.go b/tests/contract/manifest_test.go index 6f50bce..6d49c37 100644 --- a/tests/contract/manifest_test.go +++ b/tests/contract/manifest_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kriuchkov/herdr-scope/internal/bootstrap" + "github.com/killallgit/herdr-scope/internal/bootstrap" ) type command struct { @@ -46,7 +46,7 @@ func loadManifest(t *testing.T) manifest { func TestManifestIdentity(t *testing.T) { m := loadManifest(t) - assert.Equal(t, "kriuchkov.herdr-scope", m.ID) + assert.Equal(t, "killallgit.herdr-scope", m.ID) assert.Equal(t, bootstrap.Version, m.Version, "the manifest and the binary declare one version") assert.Equal(t, "0.9.0", m.MinHerdrVersion, "protocol 22 shipped with Herdr 0.9.0") assert.ElementsMatch(t, []string{"linux", "macos", "windows"}, m.Platforms) diff --git a/tests/golden/golden_test.go b/tests/golden/golden_test.go index e8cd368..b4958cf 100644 --- a/tests/golden/golden_test.go +++ b/tests/golden/golden_test.go @@ -17,9 +17,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kriuchkov/herdr-scope/internal/adapters/scenario" - "github.com/kriuchkov/herdr-scope/internal/adapters/sidebar" - "github.com/kriuchkov/herdr-scope/internal/ports" + "github.com/killallgit/herdr-scope/internal/adapters/scenario" + "github.com/killallgit/herdr-scope/internal/adapters/sidebar" + "github.com/killallgit/herdr-scope/internal/ports" ) //nolint:gochecknoglobals // a test flag is package state by design diff --git a/tests/integration/herdr_test.go b/tests/integration/herdr_test.go index 508a482..ea2f2dc 100644 --- a/tests/integration/herdr_test.go +++ b/tests/integration/herdr_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" ) -const pluginID = "kriuchkov.herdr-scope" +const pluginID = "killallgit.herdr-scope" type env struct { t *testing.T diff --git a/tests/unit/architecture_test.go b/tests/unit/architecture_test.go index 39d8977..037b24a 100644 --- a/tests/unit/architecture_test.go +++ b/tests/unit/architecture_test.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/require" ) -const module = "github.com/kriuchkov/herdr-scope" +const module = "github.com/killallgit/herdr-scope" // layerRules: for each inner layer, the module packages it may import and the // standard-library packages it must not.