Skip to content

Commit bfc8022

Browse files
authored
Merge pull request anomalyco#403 from swarnika-cmd/main
fix: background observer fails closed on confirmation/permission prompts (anomalyco#400)
2 parents 4de5da2 + 1c1a9ef commit bfc8022

4 files changed

Lines changed: 197 additions & 46 deletions

File tree

‎skills/continuous-learning-v2/agents/start-observer.sh‎

Lines changed: 67 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
# project-specific observations into project-scoped instincts.
99
#
1010
# Usage:
11-
# start-observer.sh # Start observer for current project (or global)
12-
# start-observer.sh stop # Stop running observer
13-
# start-observer.sh status # Check if observer is running
11+
# start-observer.sh # Start observer for current project (or global)
12+
# start-observer.sh --reset # Clear lock and restart observer for current project
13+
# start-observer.sh stop # Stop running observer
14+
# start-observer.sh status # Check if observer is running
1415

1516
set -e
1617

@@ -41,6 +42,31 @@ PID_FILE="${PROJECT_DIR}/.observer.pid"
4142
LOG_FILE="${PROJECT_DIR}/observer.log"
4243
OBSERVATIONS_FILE="${PROJECT_DIR}/observations.jsonl"
4344
INSTINCTS_DIR="${PROJECT_DIR}/instincts/personal"
45+
SENTINEL_FILE="${CLV2_OBSERVER_SENTINEL_FILE:-${PROJECT_ROOT:-$PROJECT_DIR}/.observer.lock}"
46+
47+
write_guard_sentinel() {
48+
printf '%s\n' 'observer paused: confirmation or permission prompt detected; rerun start-observer.sh --reset after reviewing observer.log' > "$SENTINEL_FILE"
49+
}
50+
51+
stop_observer_if_running() {
52+
if [ -f "$PID_FILE" ]; then
53+
pid=$(cat "$PID_FILE")
54+
if kill -0 "$pid" 2>/dev/null; then
55+
echo "Stopping observer for ${PROJECT_NAME} (PID: $pid)..."
56+
kill "$pid"
57+
rm -f "$PID_FILE"
58+
echo "Observer stopped."
59+
return 0
60+
fi
61+
62+
echo "Observer not running (stale PID file)."
63+
rm -f "$PID_FILE"
64+
return 1
65+
fi
66+
67+
echo "Observer not running."
68+
return 1
69+
}
4470

4571
# Read config values from config.json
4672
OBSERVER_INTERVAL_MINUTES=5
@@ -87,22 +113,31 @@ case "$UNAME_LOWER" in
87113
*mingw*|*msys*|*cygwin*) IS_WINDOWS=true ;;
88114
esac
89115

90-
case "${1:-start}" in
116+
ACTION="start"
117+
RESET_OBSERVER=false
118+
119+
for arg in "$@"; do
120+
case "$arg" in
121+
start|stop|status)
122+
ACTION="$arg"
123+
;;
124+
--reset)
125+
RESET_OBSERVER=true
126+
;;
127+
*)
128+
echo "Usage: $0 [start|stop|status] [--reset]"
129+
exit 1
130+
;;
131+
esac
132+
done
133+
134+
if [ "$RESET_OBSERVER" = "true" ]; then
135+
rm -f "$SENTINEL_FILE"
136+
fi
137+
138+
case "$ACTION" in
91139
stop)
92-
if [ -f "$PID_FILE" ]; then
93-
pid=$(cat "$PID_FILE")
94-
if kill -0 "$pid" 2>/dev/null; then
95-
echo "Stopping observer for ${PROJECT_NAME} (PID: $pid)..."
96-
kill "$pid"
97-
rm -f "$PID_FILE"
98-
echo "Observer stopped."
99-
else
100-
echo "Observer not running (stale PID file)."
101-
rm -f "$PID_FILE"
102-
fi
103-
else
104-
echo "Observer not running."
105-
fi
140+
stop_observer_if_running || true
106141
exit 0
107142
;;
108143

@@ -153,8 +188,10 @@ case "${1:-start}" in
153188
exit 1
154189
fi
155190

156-
# The observer loop — fully detached with nohup, IO redirected to log.
157-
# Variables are passed via env; observer-loop.sh handles analysis/retry flow.
191+
mkdir -p "$PROJECT_DIR"
192+
touch "$LOG_FILE"
193+
start_line=$(wc -l < "$LOG_FILE" 2>/dev/null || echo 0)
194+
158195
nohup env \
159196
CONFIG_DIR="$CONFIG_DIR" \
160197
PID_FILE="$PID_FILE" \
@@ -167,11 +204,20 @@ case "${1:-start}" in
167204
MIN_OBSERVATIONS="$MIN_OBSERVATIONS" \
168205
OBSERVER_INTERVAL_SECONDS="$OBSERVER_INTERVAL_SECONDS" \
169206
CLV2_IS_WINDOWS="$IS_WINDOWS" \
207+
CLV2_OBSERVER_PROMPT_PATTERN="$CLV2_OBSERVER_PROMPT_PATTERN" \
170208
"$OBSERVER_LOOP_SCRIPT" >> "$LOG_FILE" 2>&1 &
171209

172210
# Wait for PID file
173211
sleep 2
174212

213+
# Check for confirmation-seeking output in the observer log
214+
if tail -n +"$((start_line + 1))" "$LOG_FILE" 2>/dev/null | grep -E -i -q "$CLV2_OBSERVER_PROMPT_PATTERN"; then
215+
echo "OBSERVER_ABORT: Confirmation or permission prompt detected in observer output. Failing closed."
216+
stop_observer_if_running >/dev/null 2>&1 || true
217+
write_guard_sentinel
218+
exit 2
219+
fi
220+
175221
if [ -f "$PID_FILE" ]; then
176222
pid=$(cat "$PID_FILE")
177223
if kill -0 "$pid" 2>/dev/null; then
@@ -188,7 +234,7 @@ case "${1:-start}" in
188234
;;
189235

190236
*)
191-
echo "Usage: $0 {start|stop|status}"
237+
echo "Usage: $0 [start|stop|status] [--reset]"
192238
exit 1
193239
;;
194240
esac

‎skills/continuous-learning-v2/hooks/observe.sh‎

Lines changed: 47 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,15 @@ resolve_python_cmd() {
3333
return 0
3434
fi
3535

36+
# FIX: Windows Git Bash — probe Python install paths directly because
37+
# `command -v python` can hit the Microsoft Store alias instead.
38+
for win_py in /c/Users/"$USER"/AppData/Local/Programs/Python/Python3*/python; do
39+
if [ -x "$win_py" ]; then
40+
printf '%s\n' "$win_py"
41+
return 0
42+
fi
43+
done
44+
3645
if command -v python3 >/dev/null 2>&1; then
3746
printf '%s\n' python3
3847
return 0
@@ -93,7 +102,13 @@ CONFIG_DIR="${HOME}/.claude/homunculus"
93102
OBSERVATIONS_FILE="${PROJECT_DIR}/observations.jsonl"
94103
MAX_FILE_SIZE_MB=10
95104

96-
# Skip if disabled
105+
SENTINEL_FILE="${CLV2_OBSERVER_SENTINEL_FILE:-${PROJECT_ROOT:-$PROJECT_DIR}/.observer.lock}"
106+
107+
write_guard_sentinel() {
108+
printf '%s\n' 'observer paused: confirmation or permission prompt detected; rerun start-observer.sh --reset after reviewing observer.log' > "$SENTINEL_FILE"
109+
}
110+
111+
# Skip if disabled globally
97112
if [ -f "$CONFIG_DIR/disabled" ]; then
98113
exit 0
99114
fi
@@ -146,6 +161,13 @@ if [ -n "$STDIN_CWD" ]; then
146161
done
147162
fi
148163

164+
# Skip if a previous run already aborted due to confirmation/permission prompt.
165+
# This is the circuit-breaker — stops retrying after a non-interactive failure.
166+
if [ -f "$SENTINEL_FILE" ]; then
167+
echo "[observe] Skipping: previous run aborted due to confirmation/permission prompt. Remove ${SENTINEL_FILE} to re-enable." >&2
168+
exit 0
169+
fi
170+
149171
# Auto-purge observation files older than 30 days (runs once per session)
150172
PURGE_MARKER="${PROJECT_DIR}/.last-purge"
151173
if [ ! -f "$PURGE_MARKER" ] || [ "$(find "$PURGE_MARKER" -mtime +1 2>/dev/null)" ]; then
@@ -238,46 +260,46 @@ if [ -f "$OBSERVATIONS_FILE" ]; then
238260
fi
239261
fi
240262

263+
# Detect confirmation/permission prompts in observer output and fail closed.
264+
# A non-interactive background observer must never ask for user confirmation.
265+
if echo "$PARSED" | grep -E -i -q "$CLV2_OBSERVER_PROMPT_PATTERN"; then
266+
echo "[observe] OBSERVER_ABORT: Confirmation or permission prompt detected in observer output. This observer run is non-actionable." >&2
267+
echo "[observe] Writing sentinel to suppress retries: ${SENTINEL_FILE}" >&2
268+
write_guard_sentinel
269+
exit 2
270+
fi
271+
241272
# Build and write observation (now includes project context)
242-
# Scrub common secret patterns from tool I/O before persisting
243273
timestamp=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
244-
245274
export PROJECT_ID_ENV="$PROJECT_ID"
246275
export PROJECT_NAME_ENV="$PROJECT_NAME"
247276
export TIMESTAMP="$timestamp"
248-
249277
echo "$PARSED" | "$PYTHON_CMD" -c '
250278
import json, sys, os, re
251-
252279
parsed = json.load(sys.stdin)
253280
observation = {
254-
"timestamp": os.environ["TIMESTAMP"],
255-
"event": parsed["event"],
256-
"tool": parsed["tool"],
257-
"session": parsed["session"],
258-
"project_id": os.environ.get("PROJECT_ID_ENV", "global"),
259-
"project_name": os.environ.get("PROJECT_NAME_ENV", "global")
281+
"timestamp": os.environ["TIMESTAMP"],
282+
"event": parsed["event"],
283+
"tool": parsed["tool"],
284+
"session": parsed["session"],
285+
"project_id": os.environ.get("PROJECT_ID_ENV", "global"),
286+
"project_name": os.environ.get("PROJECT_NAME_ENV", "global")
260287
}
261-
262288
# Scrub secrets: match common key=value, key: value, and key"value patterns
263-
# Includes optional auth scheme (e.g., "Bearer", "Basic") before token
264289
_SECRET_RE = re.compile(
265-
r"(?i)(api[_-]?key|token|secret|password|authorization|credentials?|auth)"
266-
r"""(["'"'"'\s:=]+)"""
267-
r"([A-Za-z]+\s+)?"
268-
r"([A-Za-z0-9_\-/.+=]{8,})"
290+
r"(?i)(api[_-]?key|token|secret|password|authorization|credentials?|auth)"
291+
r"""(["'"'"'\s:=]+)"""
292+
r"([A-Za-z]+\s+)?"
293+
r"([A-Za-z0-9_\-/.+=]{8,})"
269294
)
270-
271295
def scrub(val):
272-
if val is None:
273-
return None
274-
return _SECRET_RE.sub(lambda m: m.group(1) + m.group(2) + (m.group(3) or "") + "[REDACTED]", str(val))
275-
296+
if val is None:
297+
return None
298+
return _SECRET_RE.sub(lambda m: m.group(1) + m.group(2) + (m.group(3) or "") + "[REDACTED]", str(val))
276299
if parsed["input"]:
277-
observation["input"] = scrub(parsed["input"])
300+
observation["input"] = scrub(parsed["input"])
278301
if parsed["output"] is not None:
279-
observation["output"] = scrub(parsed["output"])
280-
302+
observation["output"] = scrub(parsed["output"])
281303
print(json.dumps(observation))
282304
' >> "$OBSERVATIONS_FILE"
283305

‎skills/continuous-learning-v2/scripts/detect-project.sh‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ _CLV2_PYTHON_CMD="$(_clv2_resolve_python_cmd 2>/dev/null || true)"
4646
CLV2_PYTHON_CMD="$_CLV2_PYTHON_CMD"
4747
export CLV2_PYTHON_CMD
4848

49+
CLV2_OBSERVER_PROMPT_PATTERN='Can you confirm|requires permission|Awaiting (user confirmation|confirmation|approval|permission)|confirm I should proceed|once granted access|grant.*access'
50+
export CLV2_OBSERVER_PROMPT_PATTERN
51+
4952
_clv2_detect_project() {
5053
local project_root=""
5154
local project_name=""
@@ -216,3 +219,10 @@ PROJECT_ID="$_CLV2_PROJECT_ID"
216219
PROJECT_NAME="$_CLV2_PROJECT_NAME"
217220
PROJECT_ROOT="$_CLV2_PROJECT_ROOT"
218221
PROJECT_DIR="$_CLV2_PROJECT_DIR"
222+
223+
if [ -n "$PROJECT_ROOT" ]; then
224+
CLV2_OBSERVER_SENTINEL_FILE="${PROJECT_ROOT}/.observer.lock"
225+
else
226+
CLV2_OBSERVER_SENTINEL_FILE="${PROJECT_DIR}/.observer.lock"
227+
fi
228+
export CLV2_OBSERVER_SENTINEL_FILE

‎tests/hooks/hooks.test.js‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2304,6 +2304,22 @@ async function runTests() {
23042304
passed++;
23052305
else failed++;
23062306

2307+
if (
2308+
test('continuous-learning-v2 observer scripts share prompt guard config and start-observer supports reset', () => {
2309+
const observeSource = fs.readFileSync(path.join(__dirname, '..', '..', 'skills', 'continuous-learning-v2', 'hooks', 'observe.sh'), 'utf8');
2310+
const startObserverSource = fs.readFileSync(path.join(__dirname, '..', '..', 'skills', 'continuous-learning-v2', 'agents', 'start-observer.sh'), 'utf8');
2311+
const detectProjectSource = fs.readFileSync(path.join(__dirname, '..', '..', 'skills', 'continuous-learning-v2', 'scripts', 'detect-project.sh'), 'utf8');
2312+
2313+
assert.ok(detectProjectSource.includes('CLV2_OBSERVER_PROMPT_PATTERN='), 'detect-project.sh should export a shared observer prompt pattern');
2314+
assert.ok(observeSource.includes('CLV2_OBSERVER_PROMPT_PATTERN'), 'observe.sh should use the shared observer prompt pattern');
2315+
assert.ok(startObserverSource.includes('CLV2_OBSERVER_PROMPT_PATTERN'), 'start-observer.sh should use the shared observer prompt pattern');
2316+
assert.ok(startObserverSource.includes('--reset'), 'start-observer.sh should document or support an explicit reset flag');
2317+
assert.ok(!startObserverSource.includes('.observer.tmp.log'), 'start-observer.sh should not leave the observer writing to a temp log file');
2318+
})
2319+
)
2320+
passed++;
2321+
else failed++;
2322+
23072323
if (await asyncTest('observe.sh falls back to legacy output fields when tool_response is null', async () => {
23082324
const homeDir = createTestDir();
23092325
const projectDir = createTestDir();
@@ -2341,6 +2357,63 @@ async function runTests() {
23412357
}
23422358
})) passed++; else failed++;
23432359

2360+
if (await asyncTest('observe.sh does not trip the observer lock for generic Awaiting output', async () => {
2361+
const homeDir = createTestDir();
2362+
const projectDir = createTestDir();
2363+
const observePath = path.join(__dirname, '..', '..', 'skills', 'continuous-learning-v2', 'hooks', 'observe.sh');
2364+
const payload = JSON.stringify({
2365+
tool_name: 'Bash',
2366+
tool_input: { command: 'echo waiting' },
2367+
tool_response: 'Awaiting build completion from CI',
2368+
session_id: 'session-awaiting-generic',
2369+
cwd: projectDir
2370+
});
2371+
2372+
try {
2373+
const result = await runShellScript(observePath, ['post'], payload, {
2374+
HOME: homeDir,
2375+
CLAUDE_PROJECT_DIR: projectDir
2376+
}, projectDir);
2377+
2378+
assert.strictEqual(result.code, 0, `observe.sh should not fail closed for generic Awaiting output, stderr: ${result.stderr}`);
2379+
assert.ok(!fs.existsSync(path.join(projectDir, '.observer.lock')), 'generic Awaiting output should not create the observer lock sentinel');
2380+
} finally {
2381+
cleanupTestDir(homeDir);
2382+
cleanupTestDir(projectDir);
2383+
}
2384+
})) passed++; else failed++;
2385+
2386+
if (await asyncTest('observe.sh writes a scrubbed sentinel when confirmation prompts are detected', async () => {
2387+
const homeDir = createTestDir();
2388+
const projectDir = createTestDir();
2389+
const observePath = path.join(__dirname, '..', '..', 'skills', 'continuous-learning-v2', 'hooks', 'observe.sh');
2390+
const payload = JSON.stringify({
2391+
tool_name: 'Bash',
2392+
tool_input: { command: 'echo guarded' },
2393+
tool_response: 'Awaiting user confirmation before proceeding. token=supersecretvalue123456',
2394+
session_id: 'session-awaiting-confirmation',
2395+
cwd: projectDir
2396+
});
2397+
2398+
try {
2399+
const result = await runShellScript(observePath, ['post'], payload, {
2400+
HOME: homeDir,
2401+
CLAUDE_PROJECT_DIR: projectDir
2402+
}, projectDir);
2403+
2404+
const sentinelPath = path.join(projectDir, '.observer.lock');
2405+
assert.strictEqual(result.code, 2, `observe.sh should fail closed when a confirmation prompt is detected, stderr: ${result.stderr}`);
2406+
assert.ok(fs.existsSync(sentinelPath), 'confirmation prompts should create the observer lock sentinel');
2407+
2408+
const sentinelContent = fs.readFileSync(sentinelPath, 'utf8');
2409+
assert.ok(/confirmation|permission/i.test(sentinelContent), 'sentinel should record the reason it was created');
2410+
assert.ok(!sentinelContent.includes('supersecretvalue123456'), 'sentinel should not persist raw secrets from observer output');
2411+
} finally {
2412+
cleanupTestDir(homeDir);
2413+
cleanupTestDir(projectDir);
2414+
}
2415+
})) passed++; else failed++;
2416+
23442417
if (await asyncTest('matches .tsx extension for type checking', async () => {
23452418
const testDir = createTestDir();
23462419
const testFile = path.join(testDir, 'component.tsx');

0 commit comments

Comments
 (0)