feat: small refactor and fix lint issues

Author: matt-FFFFFF

.github/copilot-instructions.md

@@ -41,3 +41,8 @@ and `"github.com/stretchr/testify/require"` packages.
 - Unit tests should reside in a file named as per the file containing the code being tested, with the suffix `_test.go`.
 - Integration tests should reside in a file named as per the file or package containing the code being tested, with the suffix `_integration_test.go`.
 - This package uses concurrency so tests should be run with the `-race` flag to ensure they are thread-safe. This should be done after verifying unit tests pass in isolation.
+
+### Building and Running
+
+- The binary is built from the `./cmd` package.
+- Use `make build` to build the project.

.gitignore

@@ -1,5 +1,6 @@
 porch
 porch.exe
+!/cmd/porch
 
 .vscode
 

Makefile

@@ -1,16 +1,26 @@
-default:
-	@echo "No default target specified. Please specify a target."
+.PHONY: build
+build:
+	@echo "Building the project..."
+	@go build -o porch ./cmd/porch
 
+.PHONY: testcover
 testcover:
 	@echo "Running tests with coverage..."
 	@go test -coverprofile=coverage.out ./...
 	@go tool cover -html=coverage.out -o coverage.html
 	@echo "Coverage report generated: coverage.html"
 
+.PHONY: test
 test:
 	@echo "Running tests..."
+	@go test ./...
+
+.PHONY: testrace
+testrace:
+	@echo "Running tests with race detection..."
 	@go test -race ./...
 
+.PHONY: lint
 lint:
 	@echo "Running linter..."
 	@golangci-lint run --fix

cmd/cmd.go

@@ -14,6 +14,7 @@ import (
 	"github.com/urfave/cli/v3"
 )
 
+// ConfigCmd is the command for getting configuration information and examples.
 var ConfigCmd = &cli.Command{
 	Name:   "config",
 	Usage:  "Get info on configuration format and commands",
@@ -72,10 +73,10 @@ func actionFunc(ctx context.Context, cmd *cli.Command) error {
 	fmt.Printf("%s\n\nSchema:\n\n", sp.GetCommandDescription())
 
 	if cmd.Bool("markdown") {
-		sw.WriteMarkdownDoc(os.Stdout)
+		sw.WriteMarkdownDoc(os.Stdout) //nolint:errcheck
 	}
 
-	sw.WriteYAMLExample(os.Stdout)
+	sw.WriteYAMLExample(os.Stdout) //nolint:errcheck
 
 	return nil
 }
@@ -86,14 +87,14 @@ var schemaCmd = &cli.Command{
 	Action: schemaCmdActionFunc,
 }
 
-func schemaCmdActionFunc(ctx context.Context, cmd *cli.Command) error {
+func schemaCmdActionFunc(ctx context.Context, _ *cli.Command) error {
 	factory, ok := ctx.Value(commands.FactoryContextKey{}).(commands.CommanderFactory)
 	if !ok {
 		return cli.Exit("failed to get command factory from context", 1)
 	}
 
 	sw := schema.NewBaseSchemaGenerator()
-	sw.WriteJSONSchema(os.Stdout, factory)
+	sw.WriteJSONSchema(os.Stdout, factory) //nolint:errcheck
 
 	return nil
 }

cmd/cmdstate/ctxkey.go

@@ -1,14 +1,17 @@
 // Copyright (c) matt-FFFFFF 2025. All rights reserved.
 // SPDX-License-Identifier: MIT
 
-// Package main is the entry point for the porch command-line application.
+// Package main contains the porch command-line interface (CLI).
 package main
 
 import (
 	"context"
 	"os"
 
-	"github.com/matt-FFFFFF/porch/cmd"
+	"github.com/matt-FFFFFF/porch"
+	"github.com/matt-FFFFFF/porch/cmd/porch/config"
+	"github.com/matt-FFFFFF/porch/cmd/porch/run"
+	"github.com/matt-FFFFFF/porch/cmd/porch/show"
 	"github.com/matt-FFFFFF/porch/internal/commandregistry"
 	"github.com/matt-FFFFFF/porch/internal/commands"
 	"github.com/matt-FFFFFF/porch/internal/commands/copycwdtotemp"
@@ -21,10 +24,27 @@ import (
 	"github.com/urfave/cli/v3"
 )
 
-var (
-	version = "dev"
-	commit  = "unknown"
-)
+// rootCmd is the root command for the CLI.
+var rootCmd = &cli.Command{
+	Commands: []*cli.Command{
+		config.ConfigCmd,
+		run.RunCmd,
+		show.ShowCmd,
+	},
+	Writer:    os.Stdout,
+	ErrWriter: os.Stderr,
+	Name:      "porch",
+	Description: `Porch is a sophisticated Go-based process orchestration framework
+designed for running and managing complex command workflows. It provides a flexible,
+YAML-driven approach to define, compose, and execute command chains with advanced
+flow control, parallel processing, and comprehensive error handling.`,
+	Usage:     "porch run myfile.yaml",
+	Copyright: "Copyright (c) matt-FFFFFF 2025. All rights reserved.",
+	Authors: []any{
+		"Matt White (matt-FFFFFF)",
+	},
+	EnableShellCompletion: true,
+}
 
 func main() {
 	ctx, cancel := context.WithCancel(context.Background())
@@ -35,12 +55,7 @@ func main() {
 
 	go signalbroker.Watch(ctx, sigCh, cancel)
 
-	cmd.RootCmd.Version = version
-	cmd.RootCmd.ExtraInfo = func() map[string]string {
-		return map[string]string{
-			"commit": commit,
-		}
-	}
+	rootCmd.Version = porch.Version
 
 	factory := commandregistry.New(
 		serialcommand.Register,
@@ -50,12 +65,9 @@ func main() {
 		shellcommand.Register,
 	)
 
-	cmd.RootCmd.Before = cli.BeforeFunc(func(c context.Context, cmd *cli.Command) (context.Context, error) {
-		ctx = context.WithValue(ctx, commands.FactoryContextKey{}, factory)
-		return ctx, nil
-	})
+	ctx = context.WithValue(ctx, commands.FactoryContextKey{}, factory)
 
-	_ = cmd.RootCmd.Run(ctx, os.Args) // Err is handled by cli framework
+	_ = rootCmd.Run(ctx, os.Args) // Err is handled by cli framework
 
 	ctxlog.Logger(ctx).Info("command completed successfully")
 }

cmd/config/config.go cmd/porch/config/config.gocmd/config/config.go renamed to cmd/porch/config/config.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/matt-FFFFFF/porch/cmd/cmdstate"
+	"github.com/matt-FFFFFF/porch/internal/commands"
 	"github.com/matt-FFFFFF/porch/internal/config"
 	"github.com/matt-FFFFFF/porch/internal/runbatch"
 	"github.com/urfave/cli/v3"
@@ -35,7 +35,8 @@ var RunCmd = &cli.Command{
 	Name: "run",
 	Description: `Run a command or batch of commands defined in a YAML file.
 This command executes the commands defined in the specified YAML file and outputs the results.
-The YAML file should be structured according to the Porch configuration format, which allows for defining commands, their parameters, and execution flow.
+The YAML file should be structured according to the Porch configuration format,
+which allows for defining commands, their parameters, and execution flow.
 
 To save the results to a file, specify the output file name as an argument.
 `,
@@ -90,7 +91,9 @@ func actionFunc(ctx context.Context, cmd *cli.Command) error {
 		return cli.Exit(fmt.Sprintf("failed to read file %s: %s", yamlFileName, err.Error()), 1)
 	}
 
-	rb, err := config.BuildFromYAML(ctx, cmdstate.Factory, bytes)
+	factory := ctx.Value(commands.FactoryContextKey{}).(commands.CommanderFactory)
+
+	rb, err := config.BuildFromYAML(ctx, factory, bytes)
 	if err != nil {
 		return cli.Exit(fmt.Sprintf("failed to build config from file %s: %s", yamlFileName, err.Error()), 1)
 	}