From 62fe1dab83bbe486edc9c28df7fbef95fbc10703 Mon Sep 17 00:00:00 2001
From: Ollie Agent <ollie@example.com>
Date: Tue, 11 Aug 2026 21:15:03 +0200
Subject: [PATCH] =?UTF-8?q?toolsrv:=20rename=20internal/fs=20=E2=86=92=20i?=
 =?UTF-8?q?nternal/server?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The package defines the Server type and its namespace — 'fs' was a
leftover name from when it only held the filesystem spec. Now it's
the server definition. File renamed spec.go → server.go to match.
---
 cmd/toolsrv/internal/{fs => server}/parse.go          | 2 +-
 cmd/toolsrv/internal/{fs => server}/proc.go           | 2 +-
 cmd/toolsrv/internal/{fs => server}/proc_test.go      | 2 +-
 cmd/toolsrv/internal/{fs/spec.go => server/server.go} | 2 +-
 cmd/toolsrv/internal/{fs => server}/state_test.go     | 2 +-
 cmd/toolsrv/main.go                                   | 4 ++--
 cmd/toolsrv/server.go                                 | 6 +++---
 7 files changed, 10 insertions(+), 10 deletions(-)
 rename cmd/toolsrv/internal/{fs => server}/parse.go (98%)
 rename cmd/toolsrv/internal/{fs => server}/proc.go (99%)
 rename cmd/toolsrv/internal/{fs => server}/proc_test.go (99%)
 rename cmd/toolsrv/internal/{fs/spec.go => server/server.go} (99%)
 rename cmd/toolsrv/internal/{fs => server}/state_test.go (99%)

diff --git a/cmd/toolsrv/internal/fs/parse.go b/cmd/toolsrv/internal/server/parse.go
similarity index 98%
rename from cmd/toolsrv/internal/fs/parse.go
rename to cmd/toolsrv/internal/server/parse.go
index 8d4946a..eac1264 100644
--- a/cmd/toolsrv/internal/fs/parse.go
+++ b/cmd/toolsrv/internal/server/parse.go
@@ -1,5 +1,5 @@
 // parse.go - Key=value payload parsing for toolsrv.
-package fs
+package server
 
 import "strings"
 
diff --git a/cmd/toolsrv/internal/fs/proc.go b/cmd/toolsrv/internal/server/proc.go
similarity index 99%
rename from cmd/toolsrv/internal/fs/proc.go
rename to cmd/toolsrv/internal/server/proc.go
index 450eeef..133431c 100644
--- a/cmd/toolsrv/internal/fs/proc.go
+++ b/cmd/toolsrv/internal/server/proc.go
@@ -1,5 +1,5 @@
 // proc.go - Process management and tool operations for toolsrv.
-package fs
+package server
 
 import (
 	"bytes"
diff --git a/cmd/toolsrv/internal/fs/proc_test.go b/cmd/toolsrv/internal/server/proc_test.go
similarity index 99%
rename from cmd/toolsrv/internal/fs/proc_test.go
rename to cmd/toolsrv/internal/server/proc_test.go
index 83b841a..4daac6b 100644
--- a/cmd/toolsrv/internal/fs/proc_test.go
+++ b/cmd/toolsrv/internal/server/proc_test.go
@@ -1,4 +1,4 @@
-package fs
+package server
 
 import (
 	"context"
diff --git a/cmd/toolsrv/internal/fs/spec.go b/cmd/toolsrv/internal/server/server.go
similarity index 99%
rename from cmd/toolsrv/internal/fs/spec.go
rename to cmd/toolsrv/internal/server/server.go
index 849bbc7..eaa7db5 100644
--- a/cmd/toolsrv/internal/fs/spec.go
+++ b/cmd/toolsrv/internal/server/server.go
@@ -1,5 +1,5 @@
 // spec.go - virtfs-based namespace specification for toolsrv.
-package fs
+package server
 
 import (
 	"context"
diff --git a/cmd/toolsrv/internal/fs/state_test.go b/cmd/toolsrv/internal/server/state_test.go
similarity index 99%
rename from cmd/toolsrv/internal/fs/state_test.go
rename to cmd/toolsrv/internal/server/state_test.go
index 758a66b..d2bce58 100644
--- a/cmd/toolsrv/internal/fs/state_test.go
+++ b/cmd/toolsrv/internal/server/state_test.go
@@ -1,4 +1,4 @@
-package fs
+package server
 
 import (
 	"strings"
diff --git a/cmd/toolsrv/main.go b/cmd/toolsrv/main.go
index 16616ad..ad31220 100644
--- a/cmd/toolsrv/main.go
+++ b/cmd/toolsrv/main.go
@@ -24,7 +24,7 @@ import (
 	"syscall"
 	"time"
 
-	"ollie/cmd/toolsrv/internal/fs"
+	"ollie/cmd/toolsrv/internal/server"
 	"ollie/cmd/toolsrv/internal/registry"
 	"ollie/env"
 
@@ -81,7 +81,7 @@ func main() {
 	toolReg, _ := registry.New()
 
 	// Create server state
-	srv := fs.NewServer()
+	srv := server.NewServer()
 	srv.SetYolo(*yolo)
 	if toolReg != nil {
 		srv.SetRegistry(toolReg)
diff --git a/cmd/toolsrv/server.go b/cmd/toolsrv/server.go
index 5f0d766..d556177 100644
--- a/cmd/toolsrv/server.go
+++ b/cmd/toolsrv/server.go
@@ -9,7 +9,7 @@ import (
 	"net"
 	"sync"
 
-	"ollie/cmd/toolsrv/internal/fs"
+	"ollie/cmd/toolsrv/internal/server"
 	"ollie/virtfs"
 
 	"9fans.net/go/plan9"
@@ -42,12 +42,12 @@ type connState struct {
 	authFids map[uint32]*authFid
 	ctx      context.Context
 	uname    string
-	srv      *fs.Server
+	srv      *server.Server
 	noAuth   bool // skip authentication (for debugging)
 }
 
 // serve9P handles a single 9P connection using the virtfs tree.
-func serve9P(ctx context.Context, conn net.Conn, tree *virtfs.Tree, srv *fs.Server, noAuth bool) {
+func serve9P(ctx context.Context, conn net.Conn, tree *virtfs.Tree, srv *server.Server, noAuth bool) {
 	defer conn.Close()
 
 	cs := &connState{