From 7e896c9411267299fa45919437ebf906ade1f3b7 Mon Sep 17 00:00:00 2001 From: Sam Catlow Date: Fri, 7 Aug 2026 00:24:05 +1000 Subject: [PATCH] refactor: migration of workflow into it's own domain --- cmd/archie-agent/taskrun.go | 6 ++-- cmd/archied/main.go | 6 ++-- internal/daemon/daemon.go | 6 ++-- internal/daemon/dispatcher.go | 1 + internal/daemon/identity.go | 1 + internal/{ => domain}/curator/contract.go | 0 .../{ => domain}/curator/contract_test.go | 0 internal/{ => domain}/curator/registrar.go | 4 +-- internal/{ => domain}/curator/registry.go | 0 .../{ => domain}/curator/registry_test.go | 0 internal/{ => domain}/curator/runtime.go | 0 internal/{ => domain}/curator/runtime_test.go | 0 internal/{ => domain}/curator/wake.go | 0 internal/{ => domain}/curator/wake_test.go | 0 internal/{ => domain}/workflow/agent.go | 0 internal/{ => domain}/workflow/agent_test.go | 0 internal/{ => domain}/workflow/feasibility.go | 0 internal/{ => domain}/workflow/implement.go | 0 .../{ => domain}/workflow/implement_test.go | 0 internal/{ => domain}/workflow/plugin_test.go | 0 internal/{ => domain}/workflow/routing.go | 0 .../workflow/skillbuild/skillbuild.go | 4 +-- .../workflow/skillbuild/skillbuild_test.go | 34 +++++++++---------- internal/{ => domain}/workflow/steps.go | 0 internal/{ => domain}/workflow/steps_test.go | 0 internal/{ => domain}/workflow/tdd.go | 0 internal/{ => domain}/workflow/tdd_test.go | 0 .../{ => domain}/workflow/wfeval/yaegi.go | 4 +-- .../workflow/wfeval/yaegi_test.go | 10 +++--- ...charles93-archie-core-internal-workflow.go | 4 +-- .../workflow/wfextract/wfextract.go | 0 .../workflow/wfextract/wfextract_test.go | 4 +-- internal/{ => domain}/workflow/workflow.go | 0 33 files changed, 42 insertions(+), 42 deletions(-) create mode 100644 internal/daemon/dispatcher.go create mode 100644 internal/daemon/identity.go rename internal/{ => domain}/curator/contract.go (100%) rename internal/{ => domain}/curator/contract_test.go (100%) rename internal/{ => domain}/curator/registrar.go (94%) rename internal/{ => domain}/curator/registry.go (100%) rename internal/{ => domain}/curator/registry_test.go (100%) rename internal/{ => domain}/curator/runtime.go (100%) rename internal/{ => domain}/curator/runtime_test.go (100%) rename internal/{ => domain}/curator/wake.go (100%) rename internal/{ => domain}/curator/wake_test.go (100%) rename internal/{ => domain}/workflow/agent.go (100%) rename internal/{ => domain}/workflow/agent_test.go (100%) rename internal/{ => domain}/workflow/feasibility.go (100%) rename internal/{ => domain}/workflow/implement.go (100%) rename internal/{ => domain}/workflow/implement_test.go (100%) rename internal/{ => domain}/workflow/plugin_test.go (100%) rename internal/{ => domain}/workflow/routing.go (100%) rename internal/{ => domain}/workflow/skillbuild/skillbuild.go (97%) rename internal/{ => domain}/workflow/skillbuild/skillbuild_test.go (97%) rename internal/{ => domain}/workflow/steps.go (100%) rename internal/{ => domain}/workflow/steps_test.go (100%) rename internal/{ => domain}/workflow/tdd.go (100%) rename internal/{ => domain}/workflow/tdd_test.go (100%) rename internal/{ => domain}/workflow/wfeval/yaegi.go (94%) rename internal/{ => domain}/workflow/wfeval/yaegi_test.go (90%) rename internal/{ => domain}/workflow/wfextract/github_com-samcharles93-archie-core-internal-workflow.go (90%) rename internal/{ => domain}/workflow/wfextract/wfextract.go (100%) rename internal/{ => domain}/workflow/wfextract/wfextract_test.go (88%) rename internal/{ => domain}/workflow/workflow.go (100%) diff --git a/cmd/archie-agent/taskrun.go b/cmd/archie-agent/taskrun.go index bc3c35ab5..b4d7b59ee 100644 --- a/cmd/archie-agent/taskrun.go +++ b/cmd/archie-agent/taskrun.go @@ -14,9 +14,9 @@ import ( "github.com/samcharles93/archie-core/internal/storage" "github.com/samcharles93/archie-core/internal/storerpc" "github.com/samcharles93/archie-core/internal/taskrun" - "github.com/samcharles93/archie-core/internal/workflow" - "github.com/samcharles93/archie-core/internal/workflow/skillbuild" - "github.com/samcharles93/archie-core/internal/workflow/wfeval" + "github.com/samcharles93/archie-core/internal/domain/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow/skillbuild" + "github.com/samcharles93/archie-core/internal/domain/workflow/wfeval" "github.com/samcharles93/archie-core/internal/worktree" "github.com/samcharles93/archie-core/internal/worktreerpc" ) diff --git a/cmd/archied/main.go b/cmd/archied/main.go index 6f8870dd5..02eae5e4f 100644 --- a/cmd/archied/main.go +++ b/cmd/archied/main.go @@ -30,8 +30,8 @@ import ( "github.com/samcharles93/archie-core/internal/channels/webhook" "github.com/samcharles93/archie-core/internal/config" "github.com/samcharles93/archie-core/internal/container" - "github.com/samcharles93/archie-core/internal/curator" "github.com/samcharles93/archie-core/internal/daemon" + "github.com/samcharles93/archie-core/internal/domain/curator" "github.com/samcharles93/archie-core/internal/domain/workintake" "github.com/samcharles93/archie-core/internal/events" "github.com/samcharles93/archie-core/internal/forge" @@ -59,8 +59,8 @@ import ( memorytoolprovider "github.com/samcharles93/archie-core/internal/tools/provider/memory" "github.com/samcharles93/archie-core/internal/tools/webfetch" "github.com/samcharles93/archie-core/internal/webui" - "github.com/samcharles93/archie-core/internal/workflow/skillbuild" - "github.com/samcharles93/archie-core/internal/workflow/wfeval" + "github.com/samcharles93/archie-core/internal/domain/workflow/skillbuild" + "github.com/samcharles93/archie-core/internal/domain/workflow/wfeval" "github.com/samcharles93/archie-core/internal/worktree" "github.com/samcharles93/archie-core/internal/worktreerpc" ) diff --git a/internal/daemon/daemon.go b/internal/daemon/daemon.go index e4cf1e42f..ee4ca37bf 100644 --- a/internal/daemon/daemon.go +++ b/internal/daemon/daemon.go @@ -17,7 +17,7 @@ import ( "github.com/samcharles93/archie-core/internal/agentexec" "github.com/samcharles93/archie-core/internal/config" "github.com/samcharles93/archie-core/internal/container" - "github.com/samcharles93/archie-core/internal/curator" + "github.com/samcharles93/archie-core/internal/domain/curator" "github.com/samcharles93/archie-core/internal/domain/workintake" "github.com/samcharles93/archie-core/internal/eventbus" "github.com/samcharles93/archie-core/internal/events" @@ -28,8 +28,8 @@ import ( "github.com/samcharles93/archie-core/internal/store" "github.com/samcharles93/archie-core/internal/taskrun" "github.com/samcharles93/archie-core/internal/tools" - "github.com/samcharles93/archie-core/internal/workflow" - "github.com/samcharles93/archie-core/internal/workflow/skillbuild" + "github.com/samcharles93/archie-core/internal/domain/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow/skillbuild" "github.com/samcharles93/archie-core/internal/worktree" ) diff --git a/internal/daemon/dispatcher.go b/internal/daemon/dispatcher.go new file mode 100644 index 000000000..9d3072094 --- /dev/null +++ b/internal/daemon/dispatcher.go @@ -0,0 +1 @@ +package daemon diff --git a/internal/daemon/identity.go b/internal/daemon/identity.go new file mode 100644 index 000000000..9d3072094 --- /dev/null +++ b/internal/daemon/identity.go @@ -0,0 +1 @@ +package daemon diff --git a/internal/curator/contract.go b/internal/domain/curator/contract.go similarity index 100% rename from internal/curator/contract.go rename to internal/domain/curator/contract.go diff --git a/internal/curator/contract_test.go b/internal/domain/curator/contract_test.go similarity index 100% rename from internal/curator/contract_test.go rename to internal/domain/curator/contract_test.go diff --git a/internal/curator/registrar.go b/internal/domain/curator/registrar.go similarity index 94% rename from internal/curator/registrar.go rename to internal/domain/curator/registrar.go index b9ebc899b..44870ee5a 100644 --- a/internal/curator/registrar.go +++ b/internal/domain/curator/registrar.go @@ -93,15 +93,13 @@ type Skill struct { // EventSink publishes curator activity (what ran, what changed, why). It is // the emission side only; wake signals arrive through the runtime's own -// subscription (archie-core-89x). Implementations MUST be non-blocking and +// subscription. Implementations MUST be non-blocking and // bounded, matching the in-process event bus semantics. type EventSink interface { Emit(kind, detail string, data map[string]any) } // Clock is injectable time: Now for timestamps and After for loop sleeps. -// The runtime's loop timing is tested with a fake clock, never wall-clock -// sleeps (archie-core-89x); the real implementation is the system clock. type Clock interface { Now() time.Time After(d time.Duration) <-chan time.Time diff --git a/internal/curator/registry.go b/internal/domain/curator/registry.go similarity index 100% rename from internal/curator/registry.go rename to internal/domain/curator/registry.go diff --git a/internal/curator/registry_test.go b/internal/domain/curator/registry_test.go similarity index 100% rename from internal/curator/registry_test.go rename to internal/domain/curator/registry_test.go diff --git a/internal/curator/runtime.go b/internal/domain/curator/runtime.go similarity index 100% rename from internal/curator/runtime.go rename to internal/domain/curator/runtime.go diff --git a/internal/curator/runtime_test.go b/internal/domain/curator/runtime_test.go similarity index 100% rename from internal/curator/runtime_test.go rename to internal/domain/curator/runtime_test.go diff --git a/internal/curator/wake.go b/internal/domain/curator/wake.go similarity index 100% rename from internal/curator/wake.go rename to internal/domain/curator/wake.go diff --git a/internal/curator/wake_test.go b/internal/domain/curator/wake_test.go similarity index 100% rename from internal/curator/wake_test.go rename to internal/domain/curator/wake_test.go diff --git a/internal/workflow/agent.go b/internal/domain/workflow/agent.go similarity index 100% rename from internal/workflow/agent.go rename to internal/domain/workflow/agent.go diff --git a/internal/workflow/agent_test.go b/internal/domain/workflow/agent_test.go similarity index 100% rename from internal/workflow/agent_test.go rename to internal/domain/workflow/agent_test.go diff --git a/internal/workflow/feasibility.go b/internal/domain/workflow/feasibility.go similarity index 100% rename from internal/workflow/feasibility.go rename to internal/domain/workflow/feasibility.go diff --git a/internal/workflow/implement.go b/internal/domain/workflow/implement.go similarity index 100% rename from internal/workflow/implement.go rename to internal/domain/workflow/implement.go diff --git a/internal/workflow/implement_test.go b/internal/domain/workflow/implement_test.go similarity index 100% rename from internal/workflow/implement_test.go rename to internal/domain/workflow/implement_test.go diff --git a/internal/workflow/plugin_test.go b/internal/domain/workflow/plugin_test.go similarity index 100% rename from internal/workflow/plugin_test.go rename to internal/domain/workflow/plugin_test.go diff --git a/internal/workflow/routing.go b/internal/domain/workflow/routing.go similarity index 100% rename from internal/workflow/routing.go rename to internal/domain/workflow/routing.go diff --git a/internal/workflow/skillbuild/skillbuild.go b/internal/domain/workflow/skillbuild/skillbuild.go similarity index 97% rename from internal/workflow/skillbuild/skillbuild.go rename to internal/domain/workflow/skillbuild/skillbuild.go index 40e85a743..06f1c3a8e 100644 --- a/internal/workflow/skillbuild/skillbuild.go +++ b/internal/domain/workflow/skillbuild/skillbuild.go @@ -15,8 +15,8 @@ import ( "github.com/traefik/yaegi/interp" "github.com/samcharles93/archie-core/internal/skill" - "github.com/samcharles93/archie-core/internal/workflow" - "github.com/samcharles93/archie-core/internal/workflow/wfextract" + "github.com/samcharles93/archie-core/internal/domain/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow/wfextract" "github.com/samcharles93/archie-core/internal/yaegiutil" ) diff --git a/internal/workflow/skillbuild/skillbuild_test.go b/internal/domain/workflow/skillbuild/skillbuild_test.go similarity index 97% rename from internal/workflow/skillbuild/skillbuild_test.go rename to internal/domain/workflow/skillbuild/skillbuild_test.go index 927e1032c..6978328a6 100644 --- a/internal/workflow/skillbuild/skillbuild_test.go +++ b/internal/domain/workflow/skillbuild/skillbuild_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/samcharles93/archie-core/internal/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow" ) // ── workflows built from skill plugins ──────────────────────────────── @@ -39,7 +39,7 @@ Greet the world, then say goodbye. import ( "context" - "github.com/samcharles93/archie-core/internal/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow" ) func Stage() (string, func(context.Context, *workflow.TaskContext) error) { @@ -57,7 +57,7 @@ func Stage() (string, func(context.Context, *workflow.TaskContext) error) { import ( "context" - "github.com/samcharles93/archie-core/internal/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow" ) func Stage() (string, func(context.Context, *workflow.TaskContext) error) { @@ -133,7 +133,7 @@ func TestBuildRegistryFromSkillCatalog(t *testing.T) { import ( "context" - "github.com/samcharles93/archie-core/internal/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow" ) func Stage() (string, func(context.Context, *workflow.TaskContext) error) { @@ -167,7 +167,7 @@ Greet the user. import ( "context" - "github.com/samcharles93/archie-core/internal/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow" ) func Stage() (string, func(context.Context, *workflow.TaskContext) error) { @@ -373,7 +373,7 @@ Custom worktree workflow. import ( "context" - "github.com/samcharles93/archie-core/internal/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow" ) func Stage() (string, func(context.Context, *workflow.TaskContext) error) { @@ -449,7 +449,7 @@ Repo-custom implement. import ( "context" - "github.com/samcharles93/archie-core/internal/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow" ) func Stage() (string, func(context.Context, *workflow.TaskContext) error) { @@ -608,7 +608,7 @@ Concurrent. import ( "context" - "github.com/samcharles93/archie-core/internal/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow" ) func Stage() (string, func(context.Context, *workflow.TaskContext) error) { @@ -759,7 +759,7 @@ func TestBuildWorkflowSkipsBrokenPlugin(t *testing.T) { import ( "context" - "github.com/samcharles93/archie-core/internal/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow" ) func Stage() (string, func(context.Context, *workflow.TaskContext) error) { @@ -784,7 +784,7 @@ this is %% NOT VALID GO @@@@ import ( "context" - "github.com/samcharles93/archie-core/internal/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow" ) func Stage() (string, func(context.Context, *workflow.TaskContext) error) { @@ -904,7 +904,7 @@ Custom implement. import ( "context" - "github.com/samcharles93/archie-core/internal/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow" ) func Stage() (string, func(context.Context, *workflow.TaskContext) error) { @@ -972,7 +972,7 @@ First. import ( "context" - "github.com/samcharles93/archie-core/internal/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow" ) func Stage() (string, func(context.Context, *workflow.TaskContext) error) { @@ -1007,7 +1007,7 @@ Second. import ( "context" - "github.com/samcharles93/archie-core/internal/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow" ) func Stage() (string, func(context.Context, *workflow.TaskContext) error) { @@ -1095,7 +1095,7 @@ Custom. import ( "context" - "github.com/samcharles93/archie-core/internal/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow" ) func Stage() (string, func(context.Context, *workflow.TaskContext) error) { @@ -1160,7 +1160,7 @@ First. import ( "context" - "github.com/samcharles93/archie-core/internal/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow" ) func Stage() (string, func(context.Context, *workflow.TaskContext) error) { @@ -1194,7 +1194,7 @@ Second. import ( "context" - "github.com/samcharles93/archie-core/internal/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow" ) func Stage() (string, func(context.Context, *workflow.TaskContext) error) { @@ -1257,7 +1257,7 @@ func TestBuildRegistrySkipsBrokenSkill(t *testing.T) { import ( "context" - "github.com/samcharles93/archie-core/internal/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow" ) func Stage() (string, func(context.Context, *workflow.TaskContext) error) { diff --git a/internal/workflow/steps.go b/internal/domain/workflow/steps.go similarity index 100% rename from internal/workflow/steps.go rename to internal/domain/workflow/steps.go diff --git a/internal/workflow/steps_test.go b/internal/domain/workflow/steps_test.go similarity index 100% rename from internal/workflow/steps_test.go rename to internal/domain/workflow/steps_test.go diff --git a/internal/workflow/tdd.go b/internal/domain/workflow/tdd.go similarity index 100% rename from internal/workflow/tdd.go rename to internal/domain/workflow/tdd.go diff --git a/internal/workflow/tdd_test.go b/internal/domain/workflow/tdd_test.go similarity index 100% rename from internal/workflow/tdd_test.go rename to internal/domain/workflow/tdd_test.go diff --git a/internal/workflow/wfeval/yaegi.go b/internal/domain/workflow/wfeval/yaegi.go similarity index 94% rename from internal/workflow/wfeval/yaegi.go rename to internal/domain/workflow/wfeval/yaegi.go index ddb72fb5b..17834671e 100644 --- a/internal/workflow/wfeval/yaegi.go +++ b/internal/domain/workflow/wfeval/yaegi.go @@ -13,8 +13,8 @@ import ( "github.com/traefik/yaegi/interp" - "github.com/samcharles93/archie-core/internal/workflow" - "github.com/samcharles93/archie-core/internal/workflow/wfextract" + "github.com/samcharles93/archie-core/internal/domain/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow/wfextract" "github.com/samcharles93/archie-core/internal/yaegiutil" ) diff --git a/internal/workflow/wfeval/yaegi_test.go b/internal/domain/workflow/wfeval/yaegi_test.go similarity index 90% rename from internal/workflow/wfeval/yaegi_test.go rename to internal/domain/workflow/wfeval/yaegi_test.go index 2afda96ad..63102ecc6 100644 --- a/internal/workflow/wfeval/yaegi_test.go +++ b/internal/domain/workflow/wfeval/yaegi_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "github.com/samcharles93/archie-core/internal/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow" ) func writeStageScript(t *testing.T, dir, name, src string) { @@ -37,7 +37,7 @@ func TestDiscoverRunsStagesInFilenameOrder(t *testing.T) { import ( "context" - "github.com/samcharles93/archie-core/internal/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow" ) func Stage() workflow.Stage { @@ -51,7 +51,7 @@ func Stage() workflow.Stage { import ( "context" - "github.com/samcharles93/archie-core/internal/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow" ) func Stage() workflow.Stage { @@ -82,7 +82,7 @@ import ( "os" "path/filepath" - "github.com/samcharles93/archie-core/internal/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow" ) func Stage() workflow.Stage { @@ -125,7 +125,7 @@ func TestDiscoverPanicRecovered(t *testing.T) { dir := t.TempDir() writeStageScript(t, dir, "panics.go", `package stages -import "github.com/samcharles93/archie-core/internal/workflow" +import "github.com/samcharles93/archie-core/internal/domain/workflow" func Stage() workflow.Stage { var files []string diff --git a/internal/workflow/wfextract/github_com-samcharles93-archie-core-internal-workflow.go b/internal/domain/workflow/wfextract/github_com-samcharles93-archie-core-internal-workflow.go similarity index 90% rename from internal/workflow/wfextract/github_com-samcharles93-archie-core-internal-workflow.go rename to internal/domain/workflow/wfextract/github_com-samcharles93-archie-core-internal-workflow.go index f1b4d975c..047c3e955 100644 --- a/internal/workflow/wfextract/github_com-samcharles93-archie-core-internal-workflow.go +++ b/internal/domain/workflow/wfextract/github_com-samcharles93-archie-core-internal-workflow.go @@ -5,11 +5,11 @@ package wfextract import ( "reflect" - "github.com/samcharles93/archie-core/internal/workflow" + "github.com/samcharles93/archie-core/internal/domain/workflow" ) func init() { - Symbols["github.com/samcharles93/archie-core/internal/workflow/workflow"] = map[string]reflect.Value{ + Symbols["github.com/samcharles93/archie-core/internal/domain/workflow/workflow"] = map[string]reflect.Value{ // function, constant and variable definitions "Bootstrap": reflect.ValueOf(workflow.Bootstrap), "Feasibility": reflect.ValueOf(workflow.Feasibility), diff --git a/internal/workflow/wfextract/wfextract.go b/internal/domain/workflow/wfextract/wfextract.go similarity index 100% rename from internal/workflow/wfextract/wfextract.go rename to internal/domain/workflow/wfextract/wfextract.go diff --git a/internal/workflow/wfextract/wfextract_test.go b/internal/domain/workflow/wfextract/wfextract_test.go similarity index 88% rename from internal/workflow/wfextract/wfextract_test.go rename to internal/domain/workflow/wfextract/wfextract_test.go index 7259f63c9..214743857 100644 --- a/internal/workflow/wfextract/wfextract_test.go +++ b/internal/domain/workflow/wfextract/wfextract_test.go @@ -6,7 +6,7 @@ import ( ) func TestSymbolsContainsExpectedWorkflowEntries(t *testing.T) { - pkgKey := "github.com/samcharles93/archie-core/internal/workflow/workflow" + pkgKey := "github.com/samcharles93/archie-core/internal/domain/workflow/workflow" pkg, ok := Symbols[pkgKey] if !ok { t.Fatalf("Symbols missing key %q", pkgKey) @@ -46,7 +46,7 @@ func TestSymbolsContainsExpectedWorkflowEntries(t *testing.T) { } func TestWFExtractSymbolCountReasonable(t *testing.T) { - pkgKey := "github.com/samcharles93/archie-core/internal/workflow/workflow" + pkgKey := "github.com/samcharles93/archie-core/internal/domain/workflow/workflow" pkg := Symbols[pkgKey] // Should have at least the core functions + types (10+ entries). if len(pkg) < 10 { diff --git a/internal/workflow/workflow.go b/internal/domain/workflow/workflow.go similarity index 100% rename from internal/workflow/workflow.go rename to internal/domain/workflow/workflow.go