From 07c3e14f506103ce8cb367878ad7e9f3263cd102 Mon Sep 17 00:00:00 2001
From: Levi Neely <lkn@darkstar.example.net>
Date: Tue, 21 Apr 2026 12:28:36 +0200
Subject: [PATCH] p9: InterruptAll on SIGINT/SIGTERM, inline agents/sessions
 dirs

- Add Server.InterruptAll() to cancel in-progress turns on all sessions
- Call InterruptAll() before Shutdown() on SIGINT/SIGTERM in main
- Remove defaultAgentsDir/defaultSessionsDir helpers; inline paths.CfgDir()
  expressions directly (OLLIE_CFG_PATH already handles relocation)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 internal/p9/server.go | 15 +++++++++++++--
 main.go               |  1 +
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/internal/p9/server.go b/internal/p9/server.go
index c0a6030..9d52de2 100644
--- a/internal/p9/server.go
+++ b/internal/p9/server.go
@@ -131,11 +131,11 @@ func New() *Server {
 	os.MkdirAll(transcriptDir, 0755) //nolint:errcheck
 	tmpDir := defaultTmpDir()
 	os.MkdirAll(tmpDir, 0755) //nolint:errcheck
-	agentsDir := agent.DefaultAgentsDir()
+	agentsDir := paths.CfgDir() + "/agents"
 	s := &Server{
 		sessions:        make(map[string]*session),
 		agentsDir:       agentsDir,
-		sessionsDir:     agent.DefaultSessionsDir(),
+		sessionsDir:     paths.CfgDir() + "/sessions",
 		agentStore:      NewFlatDirStore(agentsDir, 0644),
 		promptStore:     NewFlatDirStore(agent.DefaultPromptsDir(), 0444),
 		memStore:        NewFlatDirStore(memDir, 0644),
@@ -1285,6 +1285,17 @@ func (s *Server) createSession(args []string) error {
 }
 
 // Shutdown kills all active sessions and batch jobs, triggering Close() on each core.
+// InterruptAll cancels any in-progress agent turn on every active session.
+// Call this on SIGINT or SIGTERM before Shutdown to allow turns to unwind
+// cleanly rather than having their context cancelled mid-tool-call.
+func (s *Server) InterruptAll() {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
+	for _, sess := range s.sessions {
+		sess.core.Interrupt(agent.ErrInterrupted)
+	}
+}
+
 func (s *Server) Shutdown() {
 	s.mu.Lock()
 	ids := make([]string, 0, len(s.sessions))
diff --git a/main.go b/main.go
index 6267096..ca1493f 100644
--- a/main.go
+++ b/main.go
@@ -217,6 +217,7 @@ func runServer(sockPath, pidPath string) {
 	signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)
 	<-sigChan
 
+	srv.InterruptAll()
 	fmt.Println("shutting down")
 	srv.Shutdown()
 	if fuseCmd != nil {