diff --git a/.gitignore b/.gitignore index 0ed13a4..074b9f3 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,4 @@ .claude .kiro __pycache__/ -olliesrv +/olliesrv diff --git a/cmd/olliesrv/main.go b/cmd/olliesrv/main.go index da4d3f7..02adacc 100644 --- a/cmd/olliesrv/main.go +++ b/cmd/olliesrv/main.go @@ -34,7 +34,6 @@ const serviceName = "ollie" var tcpAddr = flag.String("tcp", "", "also listen on TCP address (e.g. :564)") var strict = flag.Bool("strict", false, "only allow tool steps; reject inline code") var yolo = flag.Bool("yolo", false, "skip landrun sandbox for shell") -var no9p = flag.Bool("no9p", false, "disable 9P listener") // ModelCache caches the list of models from all backends. type ModelCache struct { @@ -142,7 +141,7 @@ func runServer(sockPath string) { env.EnsureDefaults() // Remove stale socket - if !*no9p { + if true { if _, err := os.Stat(sockPath); err == nil { os.Remove(sockPath) //nolint:errcheck } @@ -178,8 +177,8 @@ func runServer(sockPath string) { Sink: sink, Strict: *strict, Yolo: *yolo, - NoMount: *no9p || *tcpAddr != "", - Enable9P: !*no9p, + NoMount: *tcpAddr != "", + Enable9P: true, InvalidateModels: modelCache.Invalidate, }) @@ -241,7 +240,7 @@ func runServer(sockPath string) { } // Create 9P server (after broker is ready so it can be passed in) - if !*no9p { + if true { srv = New(Config{ Sink: sink, SessionTree: sessionTree, @@ -256,7 +255,7 @@ func runServer(sockPath string) { go modelCache.Refresh() var listener net.Listener - if !*no9p { + if true { var err error listener, err = net.Listen("unix", sockPath) if err != nil { @@ -278,7 +277,7 @@ func runServer(sockPath string) { } var tcpListener net.Listener - if !*no9p && *tcpAddr != "" { + if true && *tcpAddr != "" { var err error tcpListener, err = net.Listen("tcp", *tcpAddr) if err != nil { @@ -312,7 +311,7 @@ func runServer(sockPath string) { if tcpListener != nil { tcpListener.Close() //nolint:errcheck } - if !*no9p { + if true { os.Remove(sockPath) } sink.Flush()