Add direct Codex runtime

cmd/agent/http_providers.go

@@ -123,6 +123,10 @@ func (r botRuntimeResets) BeginBotHistoryReset(ctx context.Context, botID string
 	}, nil
 }
 
+func provideExternalAgentCodexServerHandler(handler *handlers.ExternalAgentCodexHandler) *handlers.ExternalAgentCodexHandler {
+	return handler
+}
+
 func provideProviderOAuthHandler(providersService *providers.Service) *handlers.ProviderOAuthHandler {
 	return handlers.NewProviderOAuthHandler(providersService)
 }

cmd/agent/module.go

@@ -94,6 +94,7 @@ func commonOptions() fx.Option {
 			provideServerHandler(handlers.NewProvidersHandler),
 			provideServerHandler(handlers.NewProviderTemplatesHandler),
 			provideServerHandler(provideProviderOAuthHandler),
+			provideServerHandler(provideExternalAgentCodexServerHandler),
 			provideServerHandler(handlers.NewFetchProvidersHandler),
 			provideServerHandler(handlers.NewSearchProvidersHandler),
 			provideServerHandler(handlers.NewModelsHandler),

cmd/gen-codex-protocol/main.go

@@ -0,0 +1,66 @@
+// Command gen-codex-protocol regenerates the Go types for the codex
+// app-server v2 protocol from the vendored JSON Schema snapshot in
+// internal/agent/runtime/codex/protocolgen/schema.
+package main
+
+import (
+	"flag"
+	"fmt"
+	"os"
+	"path/filepath"
+	"sort"
+	"strings"
+
+	"github.com/felinics/memoh/internal/agent/runtime/codex/protocolgen"
+)
+
+func main() {
+	out := flag.String("out", "internal/agent/runtime/codex/protocol", "output directory for generated files")
+	flag.Parse()
+
+	files, err := protocolgen.Generate()
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "gen-codex-protocol:", err)
+		os.Exit(1)
+	}
+
+	if err := os.MkdirAll(*out, 0o750); err != nil {
+		fmt.Fprintln(os.Stderr, "gen-codex-protocol:", err)
+		os.Exit(1)
+	}
+
+	names := make([]string, 0, len(files))
+	for name := range files {
+		names = append(names, name)
+	}
+	sort.Strings(names)
+	for _, name := range names {
+		path := filepath.Join(*out, name)
+		if err := os.WriteFile(path, files[name], 0o600); err != nil {
+			fmt.Fprintln(os.Stderr, "gen-codex-protocol:", err)
+			os.Exit(1)
+		}
+		fmt.Println("wrote", path)
+	}
+
+	// Remove stale generated files no longer produced.
+	entries, err := os.ReadDir(*out)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "gen-codex-protocol:", err)
+		os.Exit(1)
+	}
+	for _, entry := range entries {
+		name := entry.Name()
+		if !strings.HasSuffix(name, ".gen.go") {
+			continue
+		}
+		if _, ok := files[name]; !ok {
+			path := filepath.Join(*out, name)
+			if err := os.Remove(path); err != nil {
+				fmt.Fprintln(os.Stderr, "gen-codex-protocol:", err)
+				os.Exit(1)
+			}
+			fmt.Println("removed stale", path)
+		}
+	}
+}

cmd/internal/core/module.go

@@ -88,7 +88,9 @@ func ServerModule() fx.Option {
 			agentcredential.NewService,
 			provideACPRunner,
 			provideACPSessionPool,
+			provideCodexDriver,
 			provideDirectAgentDrivers,
+			provideExternalAgentCodexHandler,
 			provideHooksService,
 			provideProvidersService,
 			providertemplates.NewService,

cmd/internal/core/providers.go

@@ -35,9 +35,11 @@ import (
 	agentpayload "github.com/felinics/memoh/internal/agent/event/payload"
 	acpagent "github.com/felinics/memoh/internal/agent/runtime/acp"
 	acpclient "github.com/felinics/memoh/internal/agent/runtime/acp/client"
+	codexruntime "github.com/felinics/memoh/internal/agent/runtime/codex"
 	"github.com/felinics/memoh/internal/agent/runtime/external"
 	"github.com/felinics/memoh/internal/agent/runtime/native"
 	sessionruntime "github.com/felinics/memoh/internal/agent/runtime/session"
+	"github.com/felinics/memoh/internal/agent/runtime/toolmount"
 	agenttools "github.com/felinics/memoh/internal/agent/tool"
 	"github.com/felinics/memoh/internal/agent/turn"
 	"github.com/felinics/memoh/internal/agentcredential"
@@ -574,8 +576,31 @@ func provideACPSessionPool(lc fx.Lifecycle, log *slog.Logger, runner *acpclient.
 	return pool
 }
 
-func provideDirectAgentDrivers() external.Drivers {
-	return nil
+func provideCodexDriver(lc fx.Lifecycle, log *slog.Logger, workspaceManager *workspace.Manager, botAgents *botagents.Service, credentials *agentcredential.Service, toolApproval *toolapproval.Service, userInput *userinput.Service, toolGateway *mcp.ToolGatewayService, toolContexts *mcp.ToolSessionContextStore) *codexruntime.Driver {
+	driver := codexruntime.NewDriver(
+		workspaceManager,
+		botAgents,
+		credentials,
+		toolApproval,
+		userInput,
+		toolmount.Gateway{Tools: toolGateway, Contexts: toolContexts, Logger: log},
+		log,
+	)
+	lc.Append(fx.Hook{
+		OnStop: func(context.Context) error {
+			driver.CloseAll()
+			return nil
+		},
+	})
+	return driver
+}
+
+func provideDirectAgentDrivers(codex *codexruntime.Driver) external.Drivers {
+	return external.Drivers{codex}
+}
+
+func provideExternalAgentCodexHandler(log *slog.Logger, driver *codexruntime.Driver, botAgents *botagents.Service, botService *bots.Service, accountService *accounts.Service) *handlers.ExternalAgentCodexHandler {
+	return handlers.NewExternalAgentCodexHandler(log, driver, botAgents, botService, accountService)
 }
 
 func provideAgentService(log *slog.Logger, a *native.Agent, modelsService *models.Service, queries dbstore.Queries, msgService *message.DBService, settingsService *settings.Service, accountService *accounts.Service, botService *bots.Service, mediaService *media.Service, containerdHandler *handlers.ContainerdHandler, workspaceManager *workspace.Manager, memoryRegistry *memprovider.Registry, channelStore *channel.Store, _ *route.DBService, sessionService *sessionpkg.Service, eventHub *event.Hub, compactionService *compaction.Service, pipeline *timeline.Pipeline, rc *boot.RuntimeConfig, bgManager *background.Manager, toolApproval *toolapproval.Service, userInput *userinput.Service, acpPool *acpagent.SessionPool, directAgents external.Drivers, hookService *hookspkg.Service, sessionRuntime *sessionruntime.Manager, workdirService *workdir.Service, cfg config.Config) *application.Service {