From 0fa24ef8c2266bf6b0e37d2479dc9f17d3db3c6b Mon Sep 17 00:00:00 2001 From: Ollie Agent Date: Tue, 21 Jul 2026 11:49:42 +0200 Subject: [PATCH] remove elevate-adapter-start script and agentSpawn hook The adapter is now started by the system service manager, not on-demand from inside the sandbox. ensureElevateAdapter was removed from core in the previous commit. --- agents/default.json | 1 - doc/ARCHITECTURE.md | 2 +- justfile | 2 +- scripts/x/elevate-adapter-start | 18 ------------------ 4 files changed, 2 insertions(+), 21 deletions(-) delete mode 100755 scripts/x/elevate-adapter-start diff --git a/agents/default.json b/agents/default.json index a1bd314..34c2643 100644 --- a/agents/default.json +++ b/agents/default.json @@ -15,7 +15,6 @@ "maxTokens": 16384, "hooks": { "agentSpawn": [ - "$OLLIE_CFG_PATH/scripts/x/elevate-adapter-start 2>/dev/null || true" ], "postTurn": [ ], diff --git a/doc/ARCHITECTURE.md b/doc/ARCHITECTURE.md index 570c9f1..2c88a87 100644 --- a/doc/ARCHITECTURE.md +++ b/doc/ARCHITECTURE.md @@ -407,7 +407,7 @@ Agent configs are JSON files in `~/.config/ollie/agents/`: "$OLLIE_CFG_PATH/scripts/x/prime tools-reasoning" ], "hooks": { - "agentSpawn": ["$OLLIE_CFG_PATH/scripts/x/elevate-adapter-start"], + "agentSpawn": [], "turnError": ["$OLLIE_CFG_PATH/scripts/x/freeloader $OLLIE_SESSION_ID"] }, "maxTokens": 8192, diff --git a/justfile b/justfile index bdbd908..0fa59c4 100644 --- a/justfile +++ b/justfile @@ -286,7 +286,7 @@ install-scripts: install -m755 scripts/u/cascade {{cfg}}/scripts/u/cascade install -m755 scripts/x/elevate {{cfg}}/scripts/x/elevate install -m755 scripts/x/elevate-adapter-superpowerd {{cfg}}/scripts/x/elevate-adapter-superpowerd - install -m755 scripts/x/elevate-adapter-start {{cfg}}/scripts/x/elevate-adapter-start + install -m755 scripts/x/bd {{cfg}}/scripts/x/bd install -m755 scripts/x/prime {{cfg}}/scripts/x/prime install -m755 scripts/x/freeloader {{cfg}}/scripts/x/freeloader diff --git a/scripts/x/elevate-adapter-start b/scripts/x/elevate-adapter-start deleted file mode 100755 index c171a1d..0000000 --- a/scripts/x/elevate-adapter-start +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -# Idempotently start the elevation adapter in the background. -# Used as an agentSpawn hook; exits 0 always so it never blocks a session. -OLLIE_CFG_PATH="${OLLIE_CFG_PATH:-${HOME}/.config/ollie}" -export OLLIE_CFG_PATH -sock="${OLLIE_ELEVATE_SOCKET:-${XDG_RUNTIME_DIR:-/run/user/$(id -u)}/ollie/elevate.sock}" -export OLLIE_ELEVATE_SOCKET="$sock" - -# Already listening? Connect test: exit 0 = running, exit 1 = not running. -python3 -c " -import os, socket, sys -s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) -s.settimeout(1) -sys.exit(0 if s.connect_ex(os.environ['OLLIE_ELEVATE_SOCKET']) == 0 else 1) -" 2>/dev/null && exit 0 - -# Not running; start adapter in the background. -python3 "${OLLIE_CFG_PATH}/scripts/x/elevate-adapter-superpowerd" >/dev/null 2>&1 &