From 74cc740398cf2d90804ab19db728c844c2e056b7 Mon Sep 17 00:00:00 2001 From: Peter Stone Date: Tue, 3 Mar 2026 21:15:50 +0000 Subject: Add elaborate, logs-stream, templates, and subtask-list endpoints - POST /api/tasks/elaborate: calls claude to draft a task config from a natural-language prompt - GET /api/executions/{id}/logs/stream: SSE tail of stdout.log - CRUD /api/templates: create/list/get/update/delete reusable task configs - GET /api/tasks/{id}/subtasks: list child tasks - Server.NewServer accepts claudeBinPath for elaborate; injectable elaborateCmdPath and logStore for test isolation - Valid-transition guard added to POST /api/tasks/{id}/run - CLI passes claude binary path through to the server Co-Authored-By: Claude Sonnet 4.6 --- internal/cli/root.go | 10 ++++++++++ internal/cli/serve.go | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'internal/cli') diff --git a/internal/cli/root.go b/internal/cli/root.go index 4f8dad6..43f5cb9 100644 --- a/internal/cli/root.go +++ b/internal/cli/root.go @@ -1,6 +1,8 @@ package cli import ( + "path/filepath" + "github.com/thepeterstone/claudomator/internal/config" "github.com/spf13/cobra" ) @@ -22,8 +24,16 @@ func NewRootCmd() *cobra.Command { cmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default $HOME/.claudomator/config.toml)") cmd.PersistentFlags().StringVar(&cfg.DataDir, "data-dir", cfg.DataDir, "data directory") + cmd.PersistentFlags().StringVar(&cfg.ClaudeBinaryPath, "claude-bin", cfg.ClaudeBinaryPath, "path to claude binary") cmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "verbose output") + // Re-derive DBPath and LogDir after flags are parsed, so --data-dir takes effect. + cmd.PersistentPreRunE = func(cmd *cobra.Command, args []string) error { + cfg.DBPath = filepath.Join(cfg.DataDir, "claudomator.db") + cfg.LogDir = filepath.Join(cfg.DataDir, "executions") + return nil + } + cmd.AddCommand( newRunCmd(), newServeCmd(), diff --git a/internal/cli/serve.go b/internal/cli/serve.go index 93a5fb3..9545f5c 100644 --- a/internal/cli/serve.go +++ b/internal/cli/serve.go @@ -49,14 +49,19 @@ func serve(addr string) error { } logger := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: level})) + apiURL := "http://localhost" + addr + if len(addr) > 0 && addr[0] != ':' { + apiURL = "http://" + addr + } runner := &executor.ClaudeRunner{ BinaryPath: cfg.ClaudeBinaryPath, Logger: logger, LogDir: cfg.LogDir, + APIURL: apiURL, } pool := executor.NewPool(cfg.MaxConcurrent, runner, store, logger) - srv := api.NewServer(store, pool, logger) + srv := api.NewServer(store, pool, logger, cfg.ClaudeBinaryPath) srv.StartHub() httpSrv := &http.Server{ -- cgit v1.2.3