Compare commits

...

10 Commits

Author SHA1 Message Date
YeonGyu-Kim
95491675e8 fix: correct spread order in spawner.ts for tool restrictions 2026-02-21 02:29:00 +09:00
sjawhar
03f7643ee1 fix(background-agent): respect agent tool restrictions in background task launch
Reorder tool permission spread so getAgentToolRestrictions() comes
last, allowing agent-specific restrictions to override defaults.
Fixes all 3 sites: task-starter.ts (startTask), manager.ts (startTask
and resume paths).

Previously, defaults like call_omo_agent:true would stomp agent
restrictions (e.g., explore's call_omo_agent:false) due to JS
spread semantics.
2026-02-21 02:29:00 +09:00
YeonGyu-Kim
31dc65e9ac Merge pull request #1981 from VespianRex/fix/fallback-sync-model-ui
Fix model fallback retries for main, background, and sync subagents + show runtime fallback model in task UI
2026-02-21 02:28:18 +09:00
YeonGyu-Kim
86cfa06aef Merge pull request #1983 from Pantoria/fix/background-output-full-session-default
fix(background-output): stop defaulting full_session=true for running tasks
2026-02-21 02:24:17 +09:00
YeonGyu-Kim
3c2ccba62b Merge pull request #1952 from gustavosmendes/codex/fix-write-existing-file-guard-1871
fix: make write-existing-file-guard read-gated with overwrite bypass
2026-02-21 02:17:11 +09:00
YeonGyu-Kim
e0f2952659 remove slops 2026-02-21 01:25:46 +09:00
Ze-Xuan Liu
d556937c8e fix(background-output): stop defaulting full_session=true for running tasks
background_output auto-enabled full_session when the task was still
running, returning the entire session transcript on every poll. When
the parent agent had no other work and polled in a tight loop, this
caused massive token waste because each response dumped thousands of
tokens into the conversation history.

Default full_session to false so running-task checks return a compact
status table (~200 tokens). Callers can still pass full_session=true
explicitly when they need the full transcript.
2026-02-19 19:30:45 -06:00
gustavosmendes
73d9e1f847 fix(write-existing-file-guard): wire cleanup through event dispatcher
Forward session.deleted events to write-existing-file-guard so per-session read permissions are actually cleared in runtime.

Add plugin-level regression test to ensure event forwarding remains wired, alongside the expanded guard behavior and unit coverage.
2026-02-18 16:50:30 -03:00
gustavosmendes
6d5d250f8f Update src/hooks/write-existing-file-guard/index.test.ts
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2026-02-18 16:24:20 -03:00
gustavosmendes
b6c433dae0 fix: make write-existing-file-guard read-gated and test coverage 2026-02-18 16:18:59 -03:00
10 changed files with 907 additions and 645 deletions

View File

@@ -1,357 +0,0 @@
# Issue #1501 분석 보고서: ULW Mode PLAN AGENT 무한루프
## 📋 이슈 요약
**증상:**
- ULW (ultrawork) mode에서 PLAN AGENT가 무한루프에 빠짐
- 분석/탐색 완료 후 plan만 계속 생성
- 1분마다 매우 작은 토큰으로 요청 발생
**예상 동작:**
- 탐색 완료 후 solution document 생성
---
## 🔍 근본 원인 분석
### 파일: `src/tools/delegate-task/constants.ts`
#### 문제의 핵심
`PLAN_AGENT_SYSTEM_PREPEND` (constants.ts 234-269행)에 구조적 결함이 있었습니다:
1. **Interactive Mode 가정**
```
2. After gathering context, ALWAYS present:
- Uncertainties: List of unclear points
- Clarifying Questions: Specific questions to resolve uncertainties
3. ITERATE until ALL requirements are crystal clear:
- Do NOT proceed to planning until you have 100% clarity
- Ask the user to confirm your understanding
```
2. **종료 조건 없음**
- "100% clarity" 요구는 객관적 측정 불가능
- 사용자 확인 요청은 ULW mode에서 불가능
- 무한루프로 이어짐
3. **ULW Mode 미감지**
- Subagent로 실행되는 경우를 구분하지 않음
- 항상 interactive mode로 동작 시도
### 왜 무한루프가 발생했는가?
```
ULW Mode 시작
→ Sisyphus가 Plan Agent 호출 (subagent)
→ Plan Agent: "100% clarity 필요"
→ Clarifying questions 생성
→ 사용자 없음 (subagent)
→ 다시 plan 생성 시도
→ "여전히 unclear"
→ 무한루프 반복
```
**핵심:** Plan Agent는 사용자와 대화하도록 설계되었지만, ULW mode에서는 사용자가 없는 subagent로 실행됨.
---
## ✅ 적용된 수정 방안
### 수정 내용 (constants.ts)
#### 1. SUBAGENT MODE DETECTION 섹션 추가
```typescript
SUBAGENT MODE DETECTION (CRITICAL):
If you received a detailed prompt with gathered context from a parent orchestrator (e.g., Sisyphus):
- You are running as a SUBAGENT
- You CANNOT directly interact with the user
- DO NOT ask clarifying questions - proceed with available information
- Make reasonable assumptions for minor ambiguities
- Generate the plan based on the provided context
```
#### 2. Context Gathering Protocol 수정
```diff
- 1. Launch background agents to gather context:
+ 1. Launch background agents to gather context (ONLY if not already provided):
```
**효과:** 이미 Sisyphus가 context를 수집한 경우 중복 방지
#### 3. Clarifying Questions → Assumptions
```diff
- 2. After gathering context, ALWAYS present:
- - Uncertainties: List of unclear points
- - Clarifying Questions: Specific questions
+ 2. After gathering context, assess clarity:
+ - User Request Summary: Concise restatement
+ - Assumptions Made: List any assumptions for unclear points
```
**효과:** 질문 대신 가정 사항 문서화
#### 4. 무한루프 방지 - 명확한 종료 조건
```diff
- 3. ITERATE until ALL requirements are crystal clear:
- - Do NOT proceed to planning until you have 100% clarity
- - Ask the user to confirm your understanding
- - Resolve every ambiguity before generating the work plan
+ 3. PROCEED TO PLAN GENERATION when:
+ - Core objective is understood (even if some details are ambiguous)
+ - You have gathered context via explore/librarian (or context was provided)
+ - You can make reasonable assumptions for remaining ambiguities
+
+ DO NOT loop indefinitely waiting for perfect clarity.
+ DOCUMENT assumptions in the plan so they can be validated during execution.
```
**효과:**
- "100% clarity" 요구 제거
- 객관적인 진입 조건 제공
- 무한루프 명시적 금지
- Assumptions를 plan에 문서화하여 실행 중 검증 가능
#### 5. 철학 변경
```diff
- REMEMBER: Vague requirements lead to failed implementations.
+ REMEMBER: A plan with documented assumptions is better than no plan.
```
**효과:** Perfectionism → Pragmatism
---
## 🎯 해결 메커니즘
### Before (무한루프)
```
Plan Agent 시작
Context gathering
Requirements 명확한가?
↓ NO
Clarifying questions 생성
사용자 응답 대기 (없음)
다시 plan 시도
(무한 반복)
```
### After (정상 종료)
```
Plan Agent 시작
Subagent mode 감지?
↓ YES
Context 이미 있음? → YES
Core objective 이해? → YES
Reasonable assumptions 가능? → YES
Plan 생성 (assumptions 문서화)
완료 ✓
```
---
## 📊 영향 분석
### 해결되는 문제
1. **ULW mode 무한루프** ✓
2. **Sisyphus에서 Plan Agent 호출 시 블로킹** ✓
3. **작은 토큰 반복 요청** ✓
4. **1분마다 재시도** ✓
### 부작용 없음
- Interactive mode (사용자와 직접 대화)는 여전히 작동
- Subagent mode일 때만 다르게 동작
- Backward compatibility 유지
### 추가 개선사항
- Assumptions를 plan에 명시적으로 문서화
- Execution 중 validation 가능
- 더 pragmatic한 workflow
---
## 🧪 검증 방법
### 테스트 시나리오
1. **ULW mode에서 Plan Agent 호출**
```bash
oh-my-opencode run "Complex task requiring planning. ulw"
```
- 예상: Plan 생성 후 정상 종료
- 확인: 무한루프 없음
2. **Interactive mode (변경 없어야 함)**
```bash
oh-my-opencode run --agent prometheus "Design X"
```
- 예상: Clarifying questions 여전히 가능
- 확인: 사용자와 대화 가능
3. **Subagent context 제공 케이스**
- 예상: Context gathering skip
- 확인: 중복 탐색 없음
---
## 📝 수정된 파일
```
src/tools/delegate-task/constants.ts
```
### Diff Summary
```diff
@@ -234,22 +234,32 @@ export const PLAN_AGENT_SYSTEM_PREPEND = `<system>
+SUBAGENT MODE DETECTION (CRITICAL):
+[subagent 감지 및 처리 로직]
+
MANDATORY CONTEXT GATHERING PROTOCOL:
-1. Launch background agents to gather context:
+1. Launch background agents (ONLY if not already provided):
-2. After gathering context, ALWAYS present:
- - Uncertainties
- - Clarifying Questions
+2. After gathering context, assess clarity:
+ - Assumptions Made
-3. ITERATE until ALL requirements are crystal clear:
- - Do NOT proceed until 100% clarity
- - Ask user to confirm
+3. PROCEED TO PLAN GENERATION when:
+ - Core objective understood
+ - Context gathered
+ - Reasonable assumptions possible
+
+ DO NOT loop indefinitely.
+ DOCUMENT assumptions.
```
---
## 🚀 권장 사항
### Immediate Actions
1. ✅ **수정 적용 완료** - constants.ts 업데이트됨
2. ⏳ **테스트 수행** - ULW mode에서 동작 검증
3. ⏳ **PR 생성** - code review 요청
### Future Improvements
1. **Subagent context 표준화**
- Subagent로 호출 시 명시적 플래그 전달
- `is_subagent: true` 파라미터 추가 고려
2. **Assumptions validation workflow**
- Plan 실행 중 assumptions 검증 메커니즘
- Incorrect assumptions 감지 시 재계획
3. **Timeout 메커니즘**
- Plan Agent가 X분 이상 걸리면 강제 종료
- Fallback plan 생성
4. **Monitoring 추가**
- Plan Agent 실행 시간 측정
- Iteration 횟수 로깅
- 무한루프 조기 감지
---
## 📖 관련 코드 구조
### Call Stack
```
Sisyphus (ULW mode)
task(category="deep", ...)
executor.ts: executeBackgroundContinuation()
prompt-builder.ts: buildSystemContent()
constants.ts: PLAN_AGENT_SYSTEM_PREPEND (문제 위치)
Plan Agent 실행
```
### Key Functions
1. **executor.ts:587** - `isPlanAgent()` 체크
2. **prompt-builder.ts:11** - Plan Agent prepend 주입
3. **constants.ts:234** - PLAN_AGENT_SYSTEM_PREPEND 정의
---
## 🎓 교훈
### Design Lessons
1. **Dual Mode Support**
- Interactive vs Autonomous mode 구분 필수
- Context 전달 방식 명확히
2. **Avoid Perfectionism in Agents**
- "100% clarity" 같은 주관적 조건 지양
- 명확한 객관적 종료 조건 필요
3. **Document Uncertainties**
- 불확실성을 숨기지 말고 문서화
- 실행 중 validation 가능하게
4. **Infinite Loop Prevention**
- 모든 반복문에 명시적 종료 조건
- Timeout 또는 max iteration 설정
---
## 🔗 참고 자료
- **Issue:** #1501 - [Bug]: ULW mode will 100% cause PLAN AGENT to get stuck
- **Files Modified:** `src/tools/delegate-task/constants.ts`
- **Related Concepts:** Ultrawork mode, Plan Agent, Subagent delegation
- **Agent Architecture:** Sisyphus → Prometheus → Atlas workflow
---
## ✅ Conclusion
**Root Cause:** Plan Agent가 interactive mode를 가정했으나 ULW mode에서는 subagent로 실행되어 사용자 상호작용 불가능. "100% clarity" 요구로 무한루프 발생.
**Solution:** Subagent mode 감지 로직 추가, clarifying questions 제거, 명확한 종료 조건 제공, assumptions 문서화 방식 도입.
**Result:** ULW mode에서 Plan Agent가 정상적으로 plan 생성 후 종료. 무한루프 해결.
---
**Status:** ✅ Fixed
**Tested:** ⏳ Pending
**Deployed:** ⏳ Pending
**Analyst:** Sisyphus (oh-my-opencode ultrawork mode)
**Date:** 2026-02-05
**Session:** fast-ember

View File

@@ -3941,3 +3941,96 @@ describe("BackgroundManager regression fixes - resume and aborted notification",
manager.shutdown() manager.shutdown()
}) })
}) })
describe("BackgroundManager - tool permission spread order", () => {
test("startTask respects explore agent restrictions", async () => {
//#given
let capturedTools: Record<string, unknown> | undefined
const client = {
session: {
get: async () => ({ data: { directory: "/test/dir" } }),
create: async () => ({ data: { id: "session-1" } }),
promptAsync: async (args: { path: { id: string }; body: Record<string, unknown> }) => {
capturedTools = args.body.tools as Record<string, unknown>
return {}
},
},
}
const manager = new BackgroundManager({ client, directory: tmpdir() } as unknown as PluginInput)
const task: BackgroundTask = {
id: "task-1",
status: "pending",
queuedAt: new Date(),
description: "test task",
prompt: "test prompt",
agent: "explore",
parentSessionID: "parent-session",
parentMessageID: "parent-message",
}
const input: import("./types").LaunchInput = {
description: task.description,
prompt: task.prompt,
agent: task.agent,
parentSessionID: task.parentSessionID,
parentMessageID: task.parentMessageID,
}
//#when
await (manager as unknown as { startTask: (item: { task: BackgroundTask; input: import("./types").LaunchInput }) => Promise<void> })
.startTask({ task, input })
//#then
expect(capturedTools).toBeDefined()
expect(capturedTools?.call_omo_agent).toBe(false)
expect(capturedTools?.task).toBe(false)
expect(capturedTools?.write).toBe(false)
expect(capturedTools?.edit).toBe(false)
manager.shutdown()
})
test("resume respects explore agent restrictions", async () => {
//#given
let capturedTools: Record<string, unknown> | undefined
const client = {
session: {
promptAsync: async (args: { path: { id: string }; body: Record<string, unknown> }) => {
capturedTools = args.body.tools as Record<string, unknown>
return {}
},
abort: async () => ({}),
},
}
const manager = new BackgroundManager({ client, directory: tmpdir() } as unknown as PluginInput)
const task: BackgroundTask = {
id: "task-2",
sessionID: "session-2",
parentSessionID: "parent-session",
parentMessageID: "parent-message",
description: "resume task",
prompt: "resume prompt",
agent: "explore",
status: "completed",
startedAt: new Date(),
completedAt: new Date(),
}
getTaskMap(manager).set(task.id, task)
//#when
await manager.resume({
sessionId: "session-2",
prompt: "continue",
parentSessionID: "parent-session",
parentMessageID: "parent-message",
})
//#then
expect(capturedTools).toBeDefined()
expect(capturedTools?.call_omo_agent).toBe(false)
expect(capturedTools?.task).toBe(false)
expect(capturedTools?.write).toBe(false)
expect(capturedTools?.edit).toBe(false)
manager.shutdown()
})
})

View File

@@ -355,10 +355,10 @@ export class BackgroundManager {
system: input.skillContent, system: input.skillContent,
tools: (() => { tools: (() => {
const tools = { const tools = {
...getAgentToolRestrictions(input.agent),
task: false, task: false,
call_omo_agent: true, call_omo_agent: true,
question: false, question: false,
...getAgentToolRestrictions(input.agent),
} }
setSessionTools(sessionID, tools) setSessionTools(sessionID, tools)
return tools return tools
@@ -628,10 +628,10 @@ export class BackgroundManager {
...(resumeVariant ? { variant: resumeVariant } : {}), ...(resumeVariant ? { variant: resumeVariant } : {}),
tools: (() => { tools: (() => {
const tools = { const tools = {
...getAgentToolRestrictions(existingTask.agent),
task: false, task: false,
call_omo_agent: true, call_omo_agent: true,
question: false, question: false,
...getAgentToolRestrictions(existingTask.agent),
} }
setSessionTools(existingTask.sessionID!, tools) setSessionTools(existingTask.sessionID!, tools)
return tools return tools

View File

@@ -141,10 +141,10 @@ export async function startTask(
...(launchVariant ? { variant: launchVariant } : {}), ...(launchVariant ? { variant: launchVariant } : {}),
system: input.skillContent, system: input.skillContent,
tools: { tools: {
...getAgentToolRestrictions(input.agent),
task: false, task: false,
call_omo_agent: true, call_omo_agent: true,
question: false, question: false,
...getAgentToolRestrictions(input.agent),
}, },
parts: [{ type: "text", text: input.prompt }], parts: [{ type: "text", text: input.prompt }],
}, },
@@ -225,10 +225,10 @@ export async function resumeTask(
...(resumeModel ? { model: resumeModel } : {}), ...(resumeModel ? { model: resumeModel } : {}),
...(resumeVariant ? { variant: resumeVariant } : {}), ...(resumeVariant ? { variant: resumeVariant } : {}),
tools: { tools: {
...getAgentToolRestrictions(task.agent),
task: false, task: false,
call_omo_agent: true, call_omo_agent: true,
question: false, question: false,
...getAgentToolRestrictions(task.agent),
}, },
parts: [{ type: "text", text: input.prompt }], parts: [{ type: "text", text: input.prompt }],
}, },

View File

@@ -1,50 +1,262 @@
import type { Hooks, PluginInput } from "@opencode-ai/plugin" import type { Hooks, PluginInput } from "@opencode-ai/plugin"
import { existsSync } from "fs" import { existsSync, realpathSync } from "fs"
import { resolve, isAbsolute, join, normalize, sep } from "path" import { basename, dirname, isAbsolute, join, normalize, relative, resolve, sep } from "path"
import { log } from "../../shared" import { log } from "../../shared"
type GuardArgs = {
filePath?: string
path?: string
file_path?: string
overwrite?: boolean | string
}
const MAX_TRACKED_SESSIONS = 256
export const MAX_TRACKED_PATHS_PER_SESSION = 1024
const OUTSIDE_SESSION_MESSAGE = "Path must be inside session directory."
function asRecord(value: unknown): Record<string, unknown> | undefined {
if (!value || typeof value !== "object" || Array.isArray(value)) {
return undefined
}
return value as Record<string, unknown>
}
function getPathFromArgs(args: GuardArgs | undefined): string | undefined {
return args?.filePath ?? args?.path ?? args?.file_path
}
function resolveInputPath(ctx: PluginInput, inputPath: string): string {
return normalize(isAbsolute(inputPath) ? inputPath : resolve(ctx.directory, inputPath))
}
function isPathInsideDirectory(pathToCheck: string, directory: string): boolean {
const relativePath = relative(directory, pathToCheck)
return relativePath === "" || (!relativePath.startsWith("..") && !isAbsolute(relativePath))
}
function toCanonicalPath(absolutePath: string): string {
let canonicalPath = absolutePath
if (existsSync(absolutePath)) {
try {
canonicalPath = realpathSync.native(absolutePath)
} catch {
canonicalPath = absolutePath
}
} else {
const absoluteDir = dirname(absolutePath)
const resolvedDir = existsSync(absoluteDir) ? realpathSync.native(absoluteDir) : absoluteDir
canonicalPath = join(resolvedDir, basename(absolutePath))
}
// Preserve canonical casing from the filesystem to avoid collapsing distinct
// files on case-sensitive volumes (supported on all major OSes).
return normalize(canonicalPath)
}
function isOverwriteEnabled(value: boolean | string | undefined): boolean {
if (value === true) {
return true
}
if (typeof value === "string") {
return value.toLowerCase() === "true"
}
return false
}
export function createWriteExistingFileGuardHook(ctx: PluginInput): Hooks { export function createWriteExistingFileGuardHook(ctx: PluginInput): Hooks {
return { const readPermissionsBySession = new Map<string, Set<string>>()
"tool.execute.before": async (input, output) => { const sessionLastAccess = new Map<string, number>()
const toolName = input.tool?.toLowerCase() const canonicalSessionRoot = toCanonicalPath(resolveInputPath(ctx, ctx.directory))
if (toolName !== "write") { const sisyphusRoot = join(canonicalSessionRoot, ".sisyphus") + sep
const touchSession = (sessionID: string): void => {
sessionLastAccess.set(sessionID, Date.now())
}
const evictLeastRecentlyUsedSession = (): void => {
let oldestSessionID: string | undefined
let oldestSeen = Number.POSITIVE_INFINITY
for (const [sessionID, lastSeen] of sessionLastAccess.entries()) {
if (lastSeen < oldestSeen) {
oldestSeen = lastSeen
oldestSessionID = sessionID
}
}
if (!oldestSessionID) {
return
}
readPermissionsBySession.delete(oldestSessionID)
sessionLastAccess.delete(oldestSessionID)
}
const ensureSessionReadSet = (sessionID: string): Set<string> => {
let readSet = readPermissionsBySession.get(sessionID)
if (!readSet) {
if (readPermissionsBySession.size >= MAX_TRACKED_SESSIONS) {
evictLeastRecentlyUsedSession()
}
readSet = new Set<string>()
readPermissionsBySession.set(sessionID, readSet)
}
touchSession(sessionID)
return readSet
}
const trimSessionReadSet = (readSet: Set<string>): void => {
while (readSet.size > MAX_TRACKED_PATHS_PER_SESSION) {
const oldestPath = readSet.values().next().value
if (!oldestPath) {
return return
} }
const args = output.args as readSet.delete(oldestPath)
| { filePath?: string; path?: string; file_path?: string } }
| undefined }
const filePath = args?.filePath ?? args?.path ?? args?.file_path
const registerReadPermission = (sessionID: string, canonicalPath: string): void => {
const readSet = ensureSessionReadSet(sessionID)
if (readSet.has(canonicalPath)) {
readSet.delete(canonicalPath)
}
readSet.add(canonicalPath)
trimSessionReadSet(readSet)
}
const consumeReadPermission = (sessionID: string, canonicalPath: string): boolean => {
const readSet = readPermissionsBySession.get(sessionID)
if (!readSet || !readSet.has(canonicalPath)) {
return false
}
readSet.delete(canonicalPath)
touchSession(sessionID)
return true
}
const invalidateOtherSessions = (canonicalPath: string, writingSessionID?: string): void => {
for (const [sessionID, readSet] of readPermissionsBySession.entries()) {
if (writingSessionID && sessionID === writingSessionID) {
continue
}
readSet.delete(canonicalPath)
}
}
return {
"tool.execute.before": async (input, output) => {
const toolName = input.tool?.toLowerCase()
if (toolName !== "write" && toolName !== "read") {
return
}
const argsRecord = asRecord(output.args)
const args = argsRecord as GuardArgs | undefined
const filePath = getPathFromArgs(args)
if (!filePath) { if (!filePath) {
return return
} }
const resolvedPath = normalize( const resolvedPath = resolveInputPath(ctx, filePath)
isAbsolute(filePath) ? filePath : resolve(ctx.directory, filePath) const canonicalPath = toCanonicalPath(resolvedPath)
) const isInsideSessionDirectory = isPathInsideDirectory(canonicalPath, canonicalSessionRoot)
if (existsSync(resolvedPath)) { if (!isInsideSessionDirectory) {
const sisyphusRoot = join(ctx.directory, ".sisyphus") + sep if (toolName === "read") {
const isSisyphusMarkdown =
resolvedPath.startsWith(sisyphusRoot) && resolvedPath.endsWith(".md")
if (isSisyphusMarkdown) {
log("[write-existing-file-guard] Allowing .sisyphus/*.md overwrite", {
sessionID: input.sessionID,
filePath,
})
return return
} }
log("[write-existing-file-guard] Blocking write to existing file", { log("[write-existing-file-guard] Blocking write outside session directory", {
sessionID: input.sessionID, sessionID: input.sessionID,
filePath, filePath,
resolvedPath, resolvedPath,
}) })
throw new Error(OUTSIDE_SESSION_MESSAGE)
throw new Error("File already exists. Use edit tool instead.")
} }
if (toolName === "read") {
if (!existsSync(resolvedPath) || !input.sessionID) {
return
}
registerReadPermission(input.sessionID, canonicalPath)
return
}
const overwriteEnabled = isOverwriteEnabled(args?.overwrite)
if (argsRecord && "overwrite" in argsRecord) {
// Intentionally mutate output args so overwrite bypass remains hook-only.
delete argsRecord.overwrite
}
if (!existsSync(resolvedPath)) {
return
}
const isSisyphusPath = canonicalPath.startsWith(sisyphusRoot)
if (isSisyphusPath) {
log("[write-existing-file-guard] Allowing .sisyphus/** overwrite", {
sessionID: input.sessionID,
filePath,
})
invalidateOtherSessions(canonicalPath, input.sessionID)
return
}
if (overwriteEnabled) {
log("[write-existing-file-guard] Allowing overwrite flag bypass", {
sessionID: input.sessionID,
filePath,
resolvedPath,
})
invalidateOtherSessions(canonicalPath, input.sessionID)
return
}
if (input.sessionID && consumeReadPermission(input.sessionID, canonicalPath)) {
log("[write-existing-file-guard] Allowing overwrite after read", {
sessionID: input.sessionID,
filePath,
resolvedPath,
})
invalidateOtherSessions(canonicalPath, input.sessionID)
return
}
log("[write-existing-file-guard] Blocking write to existing file", {
sessionID: input.sessionID,
filePath,
resolvedPath,
})
throw new Error("File already exists. Use edit tool instead.")
},
event: async ({ event }: { event: { type: string; properties?: unknown } }) => {
if (event.type !== "session.deleted") {
return
}
const props = event.properties as { info?: { id?: string } } | undefined
const sessionID = props?.info?.id
if (!sessionID) {
return
}
readPermissionsBySession.delete(sessionID)
sessionLastAccess.delete(sessionID)
}, },
} }
} }

View File

@@ -1,305 +1,551 @@
import { describe, test, expect, beforeEach, afterEach } from "bun:test" import { afterEach, beforeEach, describe, expect, test } from "bun:test"
import { existsSync, mkdirSync, mkdtempSync, rmSync, symlinkSync, writeFileSync } from "node:fs"
import { tmpdir } from "node:os"
import { dirname, join, resolve } from "node:path"
import { MAX_TRACKED_PATHS_PER_SESSION } from "./hook"
import { createWriteExistingFileGuardHook } from "./index" import { createWriteExistingFileGuardHook } from "./index"
import * as fs from "fs"
import * as path from "path" const BLOCK_MESSAGE = "File already exists. Use edit tool instead."
import * as os from "os" const OUTSIDE_SESSION_MESSAGE = "Path must be inside session directory."
type Hook = ReturnType<typeof createWriteExistingFileGuardHook>
function isCaseInsensitiveFilesystem(directory: string): boolean {
const probeName = `CaseProbe_${Date.now()}_A.txt`
const upperPath = join(directory, probeName)
const lowerPath = join(directory, probeName.toLowerCase())
writeFileSync(upperPath, "probe")
try {
return existsSync(lowerPath)
} finally {
rmSync(upperPath, { force: true })
}
}
describe("createWriteExistingFileGuardHook", () => { describe("createWriteExistingFileGuardHook", () => {
let tempDir: string let tempDir = ""
let ctx: { directory: string } let hook: Hook
let hook: ReturnType<typeof createWriteExistingFileGuardHook> let callCounter = 0
const createFile = (relativePath: string, content = "existing content"): string => {
const absolutePath = join(tempDir, relativePath)
mkdirSync(dirname(absolutePath), { recursive: true })
writeFileSync(absolutePath, content)
return absolutePath
}
const invoke = async (args: {
tool: string
sessionID?: string
outputArgs: Record<string, unknown>
}): Promise<{ args: Record<string, unknown> }> => {
callCounter += 1
const output = { args: args.outputArgs }
await hook["tool.execute.before"]?.(
{
tool: args.tool,
sessionID: args.sessionID ?? "ses_default",
callID: `call_${callCounter}`,
} as never,
output as never
)
return output
}
const emitSessionDeleted = async (sessionID: string): Promise<void> => {
await hook.event?.({ event: { type: "session.deleted", properties: { info: { id: sessionID } } } })
}
beforeEach(() => { beforeEach(() => {
tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "write-guard-test-")) tempDir = mkdtempSync(join(tmpdir(), "write-existing-file-guard-"))
ctx = { directory: tempDir } hook = createWriteExistingFileGuardHook({ directory: tempDir } as never)
hook = createWriteExistingFileGuardHook(ctx as any) callCounter = 0
}) })
afterEach(() => { afterEach(() => {
fs.rmSync(tempDir, { recursive: true, force: true }) rmSync(tempDir, { recursive: true, force: true })
}) })
describe("tool.execute.before", () => { test("#given non-existing file #when write executes #then allows", async () => {
test("allows write to non-existing file", async () => { await expect(
//#given invoke({
const nonExistingFile = path.join(tempDir, "new-file.txt") tool: "write",
const input = { tool: "Write", sessionID: "ses_1", callID: "call_1" } outputArgs: { filePath: join(tempDir, "new-file.txt"), content: "new content" },
const output = { args: { filePath: nonExistingFile, content: "hello" } } })
).resolves.toBeDefined()
})
//#when test("#given existing file without read or overwrite #when write executes #then blocks", async () => {
const result = hook["tool.execute.before"]?.(input as any, output as any) const existingFile = createFile("existing.txt")
//#then await expect(
await expect(result).resolves.toBeUndefined() invoke({
tool: "write",
outputArgs: { filePath: existingFile, content: "new content" },
})
).rejects.toThrow(BLOCK_MESSAGE)
})
test("#given same-session read #when write executes #then allows once and consumes permission", async () => {
const existingFile = createFile("consume-once.txt")
const sessionID = "ses_consume"
await invoke({
tool: "read",
sessionID,
outputArgs: { filePath: existingFile },
}) })
test("blocks write to existing file", async () => { await expect(
//#given invoke({
const existingFile = path.join(tempDir, "existing-file.txt") tool: "write",
fs.writeFileSync(existingFile, "existing content") sessionID,
const input = { tool: "Write", sessionID: "ses_1", callID: "call_1" } outputArgs: { filePath: existingFile, content: "first overwrite" },
const output = { args: { filePath: existingFile, content: "new content" } } })
).resolves.toBeDefined()
//#when await expect(
const result = hook["tool.execute.before"]?.(input as any, output as any) invoke({
tool: "write",
sessionID,
outputArgs: { filePath: existingFile, content: "second overwrite" },
})
).rejects.toThrow(BLOCK_MESSAGE)
})
//#then test("#given same-session concurrent writes #when only one read permission exists #then allows only one write", async () => {
await expect(result).rejects.toThrow("File already exists. Use edit tool instead.") const existingFile = createFile("concurrent-consume.txt")
const sessionID = "ses_concurrent"
await invoke({
tool: "read",
sessionID,
outputArgs: { filePath: existingFile },
}) })
test("blocks write tool (lowercase) to existing file", async () => { const results = await Promise.allSettled([
//#given invoke({
const existingFile = path.join(tempDir, "existing-file.txt") tool: "write",
fs.writeFileSync(existingFile, "existing content") sessionID,
const input = { tool: "write", sessionID: "ses_1", callID: "call_1" } outputArgs: { filePath: existingFile, content: "first attempt" },
const output = { args: { filePath: existingFile, content: "new content" } } }),
invoke({
tool: "write",
sessionID,
outputArgs: { filePath: existingFile, content: "second attempt" },
}),
])
//#when const successCount = results.filter((result) => result.status === "fulfilled").length
const result = hook["tool.execute.before"]?.(input as any, output as any) const failures = results.filter(
(result): result is PromiseRejectedResult => result.status === "rejected"
)
//#then expect(successCount).toBe(1)
await expect(result).rejects.toThrow("File already exists. Use edit tool instead.") expect(failures).toHaveLength(1)
expect(String(failures[0]?.reason)).toContain(BLOCK_MESSAGE)
})
test("#given read in another session #when write executes #then blocks", async () => {
const existingFile = createFile("cross-session.txt")
await invoke({
tool: "read",
sessionID: "ses_reader",
outputArgs: { filePath: existingFile },
}) })
test("ignores non-write tools", async () => { await expect(
//#given invoke({
const existingFile = path.join(tempDir, "existing-file.txt") tool: "write",
fs.writeFileSync(existingFile, "existing content") sessionID: "ses_writer",
const input = { tool: "Edit", sessionID: "ses_1", callID: "call_1" } outputArgs: { filePath: existingFile, content: "new content" },
const output = { args: { filePath: existingFile, content: "new content" } } })
).rejects.toThrow(BLOCK_MESSAGE)
})
//#when test("#given overwrite true boolean #when write executes #then bypasses guard and strips overwrite", async () => {
const result = hook["tool.execute.before"]?.(input as any, output as any) const existingFile = createFile("overwrite-boolean.txt")
//#then const output = await invoke({
await expect(result).resolves.toBeUndefined() tool: "write",
outputArgs: {
filePath: existingFile,
content: "new content",
overwrite: true,
},
}) })
test("ignores tools without any file path arg", async () => { expect(output.args.overwrite).toBeUndefined()
//#given })
const input = { tool: "Write", sessionID: "ses_1", callID: "call_1" }
const output = { args: { command: "ls" } }
//#when test("#given overwrite true string #when write executes #then bypasses guard and strips overwrite", async () => {
const result = hook["tool.execute.before"]?.(input as any, output as any) const existingFile = createFile("overwrite-string.txt")
//#then const output = await invoke({
await expect(result).resolves.toBeUndefined() tool: "write",
outputArgs: {
filePath: existingFile,
content: "new content",
overwrite: "true",
},
}) })
describe("alternative arg names", () => { expect(output.args.overwrite).toBeUndefined()
test("blocks write using 'path' arg to existing file", async () => { })
//#given
const existingFile = path.join(tempDir, "existing-file.txt")
fs.writeFileSync(existingFile, "existing content")
const input = { tool: "Write", sessionID: "ses_1", callID: "call_1" }
const output = { args: { path: existingFile, content: "new content" } }
//#when test("#given overwrite falsy values #when write executes #then does not bypass guard", async () => {
const result = hook["tool.execute.before"]?.(input as any, output as any) const existingFile = createFile("overwrite-falsy.txt")
//#then for (const overwrite of [false, "false"] as const) {
await expect(result).rejects.toThrow("File already exists. Use edit tool instead.") await expect(
}) invoke({
tool: "write",
outputArgs: {
filePath: existingFile,
content: "new content",
overwrite,
},
})
).rejects.toThrow(BLOCK_MESSAGE)
}
})
test("blocks write using 'file_path' arg to existing file", async () => { test("#given two sessions read same file #when one writes #then other session is invalidated", async () => {
//#given const existingFile = createFile("invalidate.txt")
const existingFile = path.join(tempDir, "existing-file.txt")
fs.writeFileSync(existingFile, "existing content")
const input = { tool: "Write", sessionID: "ses_1", callID: "call_1" }
const output = { args: { file_path: existingFile, content: "new content" } }
//#when await invoke({
const result = hook["tool.execute.before"]?.(input as any, output as any) tool: "read",
sessionID: "ses_a",
//#then outputArgs: { filePath: existingFile },
await expect(result).rejects.toThrow("File already exists. Use edit tool instead.") })
}) await invoke({
tool: "read",
test("allows write using 'path' arg to non-existing file", async () => { sessionID: "ses_b",
//#given outputArgs: { filePath: existingFile },
const nonExistingFile = path.join(tempDir, "new-file.txt")
const input = { tool: "Write", sessionID: "ses_1", callID: "call_1" }
const output = { args: { path: nonExistingFile, content: "hello" } }
//#when
const result = hook["tool.execute.before"]?.(input as any, output as any)
//#then
await expect(result).resolves.toBeUndefined()
})
test("allows write using 'file_path' arg to non-existing file", async () => {
//#given
const nonExistingFile = path.join(tempDir, "new-file.txt")
const input = { tool: "Write", sessionID: "ses_1", callID: "call_1" }
const output = { args: { file_path: nonExistingFile, content: "hello" } }
//#when
const result = hook["tool.execute.before"]?.(input as any, output as any)
//#then
await expect(result).resolves.toBeUndefined()
})
}) })
describe("relative path resolution using ctx.directory", () => { await expect(
test("blocks write to existing file using relative path", async () => { invoke({
//#given tool: "write",
const existingFile = path.join(tempDir, "existing-file.txt") sessionID: "ses_b",
fs.writeFileSync(existingFile, "existing content") outputArgs: { filePath: existingFile, content: "updated by B" },
const input = { tool: "Write", sessionID: "ses_1", callID: "call_1" } })
const output = { args: { filePath: "existing-file.txt", content: "new content" } } ).resolves.toBeDefined()
//#when await expect(
const result = hook["tool.execute.before"]?.(input as any, output as any) invoke({
tool: "write",
sessionID: "ses_a",
outputArgs: { filePath: existingFile, content: "updated by A" },
})
).rejects.toThrow(BLOCK_MESSAGE)
})
//#then test("#given existing file under .sisyphus #when write executes #then always allows", async () => {
await expect(result).rejects.toThrow("File already exists. Use edit tool instead.") const existingFile = createFile(".sisyphus/plans/plan.txt")
await expect(
invoke({
tool: "write",
outputArgs: { filePath: existingFile, content: "new plan" },
})
).resolves.toBeDefined()
})
test("#given file arg variants #when read then write executes #then supports all variants", async () => {
const existingFile = createFile("variants.txt")
const variants: Array<"filePath" | "path" | "file_path"> = [
"filePath",
"path",
"file_path",
]
for (const variant of variants) {
const sessionID = `ses_${variant}`
await invoke({
tool: "read",
sessionID,
outputArgs: { [variant]: existingFile },
}) })
test("allows write to non-existing file using relative path", async () => { await expect(
//#given invoke({
const input = { tool: "Write", sessionID: "ses_1", callID: "call_1" } tool: "write",
const output = { args: { filePath: "new-file.txt", content: "hello" } } sessionID,
outputArgs: { [variant]: existingFile, content: `overwrite via ${variant}` },
})
).resolves.toBeDefined()
}
})
//#when test("#given tools without file path arg #when write and read execute #then ignores safely", async () => {
const result = hook["tool.execute.before"]?.(input as any, output as any) await expect(
invoke({
//#then tool: "write",
await expect(result).resolves.toBeUndefined() outputArgs: { content: "no path" },
}) })
).resolves.toBeDefined()
test("blocks write to nested relative path when file exists", async () => { await expect(
//#given invoke({
const subDir = path.join(tempDir, "subdir") tool: "read",
fs.mkdirSync(subDir) outputArgs: {},
const existingFile = path.join(subDir, "existing.txt")
fs.writeFileSync(existingFile, "existing content")
const input = { tool: "Write", sessionID: "ses_1", callID: "call_1" }
const output = { args: { filePath: "subdir/existing.txt", content: "new content" } }
//#when
const result = hook["tool.execute.before"]?.(input as any, output as any)
//#then
await expect(result).rejects.toThrow("File already exists. Use edit tool instead.")
}) })
).resolves.toBeDefined()
})
test("uses ctx.directory not process.cwd for relative path resolution", async () => { test("#given non-read-write tool #when it executes #then does not grant write permission", async () => {
//#given const existingFile = createFile("ignored-tool.txt")
const existingFile = path.join(tempDir, "test-file.txt") const sessionID = "ses_ignored_tool"
fs.writeFileSync(existingFile, "content")
const differentCtx = { directory: tempDir }
const differentHook = createWriteExistingFileGuardHook(differentCtx as any)
const input = { tool: "Write", sessionID: "ses_1", callID: "call_1" }
const output = { args: { filePath: "test-file.txt", content: "new" } }
//#when await invoke({
const result = differentHook["tool.execute.before"]?.(input as any, output as any) tool: "edit",
sessionID,
//#then outputArgs: { filePath: existingFile, oldString: "old", newString: "new" },
await expect(result).rejects.toThrow("File already exists. Use edit tool instead.")
})
describe(".sisyphus/*.md exception", () => {
test("allows write to existing .sisyphus/plans/plan.md", async () => {
//#given
const sisyphusDir = path.join(tempDir, ".sisyphus", "plans")
fs.mkdirSync(sisyphusDir, { recursive: true })
const planFile = path.join(sisyphusDir, "plan.md")
fs.writeFileSync(planFile, "# Existing Plan")
const input = { tool: "Write", sessionID: "ses_1", callID: "call_1" }
const output = { args: { filePath: planFile, content: "# Updated Plan" } }
//#when
const result = hook["tool.execute.before"]?.(input as any, output as any)
//#then
await expect(result).resolves.toBeUndefined()
})
test("allows write to existing .sisyphus/notes.md", async () => {
//#given
const sisyphusDir = path.join(tempDir, ".sisyphus")
fs.mkdirSync(sisyphusDir, { recursive: true })
const notesFile = path.join(sisyphusDir, "notes.md")
fs.writeFileSync(notesFile, "# Notes")
const input = { tool: "Write", sessionID: "ses_1", callID: "call_1" }
const output = { args: { filePath: notesFile, content: "# Updated Notes" } }
//#when
const result = hook["tool.execute.before"]?.(input as any, output as any)
//#then
await expect(result).resolves.toBeUndefined()
})
test("allows write to existing .sisyphus/*.md using relative path", async () => {
//#given
const sisyphusDir = path.join(tempDir, ".sisyphus")
fs.mkdirSync(sisyphusDir, { recursive: true })
const planFile = path.join(sisyphusDir, "plan.md")
fs.writeFileSync(planFile, "# Plan")
const input = { tool: "Write", sessionID: "ses_1", callID: "call_1" }
const output = { args: { filePath: ".sisyphus/plan.md", content: "# Updated" } }
//#when
const result = hook["tool.execute.before"]?.(input as any, output as any)
//#then
await expect(result).resolves.toBeUndefined()
})
test("blocks write to existing .sisyphus/file.txt (non-markdown)", async () => {
//#given
const sisyphusDir = path.join(tempDir, ".sisyphus")
fs.mkdirSync(sisyphusDir, { recursive: true })
const textFile = path.join(sisyphusDir, "file.txt")
fs.writeFileSync(textFile, "content")
const input = { tool: "Write", sessionID: "ses_1", callID: "call_1" }
const output = { args: { filePath: textFile, content: "new content" } }
//#when
const result = hook["tool.execute.before"]?.(input as any, output as any)
//#then
await expect(result).rejects.toThrow("File already exists. Use edit tool instead.")
})
test("blocks write when .sisyphus is in parent path but not under ctx.directory", async () => {
//#given
const fakeSisyphusParent = path.join(os.tmpdir(), ".sisyphus", "evil-project")
fs.mkdirSync(fakeSisyphusParent, { recursive: true })
const evilFile = path.join(fakeSisyphusParent, "plan.md")
fs.writeFileSync(evilFile, "# Evil Plan")
const input = { tool: "Write", sessionID: "ses_1", callID: "call_1" }
const output = { args: { filePath: evilFile, content: "# Hacked" } }
//#when
const result = hook["tool.execute.before"]?.(input as any, output as any)
//#then
await expect(result).rejects.toThrow("File already exists. Use edit tool instead.")
// cleanup
fs.rmSync(path.join(os.tmpdir(), ".sisyphus"), { recursive: true, force: true })
})
test("blocks write to existing regular file (not in .sisyphus)", async () => {
//#given
const regularFile = path.join(tempDir, "regular.md")
fs.writeFileSync(regularFile, "# Regular")
const input = { tool: "Write", sessionID: "ses_1", callID: "call_1" }
const output = { args: { filePath: regularFile, content: "# Updated" } }
//#when
const result = hook["tool.execute.before"]?.(input as any, output as any)
//#then
await expect(result).rejects.toThrow("File already exists. Use edit tool instead.")
})
}) })
})
}) await expect(
invoke({
tool: "write",
sessionID,
outputArgs: { filePath: existingFile, content: "should block" },
})
).rejects.toThrow(BLOCK_MESSAGE)
})
test("#given relative read and absolute write #when same session writes #then allows", async () => {
createFile("relative-absolute.txt")
const sessionID = "ses_relative_absolute"
const relativePath = "relative-absolute.txt"
const absolutePath = resolve(tempDir, relativePath)
await invoke({
tool: "read",
sessionID,
outputArgs: { filePath: relativePath },
})
await expect(
invoke({
tool: "write",
sessionID,
outputArgs: { filePath: absolutePath, content: "updated" },
})
).resolves.toBeDefined()
})
test("#given existing file outside session directory #when write executes #then blocks", async () => {
const outsideDir = mkdtempSync(join(tmpdir(), "write-existing-file-guard-outside-"))
try {
const outsideFile = join(outsideDir, "outside.txt")
writeFileSync(outsideFile, "outside")
await expect(
invoke({
tool: "write",
outputArgs: { filePath: outsideFile, content: "attempted overwrite" },
})
).rejects.toThrow(OUTSIDE_SESSION_MESSAGE)
} finally {
rmSync(outsideDir, { recursive: true, force: true })
}
})
test("#given session read permission #when session deleted #then permission is cleaned up", async () => {
const existingFile = createFile("session-cleanup.txt")
const sessionID = "ses_cleanup"
await invoke({
tool: "read",
sessionID,
outputArgs: { filePath: existingFile },
})
await emitSessionDeleted(sessionID)
await expect(
invoke({
tool: "write",
sessionID,
outputArgs: { filePath: existingFile, content: "after cleanup" },
})
).rejects.toThrow(BLOCK_MESSAGE)
})
test("#given case-different read path #when writing canonical path #then follows platform behavior", async () => {
const canonicalFile = createFile("CaseFile.txt")
const lowerCasePath = join(tempDir, "casefile.txt")
const sessionID = "ses_case"
const isCaseInsensitiveFs = isCaseInsensitiveFilesystem(tempDir)
await invoke({
tool: "read",
sessionID,
outputArgs: { filePath: lowerCasePath },
})
const writeAttempt = invoke({
tool: "write",
sessionID,
outputArgs: { filePath: canonicalFile, content: "updated" },
})
if (isCaseInsensitiveFs) {
await expect(writeAttempt).resolves.toBeDefined()
return
}
await expect(writeAttempt).rejects.toThrow(BLOCK_MESSAGE)
})
test("#given read via symlink #when write via real path #then allows overwrite", async () => {
const targetFile = createFile("real/target.txt")
const symlinkPath = join(tempDir, "linked-target.txt")
const sessionID = "ses_symlink"
try {
symlinkSync(targetFile, symlinkPath)
} catch (error) {
console.warn(
"Skipping symlink test: symlinks are not supported or cannot be created in this environment.",
error
)
return
}
await invoke({
tool: "read",
sessionID,
outputArgs: { filePath: symlinkPath },
})
await expect(
invoke({
tool: "write",
sessionID,
outputArgs: { filePath: targetFile, content: "updated via symlink read" },
})
).resolves.toBeDefined()
})
test("#given session reads beyond path cap #when writing oldest and newest #then only newest is authorized", async () => {
const sessionID = "ses_path_cap"
const oldestFile = createFile("path-cap/0.txt")
let newestFile = oldestFile
await invoke({
tool: "read",
sessionID,
outputArgs: { filePath: oldestFile },
})
for (let index = 1; index <= MAX_TRACKED_PATHS_PER_SESSION; index += 1) {
newestFile = createFile(`path-cap/${index}.txt`)
await invoke({
tool: "read",
sessionID,
outputArgs: { filePath: newestFile },
})
}
await expect(
invoke({
tool: "write",
sessionID,
outputArgs: { filePath: oldestFile, content: "stale write" },
})
).rejects.toThrow(BLOCK_MESSAGE)
await expect(
invoke({
tool: "write",
sessionID,
outputArgs: { filePath: newestFile, content: "fresh write" },
})
).resolves.toBeDefined()
})
test("#given recently active session #when lru evicts #then keeps recent session permission", async () => {
const existingFile = createFile("lru.txt")
const hotSession = "ses_hot"
await invoke({
tool: "read",
sessionID: hotSession,
outputArgs: { filePath: existingFile },
})
for (let index = 0; index < 255; index += 1) {
await invoke({
tool: "read",
sessionID: `ses_${index}`,
outputArgs: { filePath: existingFile },
})
}
await new Promise((resolvePromise) => setTimeout(resolvePromise, 2))
await invoke({
tool: "read",
sessionID: hotSession,
outputArgs: { filePath: existingFile },
})
await invoke({
tool: "read",
sessionID: "ses_overflow",
outputArgs: { filePath: existingFile },
})
await expect(
invoke({
tool: "write",
sessionID: hotSession,
outputArgs: { filePath: existingFile, content: "hot session write" },
})
).resolves.toBeDefined()
})
test("#given session permissions #when session deleted #then subsequent writes are blocked", async () => {
const existingFile = createFile("cleanup.txt")
const sessionID = "ses_cleanup"
// establish permission by reading the existing file
await invoke({
tool: "read",
sessionID,
outputArgs: { filePath: existingFile },
})
// sanity check: write should be allowed while the session is active
await expect(
invoke({
tool: "write",
sessionID,
outputArgs: { filePath: existingFile, content: "first write" },
})
).resolves.toBeDefined()
// delete the session to trigger cleanup of any stored permissions/state
await invoke({
tool: "session.deleted",
sessionID,
outputArgs: {},
})
// after session deletion, the previous permissions must no longer apply
await expect(
invoke({
tool: "write",
sessionID,
outputArgs: { filePath: existingFile, content: "second write after delete" },
})
).rejects.toThrow(BLOCK_MESSAGE)
})
}) })

View File

@@ -383,3 +383,55 @@ type EventInput = { event: { type: string; properties?: Record<string, unknown>
expect(dispatchCalls[1].event.type).toBe("session.idle") expect(dispatchCalls[1].event.type).toBe("session.idle")
}) })
}) })
describe("createEventHandler - event forwarding", () => {
it("forwards session.deleted to write-existing-file-guard hook", async () => {
//#given
const forwardedEvents: EventInput[] = []
const disconnectedSessions: string[] = []
const deletedSessions: string[] = []
const eventHandler = createEventHandler({
ctx: {} as never,
pluginConfig: {} as never,
firstMessageVariantGate: {
markSessionCreated: () => {},
clear: () => {},
},
managers: {
skillMcpManager: {
disconnectSession: async (sessionID: string) => {
disconnectedSessions.push(sessionID)
},
},
tmuxSessionManager: {
onSessionCreated: async () => {},
onSessionDeleted: async ({ sessionID }: { sessionID: string }) => {
deletedSessions.push(sessionID)
},
},
} as never,
hooks: {
writeExistingFileGuard: {
event: async (input: EventInput) => {
forwardedEvents.push(input)
},
},
} as never,
})
const sessionID = "ses_forward_delete_event"
//#when
await eventHandler({
event: {
type: "session.deleted",
properties: { info: { id: sessionID } },
},
})
//#then
expect(forwardedEvents.length).toBe(1)
expect(forwardedEvents[0]?.event.type).toBe("session.deleted")
expect(disconnectedSessions).toEqual([sessionID])
expect(deletedSessions).toEqual([sessionID])
})
})

View File

@@ -127,6 +127,7 @@ export function createEventHandler(args: {
await Promise.resolve(hooks.ralphLoop?.event?.(input)) await Promise.resolve(hooks.ralphLoop?.event?.(input))
await Promise.resolve(hooks.stopContinuationGuard?.event?.(input)) await Promise.resolve(hooks.stopContinuationGuard?.event?.(input))
await Promise.resolve(hooks.compactionTodoPreserver?.event?.(input)) await Promise.resolve(hooks.compactionTodoPreserver?.event?.(input))
await Promise.resolve(hooks.writeExistingFileGuard?.event?.(input))
await Promise.resolve(hooks.atlasHook?.handler?.(input)) await Promise.resolve(hooks.atlasHook?.handler?.(input))
} }

View File

@@ -78,7 +78,7 @@ export function createBackgroundOutput(manager: BackgroundOutputManager, client:
} }
const isActive = task.status === "pending" || task.status === "running" const isActive = task.status === "pending" || task.status === "running"
const fullSession = args.full_session ?? isActive const fullSession = args.full_session ?? false
const includeThinking = isActive || (args.include_thinking ?? false) const includeThinking = isActive || (args.include_thinking ?? false)
const includeToolResults = isActive || (args.include_tool_results ?? false) const includeToolResults = isActive || (args.include_tool_results ?? false)

View File

@@ -232,7 +232,7 @@ describe("background_output full_session", () => {
expect(output).toContain("Has more: true") expect(output).toContain("Has more: true")
}) })
test("defaults to full_session when task is running", async () => { test("defaults to compact status when task is running", async () => {
// #given // #given
const task = createTask({ status: "running" }) const task = createTask({ status: "running" })
const manager = createMockManager(task) const manager = createMockManager(task)
@@ -242,6 +242,21 @@ describe("background_output full_session", () => {
// #when // #when
const output = await tool.execute({ task_id: "task-1" }, mockContext) const output = await tool.execute({ task_id: "task-1" }, mockContext)
// #then
expect(output).toContain("# Task Status")
expect(output).not.toContain("# Full Session Output")
})
test("returns full session when explicitly requested for running task", async () => {
// #given
const task = createTask({ status: "running" })
const manager = createMockManager(task)
const client = createMockClient({})
const tool = createBackgroundOutput(manager, client)
// #when
const output = await tool.execute({ task_id: "task-1", full_session: true }, mockContext)
// #then // #then
expect(output).toContain("# Full Session Output") expect(output).toContain("# Full Session Output")
}) })