merge: upstream/dev into fix/toolcall-format
Resolved conflict in dynamic-agent-prompt-builder.ts by keeping both buildToolCallFormatSection() and buildNonClaudePlannerSection() functions.
This commit is contained in:
+1
-1
@@ -1,6 +1,6 @@
|
||||
# src/ — Plugin Source
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
|
||||
+11
-11
@@ -1,6 +1,6 @@
|
||||
# src/agents/ — 11 Agent Definitions
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
@@ -10,16 +10,16 @@ Agent factories following `createXXXAgent(model) → AgentConfig` pattern. Each
|
||||
|
||||
| Agent | Model | Temp | Mode | Fallback Chain | Purpose |
|
||||
|-------|-------|------|------|----------------|---------|
|
||||
| **Sisyphus** | claude-opus-4-6 | 0.1 | primary | kimi-k2.5 → glm-4.7 → gemini-3-pro | Main orchestrator, plans + delegates |
|
||||
| **Hephaestus** | gpt-5.3-codex | 0.1 | primary | NONE (required) | Autonomous deep worker |
|
||||
| **Oracle** | gpt-5.2 | 0.1 | subagent | claude-opus-4-6 → gemini-3-pro | Read-only consultation |
|
||||
| **Librarian** | glm-4.7 | 0.1 | subagent | big-pickle → claude-sonnet-4-6 | External docs/code search |
|
||||
| **Explore** | grok-code-fast-1 | 0.1 | subagent | claude-haiku-4-5 → gpt-5-nano | Contextual grep |
|
||||
| **Multimodal-Looker** | gemini-3-flash | 0.1 | subagent | gpt-5.2 → glm-4.6v → ... (6 deep) | PDF/image analysis |
|
||||
| **Metis** | claude-opus-4-6 | **0.3** | subagent | kimi-k2.5 → gpt-5.2 → gemini-3-pro | Pre-planning consultant |
|
||||
| **Momus** | gpt-5.2 | 0.1 | subagent | claude-opus-4-6 → gemini-3-pro | Plan reviewer |
|
||||
| **Atlas** | claude-sonnet-4-6 | 0.1 | primary | kimi-k2.5 → gpt-5.2 → gemini-3-pro | Todo-list orchestrator |
|
||||
| **Prometheus** | claude-opus-4-6 | 0.1 | — | kimi-k2.5 → gpt-5.2 → gemini-3-pro | Strategic planner (internal) |
|
||||
| **Sisyphus** | claude-opus-4-6 | 0.1 | all | kimi-k2.5 → glm-5 → big-pickle | Main orchestrator, plans + delegates |
|
||||
| **Hephaestus** | gpt-5.3-codex | 0.1 | all | gpt-5.2 (copilot) | Autonomous deep worker |
|
||||
| **Oracle** | gpt-5.2 | 0.1 | subagent | gemini-3.1-pro → claude-opus-4-6 | Read-only consultation |
|
||||
| **Librarian** | kimi-k2.5 | 0.1 | subagent | gemini-3-flash → gpt-5.2 → glm-4.6v | External docs/code search |
|
||||
| **Explore** | grok-code-fast-1 | 0.1 | subagent | minimax-m2.5 → claude-haiku-4-5 → gpt-5-nano | Contextual grep |
|
||||
| **Multimodal-Looker** | gemini-3-flash | 0.1 | subagent | minimax-m2.5 → big-pickle | PDF/image analysis |
|
||||
| **Metis** | claude-opus-4-6 | **0.3** | subagent | gpt-5.2 → kimi-k2.5 → gemini-3.1-pro | Pre-planning consultant |
|
||||
| **Momus** | gpt-5.2 | 0.1 | subagent | claude-opus-4-6 → gemini-3.1-pro | Plan reviewer |
|
||||
| **Atlas** | kimi-k2.5 | 0.1 | primary | claude-sonnet-4-6 → gpt-5.2 | Todo-list orchestrator |
|
||||
| **Prometheus** | claude-opus-4-6 | 0.1 | — | kimi-k2.5 → gpt-5.2 → gemini-3.1-pro | Strategic planner (internal) |
|
||||
| **Sisyphus-Junior** | claude-sonnet-4-6 | 0.1 | all | user-configurable | Category-spawned executor |
|
||||
|
||||
## TOOL RESTRICTIONS
|
||||
|
||||
@@ -4,6 +4,8 @@ import { describe, it, expect } from "bun:test"
|
||||
import {
|
||||
buildCategorySkillsDelegationGuide,
|
||||
buildUltraworkSection,
|
||||
buildDeepParallelSection,
|
||||
buildNonClaudePlannerSection,
|
||||
type AvailableSkill,
|
||||
type AvailableCategory,
|
||||
type AvailableAgent,
|
||||
@@ -172,4 +174,86 @@ describe("buildUltraworkSection", () => {
|
||||
})
|
||||
})
|
||||
|
||||
describe("buildDeepParallelSection", () => {
|
||||
const deepCategory: AvailableCategory = { name: "deep", description: "Autonomous problem-solving" }
|
||||
const otherCategory: AvailableCategory = { name: "quick", description: "Trivial tasks" }
|
||||
|
||||
it("#given non-Claude model with deep category #when building #then returns parallel delegation section", () => {
|
||||
//#given
|
||||
const model = "google/gemini-3-pro"
|
||||
const categories = [deepCategory, otherCategory]
|
||||
|
||||
//#when
|
||||
const result = buildDeepParallelSection(model, categories)
|
||||
|
||||
//#then
|
||||
expect(result).toContain("Deep Parallel Delegation")
|
||||
expect(result).toContain("EVERY independent unit")
|
||||
expect(result).toContain("run_in_background=true")
|
||||
expect(result).toContain("4 independent units")
|
||||
})
|
||||
|
||||
it("#given Claude model #when building #then returns empty", () => {
|
||||
//#given
|
||||
const model = "anthropic/claude-opus-4-6"
|
||||
const categories = [deepCategory]
|
||||
|
||||
//#when
|
||||
const result = buildDeepParallelSection(model, categories)
|
||||
|
||||
//#then
|
||||
expect(result).toBe("")
|
||||
})
|
||||
|
||||
it("#given non-Claude model without deep category #when building #then returns empty", () => {
|
||||
//#given
|
||||
const model = "openai/gpt-5.2"
|
||||
const categories = [otherCategory]
|
||||
|
||||
//#when
|
||||
const result = buildDeepParallelSection(model, categories)
|
||||
|
||||
//#then
|
||||
expect(result).toBe("")
|
||||
})
|
||||
})
|
||||
|
||||
describe("buildNonClaudePlannerSection", () => {
|
||||
it("#given non-Claude model #when building #then returns plan agent section", () => {
|
||||
//#given
|
||||
const model = "google/gemini-3-pro"
|
||||
|
||||
//#when
|
||||
const result = buildNonClaudePlannerSection(model)
|
||||
|
||||
//#then
|
||||
expect(result).toContain("Plan Agent")
|
||||
expect(result).toContain("session_id")
|
||||
expect(result).toContain("Multi-step")
|
||||
})
|
||||
|
||||
it("#given Claude model #when building #then returns empty", () => {
|
||||
//#given
|
||||
const model = "anthropic/claude-sonnet-4-6"
|
||||
|
||||
//#when
|
||||
const result = buildNonClaudePlannerSection(model)
|
||||
|
||||
//#then
|
||||
expect(result).toBe("")
|
||||
})
|
||||
|
||||
it("#given GPT model #when building #then returns plan agent section", () => {
|
||||
//#given
|
||||
const model = "openai/gpt-5.2"
|
||||
|
||||
//#when
|
||||
const result = buildNonClaudePlannerSection(model)
|
||||
|
||||
//#then
|
||||
expect(result).toContain("Plan Agent")
|
||||
expect(result).not.toBe("")
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
|
||||
@@ -277,12 +277,11 @@ Briefly announce "Consulting Oracle for [reason]" before invocation.
|
||||
|
||||
### Oracle Background Task Policy:
|
||||
|
||||
**You MUST collect Oracle results before your final answer. No exceptions.**
|
||||
**Collect Oracle results before your final answer. No exceptions.**
|
||||
|
||||
- Oracle may take several minutes. This is normal and expected.
|
||||
- When Oracle is running and you finish your own exploration/analysis, your next action is \`background_output(task_id="...")\` on Oracle — NOT delivering a final answer.
|
||||
- Oracle catches blind spots you cannot see — its value is HIGHEST when you think you don't need it.
|
||||
- **NEVER** cancel Oracle. **NEVER** use \`background_cancel(all=true)\` when Oracle is running. Cancel disposable tasks (explore, librarian) individually by taskId instead.
|
||||
- Oracle takes minutes. When done with your own work: **end your response** — wait for the \`<system-reminder>\`.
|
||||
- Do NOT poll \`background_output\` on a running Oracle. The notification will come.
|
||||
- Never cancel Oracle.
|
||||
</Oracle_Usage>`
|
||||
}
|
||||
|
||||
@@ -292,8 +291,8 @@ export function buildHardBlocksSection(): string {
|
||||
"- Commit without explicit request — **Never**",
|
||||
"- Speculate about unread code — **Never**",
|
||||
"- Leave code in broken state after failures — **Never**",
|
||||
"- `background_cancel(all=true)` when Oracle is running — **Never.** Cancel tasks individually by taskId.",
|
||||
"- Delivering final answer before collecting Oracle result — **Never.** Always `background_output` Oracle first.",
|
||||
"- `background_cancel(all=true)` — **Never.** Always cancel individually by taskId.",
|
||||
"- Delivering final answer before collecting Oracle result — **Never.**",
|
||||
]
|
||||
|
||||
return `## Hard Blocks (NEVER violate)
|
||||
@@ -308,8 +307,8 @@ export function buildAntiPatternsSection(): string {
|
||||
"- **Testing**: Deleting failing tests to \"pass\"",
|
||||
"- **Search**: Firing agents for single-line typos or obvious syntax errors",
|
||||
"- **Debugging**: Shotgun debugging, random changes",
|
||||
"- **Background Tasks**: `background_cancel(all=true)` — always cancel individually by taskId",
|
||||
"- **Oracle**: Skipping Oracle results when Oracle was launched — ALWAYS collect via `background_output`",
|
||||
"- **Background Tasks**: Polling `background_output` on running tasks — end response and wait for notification",
|
||||
"- **Oracle**: Delivering answer without collecting Oracle results",
|
||||
]
|
||||
|
||||
return `## Anti-Patterns (BLOCKING violations)
|
||||
@@ -334,6 +333,22 @@ When you need to call a tool:
|
||||
Your tool calls are processed automatically. Just invoke the tool - do not format the call yourself.`
|
||||
}
|
||||
|
||||
export function buildNonClaudePlannerSection(model: string): string {
|
||||
const isNonClaude = !model.toLowerCase().includes('claude')
|
||||
if (!isNonClaude) return ""
|
||||
|
||||
return `### Plan Agent Dependency (Non-Claude)
|
||||
|
||||
Multi-step task? **ALWAYS consult Plan Agent first.** Do NOT start implementation without a plan.
|
||||
|
||||
- Single-file fix or trivial change → proceed directly
|
||||
- Anything else (2+ steps, unclear scope, architecture) → \`task(subagent_type="plan", ...)\` FIRST
|
||||
- Use \`session_id\` to resume the same Plan Agent — ask follow-up questions aggressively
|
||||
- If ANY part of the task is ambiguous, ask Plan Agent before guessing
|
||||
|
||||
Plan Agent returns a structured work breakdown with parallel execution opportunities. Follow it.`
|
||||
}
|
||||
|
||||
export function buildDeepParallelSection(model: string, categories: AvailableCategory[]): string {
|
||||
const isNonClaude = !model.toLowerCase().includes('claude')
|
||||
const hasDeepCategory = categories.some(c => c.name === 'deep')
|
||||
@@ -342,12 +357,13 @@ export function buildDeepParallelSection(model: string, categories: AvailableCat
|
||||
|
||||
return `### Deep Parallel Delegation
|
||||
|
||||
For implementation tasks, actively decompose and delegate to \`deep\` category agents in parallel.
|
||||
Delegate EVERY independent unit to a \`deep\` agent in parallel (\`run_in_background=true\`).
|
||||
If a task decomposes into 4 independent units, spawn 4 agents simultaneously — not 1 at a time.
|
||||
|
||||
1. Break the implementation into independent work units
|
||||
2. Maximize parallel deep agents — spawn one per independent unit (\`run_in_background=true\`)
|
||||
3. Give each agent a GOAL, not step-by-step instructions — deep agents explore and solve autonomously
|
||||
4. Collect results, integrate, verify coherence`
|
||||
1. Decompose the implementation into independent work units
|
||||
2. Assign one \`deep\` agent per unit — all via \`run_in_background=true\`
|
||||
3. Give each agent a clear GOAL with success criteria, not step-by-step instructions
|
||||
4. Collect all results, integrate, verify coherence across units`
|
||||
}
|
||||
|
||||
export function buildUltraworkSection(
|
||||
|
||||
@@ -39,6 +39,136 @@ Then ACTUALLY CALL those tools using the JSON tool schema. Produce the tool_use
|
||||
</TOOL_CALL_MANDATE>`;
|
||||
}
|
||||
|
||||
export function buildGeminiToolGuide(): string {
|
||||
return `<GEMINI_TOOL_GUIDE>
|
||||
## Tool Usage Guide — WHEN and HOW to Call Each Tool
|
||||
|
||||
You have access to tools via function calling. This guide defines WHEN to call each one.
|
||||
**Violating these patterns = failed response.**
|
||||
|
||||
### Reading & Search (ALWAYS parallelizable — call multiple simultaneously)
|
||||
|
||||
| Tool | When to Call | Parallel? |
|
||||
|---|---|---|
|
||||
| \`Read\` | Before making ANY claim about file contents. Before editing any file. | � Yes — read multiple files at once |
|
||||
| \`Grep\` | Finding patterns, imports, usages across codebase. BEFORE claiming "X is used in Y". | ✅ Yes — run multiple greps at once |
|
||||
| \`Glob\` | Finding files by name/extension pattern. BEFORE claiming "file X exists". | ✅ Yes — run multiple globs at once |
|
||||
| \`AstGrepSearch\` | Finding code patterns with AST awareness (structural matches). | ✅ Yes |
|
||||
|
||||
### Code Intelligence (parallelizable on different files)
|
||||
|
||||
| Tool | When to Call | Parallel? |
|
||||
|---|---|---|
|
||||
| \`LspDiagnostics\` | **AFTER EVERY edit.** BEFORE claiming task is done. MANDATORY. | ✅ Yes — different files |
|
||||
| \`LspGotoDefinition\` | Finding where a symbol is defined. | ✅ Yes |
|
||||
| \`LspFindReferences\` | Finding all usages of a symbol across workspace. | ✅ Yes |
|
||||
| \`LspSymbols\` | Getting file outline or searching workspace symbols. | ✅ Yes |
|
||||
|
||||
### Editing (SEQUENTIAL — must Read first)
|
||||
|
||||
| Tool | When to Call | Parallel? |
|
||||
|---|---|---|
|
||||
| \`Edit\` | Modifying existing files. MUST Read file first to get LINE#ID anchors. | ❌ After Read |
|
||||
| \`Write\` | Creating NEW files only. Or full file overwrite. | ❌ Sequential |
|
||||
|
||||
### Execution & Delegation
|
||||
|
||||
| Tool | When to Call | Parallel? |
|
||||
|---|---|---|
|
||||
| \`Bash\` | Running tests, builds, git commands. | ❌ Usually sequential |
|
||||
| \`Task\` | ANY non-trivial implementation. Research via explore/librarian. | ✅ Fire multiple in background |
|
||||
|
||||
### Correct Sequences (MANDATORY — follow these exactly):
|
||||
|
||||
1. **Answer about code**: Read → (analyze) → Answer
|
||||
2. **Edit code**: Read → Edit → LspDiagnostics → Report
|
||||
3. **Find something**: Grep/Glob (parallel) → Read results → Report
|
||||
4. **Implement feature**: Task(delegate) → Verify results → Report
|
||||
5. **Debug**: Read error → Read file → Grep related → Fix → LspDiagnostics
|
||||
|
||||
### PARALLEL RULES:
|
||||
|
||||
- **Independent reads/searches**: ALWAYS call simultaneously in ONE response
|
||||
- **Dependent operations**: Call sequentially (Edit AFTER Read, LspDiagnostics AFTER Edit)
|
||||
- **Background agents**: ALWAYS \`run_in_background=true\`, continue working
|
||||
</GEMINI_TOOL_GUIDE>`;
|
||||
}
|
||||
|
||||
export function buildGeminiToolCallExamples(): string {
|
||||
return `<GEMINI_TOOL_CALL_EXAMPLES>
|
||||
## Correct Tool Calling Patterns — Follow These Examples
|
||||
|
||||
### Example 1: User asks about code → Read FIRST, then answer
|
||||
**User**: "How does the auth middleware work?"
|
||||
**CORRECT**:
|
||||
\`\`\`
|
||||
→ Call Read(filePath="/src/middleware/auth.ts")
|
||||
→ Call Read(filePath="/src/config/auth.ts") // parallel with above
|
||||
→ (After reading) Answer based on ACTUAL file contents
|
||||
\`\`\`
|
||||
**WRONG**:
|
||||
\`\`\`
|
||||
→ "The auth middleware likely validates JWT tokens by..." ← HALLUCINATION. You didn't read the file.
|
||||
\`\`\`
|
||||
|
||||
### Example 2: User asks to edit code → Read, Edit, Verify
|
||||
**User**: "Fix the type error in user.ts"
|
||||
**CORRECT**:
|
||||
\`\`\`
|
||||
→ Call Read(filePath="/src/models/user.ts")
|
||||
→ Call LspDiagnostics(filePath="/src/models/user.ts") // parallel with Read
|
||||
→ (After reading) Call Edit with LINE#ID anchors
|
||||
→ Call LspDiagnostics(filePath="/src/models/user.ts") // verify fix
|
||||
→ Report: "Fixed. Diagnostics clean."
|
||||
\`\`\`
|
||||
**WRONG**:
|
||||
\`\`\`
|
||||
→ Call Edit without reading first ← No LINE#ID anchors = WILL FAIL
|
||||
→ Skip LspDiagnostics after edit ← UNVERIFIED
|
||||
\`\`\`
|
||||
|
||||
### Example 3: User asks to find something → Search in parallel
|
||||
**User**: "Where is the database connection configured?"
|
||||
**CORRECT**:
|
||||
\`\`\`
|
||||
→ Call Grep(pattern="database|connection|pool", path="/src") // fires simultaneously
|
||||
→ Call Glob(pattern="**/*database*") // fires simultaneously
|
||||
→ Call Glob(pattern="**/*db*") // fires simultaneously
|
||||
→ (After results) Read the most relevant files
|
||||
→ Report findings with file paths
|
||||
\`\`\`
|
||||
|
||||
### Example 4: User asks to implement a feature → DELEGATE
|
||||
**User**: "Add a new /health endpoint to the API"
|
||||
**CORRECT**:
|
||||
\`\`\`
|
||||
→ Call Task(category="quick", load_skills=["typescript-programmer"], prompt="...")
|
||||
→ (After agent completes) Read changed files to verify
|
||||
→ Call LspDiagnostics on changed files
|
||||
→ Report
|
||||
\`\`\`
|
||||
**WRONG**:
|
||||
\`\`\`
|
||||
→ Write the code yourself ← YOU ARE AN ORCHESTRATOR, NOT AN IMPLEMENTER
|
||||
\`\`\`
|
||||
|
||||
### Example 5: Investigation ≠ Implementation
|
||||
**User**: "Look into why the tests are failing"
|
||||
**CORRECT**:
|
||||
\`\`\`
|
||||
→ Call Bash(command="npm test") // see actual failures
|
||||
→ Call Read on failing test files
|
||||
→ Call Read on source files under test
|
||||
→ Report: "Tests fail because X. Root cause: Y. Proposed fix: Z."
|
||||
→ STOP — wait for user to say "fix it"
|
||||
\`\`\`
|
||||
**WRONG**:
|
||||
\`\`\`
|
||||
→ Start editing source files immediately ← "look into" ≠ "fix"
|
||||
\`\`\`
|
||||
</GEMINI_TOOL_CALL_EXAMPLES>`;
|
||||
}
|
||||
|
||||
export function buildGeminiDelegationOverride(): string {
|
||||
return `<GEMINI_DELEGATION_OVERRIDE>
|
||||
## DELEGATION IS MANDATORY — YOU ARE NOT AN IMPLEMENTER
|
||||
|
||||
+28
-10
@@ -6,6 +6,8 @@ import {
|
||||
buildGeminiDelegationOverride,
|
||||
buildGeminiVerificationOverride,
|
||||
buildGeminiIntentGateEnforcement,
|
||||
buildGeminiToolGuide,
|
||||
buildGeminiToolCallExamples,
|
||||
} from "./sisyphus-gemini-overlays";
|
||||
|
||||
const MODE: AgentMode = "all";
|
||||
@@ -32,6 +34,7 @@ import {
|
||||
buildHardBlocksSection,
|
||||
buildAntiPatternsSection,
|
||||
buildDeepParallelSection,
|
||||
buildNonClaudePlannerSection,
|
||||
categorizeTools,
|
||||
} from "./dynamic-agent-prompt-builder";
|
||||
|
||||
@@ -170,6 +173,7 @@ function buildDynamicSisyphusPrompt(
|
||||
const hardBlocks = buildHardBlocksSection();
|
||||
const antiPatterns = buildAntiPatternsSection();
|
||||
const deepParallelSection = buildDeepParallelSection(model, availableCategories);
|
||||
const nonClaudePlannerSection = buildNonClaudePlannerSection(model);
|
||||
const taskManagementSection = buildTaskManagementSection(useTaskSystem);
|
||||
const todoHookNote = useTaskSystem
|
||||
? "YOUR TASK CREATION WOULD BE TRACKED BY HOOK([SYSTEM REMINDER - TASK CONTINUATION])"
|
||||
@@ -329,7 +333,7 @@ task(subagent_type="explore", run_in_background=true, load_skills=[], descriptio
|
||||
// Reference Grep (external)
|
||||
task(subagent_type="librarian", run_in_background=true, load_skills=[], description="Find JWT security docs", prompt="I'm implementing JWT auth and need current security best practices to choose token storage (httpOnly cookies vs localStorage) and set expiration policy. Find: OWASP auth guidelines, recommended token lifetimes, refresh token rotation strategies, common JWT vulnerabilities. Skip 'what is JWT' tutorials — production security guidance only.")
|
||||
task(subagent_type="librarian", run_in_background=true, load_skills=[], description="Find Express auth patterns", prompt="I'm building Express auth middleware and need production-quality patterns to structure my middleware chain. Find how established Express apps (1000+ stars) handle: middleware ordering, token refresh, role-based access control, auth error propagation. Skip basic tutorials — I need battle-tested patterns with proper error handling.")
|
||||
// Continue working immediately. Collect with background_output when needed.
|
||||
// Continue working immediately. System notifies on completion — collect with background_output then.
|
||||
|
||||
// WRONG: Sequential or blocking
|
||||
result = task(..., run_in_background=false) // Never wait synchronously for explore/librarian
|
||||
@@ -337,10 +341,10 @@ result = task(..., run_in_background=false) // Never wait synchronously for exp
|
||||
|
||||
### Background Result Collection:
|
||||
1. Launch parallel agents \u2192 receive task_ids
|
||||
2. Continue immediate work (explore, librarian results)
|
||||
3. When results needed: \`background_output(task_id="...")\`
|
||||
4. **If Oracle is running**: STOP all other output. Follow Oracle Completion Protocol in <Oracle_Usage>.
|
||||
5. Cleanup: Cancel disposable tasks (explore, librarian) individually via \`background_cancel(taskId="...")\`. Never use \`background_cancel(all=true)\`.
|
||||
2. Continue immediate work
|
||||
3. System sends \`<system-reminder>\` on each task completion — then call \`background_output(task_id="...")\`
|
||||
4. Need results not yet ready? **End your response.** The notification will trigger your next turn.
|
||||
5. Cleanup: Cancel disposable tasks individually via \`background_cancel(taskId="...")\`
|
||||
|
||||
### Search Stop Conditions
|
||||
|
||||
@@ -364,6 +368,8 @@ STOP searching when:
|
||||
|
||||
${categorySkillsGuide}
|
||||
|
||||
${nonClaudePlannerSection}
|
||||
|
||||
${deepParallelSection}
|
||||
|
||||
${delegationTable}
|
||||
@@ -477,9 +483,8 @@ If verification fails:
|
||||
3. Report: "Done. Note: found N pre-existing lint errors unrelated to my changes."
|
||||
|
||||
### Before Delivering Final Answer:
|
||||
- **If Oracle is running**: STOP. Follow Oracle Completion Protocol in <Oracle_Usage>. Do NOT deliver any answer.
|
||||
- Cancel disposable background tasks (explore, librarian) individually via \`background_cancel(taskId="...")\`.
|
||||
- **Never use \`background_cancel(all=true)\`.**
|
||||
- If Oracle is running: **end your response** and wait for the completion notification first.
|
||||
- Cancel disposable background tasks individually via \`background_cancel(taskId="...")\`.
|
||||
</Behavior_Instructions>
|
||||
|
||||
${oracleSection}
|
||||
@@ -565,12 +570,25 @@ export function createSisyphusAgent(
|
||||
: buildDynamicSisyphusPrompt(model, [], tools, skills, categories, useTaskSystem);
|
||||
|
||||
if (isGeminiModel(model)) {
|
||||
// 1. Intent gate + tool mandate — early in prompt (after intent verbalization)
|
||||
prompt = prompt.replace(
|
||||
"</intent_verbalization>",
|
||||
`</intent_verbalization>\n\n${buildGeminiIntentGateEnforcement()}\n\n${buildGeminiToolMandate()}`
|
||||
);
|
||||
prompt += "\n" + buildGeminiDelegationOverride();
|
||||
prompt += "\n" + buildGeminiVerificationOverride();
|
||||
|
||||
// 2. Tool guide + examples — after tool_usage_rules (where tools are discussed)
|
||||
prompt = prompt.replace(
|
||||
"</tool_usage_rules>",
|
||||
`</tool_usage_rules>\n\n${buildGeminiToolGuide()}\n\n${buildGeminiToolCallExamples()}`
|
||||
);
|
||||
|
||||
// 3. Delegation + verification overrides — before Constraints (NOT at prompt end)
|
||||
// Gemini suffers from lost-in-the-middle: content at prompt end gets weaker attention.
|
||||
// Placing these before <Constraints> ensures they're in a high-attention zone.
|
||||
prompt = prompt.replace(
|
||||
"<Constraints>",
|
||||
`${buildGeminiDelegationOverride()}\n\n${buildGeminiVerificationOverride()}\n\n<Constraints>`
|
||||
);
|
||||
}
|
||||
|
||||
const permission = {
|
||||
|
||||
@@ -242,14 +242,28 @@ describe("createBuiltinAgents with model overrides", () => {
|
||||
test("createBuiltinAgents excludes disabled skills from availableSkills", async () => {
|
||||
// #given
|
||||
const disabledSkills = new Set(["playwright"])
|
||||
const cacheSpy = spyOn(connectedProvidersCache, "readConnectedProvidersCache").mockReturnValue(null)
|
||||
const fetchSpy = spyOn(shared, "fetchAvailableModels").mockResolvedValue(
|
||||
new Set([
|
||||
"anthropic/claude-opus-4-6",
|
||||
"opencode/kimi-k2.5-free",
|
||||
"zai-coding-plan/glm-5",
|
||||
"opencode/big-pickle",
|
||||
])
|
||||
)
|
||||
|
||||
// #when
|
||||
const agents = await createBuiltinAgents([], {}, undefined, TEST_DEFAULT_MODEL, undefined, undefined, [], undefined, undefined, undefined, disabledSkills)
|
||||
try {
|
||||
// #when
|
||||
const agents = await createBuiltinAgents([], {}, undefined, TEST_DEFAULT_MODEL, undefined, undefined, [], undefined, undefined, undefined, disabledSkills)
|
||||
|
||||
// #then
|
||||
expect(agents.sisyphus.prompt).not.toContain("playwright")
|
||||
expect(agents.sisyphus.prompt).toContain("frontend-ui-ux")
|
||||
expect(agents.sisyphus.prompt).toContain("git-master")
|
||||
// #then
|
||||
expect(agents.sisyphus.prompt).not.toContain("playwright")
|
||||
expect(agents.sisyphus.prompt).toContain("frontend-ui-ux")
|
||||
expect(agents.sisyphus.prompt).toContain("git-master")
|
||||
} finally {
|
||||
cacheSpy.mockRestore()
|
||||
fetchSpy.mockRestore()
|
||||
}
|
||||
})
|
||||
|
||||
test("includes custom agents in orchestrator prompts when provided via config", async () => {
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
# src/cli/ — CLI: install, run, doctor, mcp-oauth
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# src/cli/config-manager/ — CLI Installation Utilities
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
|
||||
@@ -19,9 +19,6 @@ export function initConfigContext(binary: OpenCodeBinaryType, version: string |
|
||||
|
||||
export function getConfigContext(): ConfigContext {
|
||||
if (!configContext) {
|
||||
if (process.env.NODE_ENV !== "production") {
|
||||
console.warn("[config-context] getConfigContext() called before initConfigContext(); defaulting to CLI paths.")
|
||||
}
|
||||
const paths = getOpenCodeConfigPaths({ binary: "opencode", version: null })
|
||||
configContext = { binary: "opencode", version: null, paths }
|
||||
}
|
||||
|
||||
@@ -93,7 +93,7 @@ export async function checkSystem(): Promise<CheckResult> {
|
||||
issues.push({
|
||||
title: "Loaded plugin version mismatch",
|
||||
description: `Cache expects ${loadedInfo.expectedVersion} but loaded ${loadedInfo.loadedVersion}.`,
|
||||
fix: "Reinstall plugin dependencies in OpenCode cache",
|
||||
fix: `Reinstall: cd ${loadedInfo.cacheDir} && bun install`,
|
||||
severity: "warning",
|
||||
affects: ["plugin loading"],
|
||||
})
|
||||
@@ -107,7 +107,7 @@ export async function checkSystem(): Promise<CheckResult> {
|
||||
issues.push({
|
||||
title: "Loaded plugin is outdated",
|
||||
description: `Loaded ${systemInfo.loadedVersion}, latest ${latestVersion}.`,
|
||||
fix: "Update: cd ~/.config/opencode && bun update oh-my-opencode",
|
||||
fix: `Update: cd ${loadedInfo.cacheDir} && bun add oh-my-opencode@latest`,
|
||||
severity: "warning",
|
||||
affects: ["plugin features"],
|
||||
})
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# src/cli/run/ — Non-Interactive Session Launcher
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
|
||||
@@ -318,14 +318,8 @@ describe("event handling", () => {
|
||||
// given
|
||||
const ctx = createMockContext("my-session")
|
||||
const state: EventState = {
|
||||
...createEventState(),
|
||||
mainSessionIdle: true,
|
||||
mainSessionError: false,
|
||||
lastError: null,
|
||||
lastOutput: "",
|
||||
lastPartText: "",
|
||||
currentTool: null,
|
||||
hasReceivedMeaningfulWork: false,
|
||||
messageCount: 0,
|
||||
}
|
||||
|
||||
const payload: EventPayload = {
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
# src/config/ — Zod v4 Schema System
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
22 schema files composing `OhMyOpenCodeConfigSchema`. Zod v4 validation with `safeParse()`. All fields optional — omitted fields use plugin defaults.
|
||||
24 schema files composing `OhMyOpenCodeConfigSchema`. Zod v4 validation with `safeParse()`. All fields optional — omitted fields use plugin defaults.
|
||||
|
||||
## SCHEMA TREE
|
||||
|
||||
@@ -29,14 +29,18 @@ config/schema/
|
||||
├── git-master.ts # commit_footer: boolean | string
|
||||
├── browser-automation.ts # provider: playwright | agent-browser | playwright-cli
|
||||
├── background-task.ts # Concurrency limits per model/provider
|
||||
├── fallback-models.ts # FallbackModelsConfigSchema
|
||||
├── runtime-fallback.ts # RuntimeFallbackConfigSchema
|
||||
├── babysitting.ts # Unstable agent monitoring
|
||||
├── dynamic-context-pruning.ts # Context pruning settings
|
||||
├── start-work.ts # StartWorkConfigSchema (auto_commit)
|
||||
└── internal/permission.ts # AgentPermissionSchema
|
||||
|
||||
```
|
||||
|
||||
## ROOT SCHEMA FIELDS (27)
|
||||
## ROOT SCHEMA FIELDS (28)
|
||||
|
||||
`$schema`, `new_task_system_enabled`, `default_run_agent`, `disabled_mcps`, `disabled_agents`, `disabled_skills`, `disabled_hooks`, `disabled_commands`, `disabled_tools`, `hashline_edit`, `agents`, `categories`, `claude_code`, `sisyphus_agent`, `comment_checker`, `experimental`, `auto_update`, `skills`, `ralph_loop`, `background_task`, `notification`, `babysitting`, `git_master`, `browser_automation_engine`, `websearch`, `tmux`, `sisyphus`, `_migrations`
|
||||
`$schema`, `new_task_system_enabled`, `default_run_agent`, `disabled_mcps`, `disabled_agents`, `disabled_skills`, `disabled_hooks`, `disabled_commands`, `disabled_tools`, `hashline_edit`, `agents`, `categories`, `claude_code`, `sisyphus_agent`, `comment_checker`, `experimental`, `auto_update`, `skills`, `ralph_loop`, `background_task`, `notification`, `babysitting`, `git_master`, `browser_automation_engine`, `websearch`, `tmux`, `sisyphus`, `start_work`, `_migrations`
|
||||
|
||||
## AGENT OVERRIDE FIELDS (21)
|
||||
|
||||
|
||||
@@ -1,11 +1,25 @@
|
||||
export {
|
||||
OhMyOpenCodeConfigSchema,
|
||||
AgentOverrideConfigSchema,
|
||||
AgentOverridesSchema,
|
||||
CustomAgentOverridesSchema,
|
||||
McpNameSchema,
|
||||
AgentNameSchema,
|
||||
OverridableAgentNameSchema,
|
||||
HookNameSchema,
|
||||
BuiltinCommandNameSchema,
|
||||
SisyphusAgentConfigSchema,
|
||||
ExperimentalConfigSchema,
|
||||
RalphLoopConfigSchema,
|
||||
TmuxConfigSchema,
|
||||
TmuxLayoutSchema,
|
||||
} from "./schema"
|
||||
|
||||
export type {
|
||||
OhMyOpenCodeConfig,
|
||||
AgentOverrideConfig,
|
||||
AgentOverrides,
|
||||
CustomAgentOverrides,
|
||||
McpName,
|
||||
AgentName,
|
||||
HookName,
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
import { describe, expect, test } from "bun:test"
|
||||
import { createOhMyOpenCodeJsonSchema } from "../../script/build-schema-document"
|
||||
|
||||
function asRecord(value: unknown): Record<string, unknown> | undefined {
|
||||
return typeof value === "object" && value !== null ? (value as Record<string, unknown>) : undefined
|
||||
}
|
||||
|
||||
describe("schema document generation", () => {
|
||||
test("custom_agents schema allows arbitrary custom agent keys with override shape", () => {
|
||||
// given
|
||||
const schema = createOhMyOpenCodeJsonSchema()
|
||||
|
||||
// when
|
||||
const rootProperties = asRecord(schema.properties)
|
||||
const agentsSchema = asRecord(rootProperties?.agents)
|
||||
const customAgentsSchema = asRecord(rootProperties?.custom_agents)
|
||||
const customPropertyNames = asRecord(customAgentsSchema?.propertyNames)
|
||||
const customAdditionalProperties = asRecord(customAgentsSchema?.additionalProperties)
|
||||
const defs = asRecord(schema.$defs)
|
||||
const sharedAgentOverrideSchema = asRecord(defs?.agentOverrideConfig)
|
||||
const sharedAgentProperties = asRecord(sharedAgentOverrideSchema?.properties)
|
||||
|
||||
// then
|
||||
expect(agentsSchema).toBeDefined()
|
||||
expect(agentsSchema?.additionalProperties).toBeFalse()
|
||||
expect(customAgentsSchema).toBeDefined()
|
||||
expect(customPropertyNames?.pattern).toBeDefined()
|
||||
expect(customPropertyNames?.pattern).toContain("[bB][uU][iI][lL][dD]")
|
||||
expect(customPropertyNames?.pattern).toContain("[pP][lL][aA][nN]")
|
||||
expect(customAdditionalProperties).toBeDefined()
|
||||
expect(customAdditionalProperties?.$ref).toBe("#/$defs/agentOverrideConfig")
|
||||
expect(sharedAgentOverrideSchema).toBeDefined()
|
||||
expect(sharedAgentProperties?.model).toEqual({ type: "string" })
|
||||
expect(sharedAgentProperties?.temperature).toEqual(
|
||||
expect.objectContaining({ type: "number" }),
|
||||
)
|
||||
})
|
||||
})
|
||||
@@ -530,6 +530,79 @@ describe("Sisyphus-Junior agent override", () => {
|
||||
expect(result.data.agents?.momus?.category).toBe("quick")
|
||||
}
|
||||
})
|
||||
|
||||
test("schema accepts custom_agents override keys", () => {
|
||||
// given
|
||||
const config = {
|
||||
custom_agents: {
|
||||
translator: {
|
||||
model: "google/gemini-3-flash-preview",
|
||||
temperature: 0,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
// when
|
||||
const result = OhMyOpenCodeConfigSchema.safeParse(config)
|
||||
|
||||
// then
|
||||
expect(result.success).toBe(true)
|
||||
if (result.success) {
|
||||
expect(result.data.custom_agents?.translator?.model).toBe("google/gemini-3-flash-preview")
|
||||
expect(result.data.custom_agents?.translator?.temperature).toBe(0)
|
||||
}
|
||||
})
|
||||
|
||||
test("schema rejects unknown keys under agents", () => {
|
||||
// given
|
||||
const config = {
|
||||
agents: {
|
||||
sisyphuss: {
|
||||
model: "openai/gpt-5.3-codex",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
// when
|
||||
const result = OhMyOpenCodeConfigSchema.safeParse(config)
|
||||
|
||||
// then
|
||||
expect(result.success).toBe(false)
|
||||
})
|
||||
|
||||
test("schema rejects built-in agent names under custom_agents", () => {
|
||||
// given
|
||||
const config = {
|
||||
custom_agents: {
|
||||
sisyphus: {
|
||||
model: "openai/gpt-5.3-codex",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
// when
|
||||
const result = OhMyOpenCodeConfigSchema.safeParse(config)
|
||||
|
||||
// then
|
||||
expect(result.success).toBe(false)
|
||||
})
|
||||
|
||||
test("schema rejects built-in agent names under custom_agents case-insensitively", () => {
|
||||
// given
|
||||
const config = {
|
||||
custom_agents: {
|
||||
Sisyphus: {
|
||||
model: "openai/gpt-5.3-codex",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
// when
|
||||
const result = OhMyOpenCodeConfigSchema.safeParse(config)
|
||||
|
||||
// then
|
||||
expect(result.success).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
describe("BrowserAutomationProviderSchema", () => {
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { z } from "zod"
|
||||
import { FallbackModelsSchema } from "./fallback-models"
|
||||
import { OverridableAgentNameSchema } from "./agent-names"
|
||||
import { AgentPermissionSchema } from "./internal/permission"
|
||||
|
||||
export const AgentOverrideConfigSchema = z.object({
|
||||
@@ -55,7 +56,7 @@ export const AgentOverrideConfigSchema = z.object({
|
||||
.optional(),
|
||||
})
|
||||
|
||||
export const AgentOverridesSchema = z.object({
|
||||
const BuiltinAgentOverridesSchema = z.object({
|
||||
build: AgentOverrideConfigSchema.optional(),
|
||||
plan: AgentOverrideConfigSchema.optional(),
|
||||
sisyphus: AgentOverrideConfigSchema.optional(),
|
||||
@@ -72,7 +73,57 @@ export const AgentOverridesSchema = z.object({
|
||||
explore: AgentOverrideConfigSchema.optional(),
|
||||
"multimodal-looker": AgentOverrideConfigSchema.optional(),
|
||||
atlas: AgentOverrideConfigSchema.optional(),
|
||||
})
|
||||
}).strict()
|
||||
|
||||
export const AgentOverridesSchema = BuiltinAgentOverridesSchema
|
||||
|
||||
const RESERVED_CUSTOM_AGENT_NAMES = OverridableAgentNameSchema.options
|
||||
const RESERVED_CUSTOM_AGENT_NAME_SET = new Set(
|
||||
RESERVED_CUSTOM_AGENT_NAMES.map((name) => name.toLowerCase()),
|
||||
)
|
||||
function escapeRegexLiteral(value: string): string {
|
||||
return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
|
||||
}
|
||||
|
||||
function toCaseInsensitiveLiteralPattern(value: string): string {
|
||||
return value
|
||||
.split("")
|
||||
.map((char) => {
|
||||
if (/^[A-Za-z]$/.test(char)) {
|
||||
const lower = char.toLowerCase()
|
||||
const upper = char.toUpperCase()
|
||||
return `[${lower}${upper}]`
|
||||
}
|
||||
|
||||
return escapeRegexLiteral(char)
|
||||
})
|
||||
.join("")
|
||||
}
|
||||
|
||||
const RESERVED_CUSTOM_AGENT_NAME_PATTERN = new RegExp(
|
||||
`^(?!(?:${RESERVED_CUSTOM_AGENT_NAMES.map(toCaseInsensitiveLiteralPattern).join("|")})$).+`,
|
||||
)
|
||||
|
||||
export const CustomAgentOverridesSchema = z
|
||||
.record(
|
||||
z.string().regex(
|
||||
RESERVED_CUSTOM_AGENT_NAME_PATTERN,
|
||||
"custom_agents key cannot reuse built-in agent override name",
|
||||
),
|
||||
AgentOverrideConfigSchema,
|
||||
)
|
||||
.superRefine((value, ctx) => {
|
||||
for (const key of Object.keys(value)) {
|
||||
if (RESERVED_CUSTOM_AGENT_NAME_SET.has(key.toLowerCase())) {
|
||||
ctx.addIssue({
|
||||
code: z.ZodIssueCode.custom,
|
||||
path: [key],
|
||||
message: "custom_agents key cannot reuse built-in agent override name",
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
export type AgentOverrideConfig = z.infer<typeof AgentOverrideConfigSchema>
|
||||
export type AgentOverrides = z.infer<typeof AgentOverridesSchema>
|
||||
export type CustomAgentOverrides = z.infer<typeof CustomAgentOverridesSchema>
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
import { describe, expect, test } from "bun:test"
|
||||
import { ZodError } from "zod/v4"
|
||||
import { BackgroundTaskConfigSchema } from "./background-task"
|
||||
|
||||
describe("BackgroundTaskConfigSchema", () => {
|
||||
describe("syncPollTimeoutMs", () => {
|
||||
describe("#given valid syncPollTimeoutMs (120000)", () => {
|
||||
test("#when parsed #then returns correct value", () => {
|
||||
const result = BackgroundTaskConfigSchema.parse({ syncPollTimeoutMs: 120000 })
|
||||
|
||||
expect(result.syncPollTimeoutMs).toBe(120000)
|
||||
})
|
||||
})
|
||||
|
||||
describe("#given syncPollTimeoutMs below minimum (59999)", () => {
|
||||
test("#when parsed #then throws ZodError", () => {
|
||||
let thrownError: unknown
|
||||
|
||||
try {
|
||||
BackgroundTaskConfigSchema.parse({ syncPollTimeoutMs: 59999 })
|
||||
} catch (error) {
|
||||
thrownError = error
|
||||
}
|
||||
|
||||
expect(thrownError).toBeInstanceOf(ZodError)
|
||||
})
|
||||
})
|
||||
|
||||
describe("#given syncPollTimeoutMs not provided", () => {
|
||||
test("#when parsed #then field is undefined", () => {
|
||||
const result = BackgroundTaskConfigSchema.parse({})
|
||||
|
||||
expect(result.syncPollTimeoutMs).toBeUndefined()
|
||||
})
|
||||
})
|
||||
|
||||
describe('#given syncPollTimeoutMs is non-number ("abc")', () => {
|
||||
test("#when parsed #then throws ZodError", () => {
|
||||
let thrownError: unknown
|
||||
|
||||
try {
|
||||
BackgroundTaskConfigSchema.parse({ syncPollTimeoutMs: "abc" })
|
||||
} catch (error) {
|
||||
thrownError = error
|
||||
}
|
||||
|
||||
expect(thrownError).toBeInstanceOf(ZodError)
|
||||
})
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -8,6 +8,7 @@ export const BackgroundTaskConfigSchema = z.object({
|
||||
staleTimeoutMs: z.number().min(60000).optional(),
|
||||
/** Timeout for tasks that never received any progress update, falling back to startedAt (default: 600000 = 10 minutes, minimum: 60000 = 1 minute) */
|
||||
messageStalenessTimeoutMs: z.number().min(60000).optional(),
|
||||
syncPollTimeoutMs: z.number().min(60000).optional(),
|
||||
})
|
||||
|
||||
export type BackgroundTaskConfig = z.infer<typeof BackgroundTaskConfigSchema>
|
||||
|
||||
@@ -49,6 +49,7 @@ export const HookNameSchema = z.enum([
|
||||
"write-existing-file-guard",
|
||||
"anthropic-effort",
|
||||
"hashline-read-enhancer",
|
||||
"read-image-resizer",
|
||||
])
|
||||
|
||||
export type HookName = z.infer<typeof HookNameSchema>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { z } from "zod"
|
||||
import { AnyMcpNameSchema } from "../../mcp/types"
|
||||
import { BuiltinAgentNameSchema, BuiltinSkillNameSchema } from "./agent-names"
|
||||
import { AgentOverridesSchema } from "./agent-overrides"
|
||||
import { AgentOverridesSchema, CustomAgentOverridesSchema } from "./agent-overrides"
|
||||
import { BabysittingConfigSchema } from "./babysitting"
|
||||
import { BackgroundTaskConfigSchema } from "./background-task"
|
||||
import { BrowserAutomationConfigSchema } from "./browser-automation"
|
||||
@@ -18,6 +18,7 @@ import { SkillsConfigSchema } from "./skills"
|
||||
import { SisyphusConfigSchema } from "./sisyphus"
|
||||
import { SisyphusAgentConfigSchema } from "./sisyphus-agent"
|
||||
import { TmuxConfigSchema } from "./tmux"
|
||||
import { StartWorkConfigSchema } from "./start-work"
|
||||
import { WebsearchConfigSchema } from "./websearch"
|
||||
|
||||
export const OhMyOpenCodeConfigSchema = z.object({
|
||||
@@ -33,11 +34,12 @@ export const OhMyOpenCodeConfigSchema = z.object({
|
||||
disabled_commands: z.array(BuiltinCommandNameSchema).optional(),
|
||||
/** Disable specific tools by name (e.g., ["todowrite", "todoread"]) */
|
||||
disabled_tools: z.array(z.string()).optional(),
|
||||
/** Enable hashline_edit tool/hook integrations (default: true at call site) */
|
||||
/** Enable hashline_edit tool/hook integrations (default: false) */
|
||||
hashline_edit: z.boolean().optional(),
|
||||
/** Enable model fallback on API errors (default: false). Set to true to enable automatic model switching when model errors occur. */
|
||||
model_fallback: z.boolean().optional(),
|
||||
agents: AgentOverridesSchema.optional(),
|
||||
custom_agents: CustomAgentOverridesSchema.optional(),
|
||||
categories: CategoriesConfigSchema.optional(),
|
||||
claude_code: ClaudeCodeConfigSchema.optional(),
|
||||
sisyphus_agent: SisyphusAgentConfigSchema.optional(),
|
||||
@@ -60,6 +62,7 @@ export const OhMyOpenCodeConfigSchema = z.object({
|
||||
websearch: WebsearchConfigSchema.optional(),
|
||||
tmux: TmuxConfigSchema.optional(),
|
||||
sisyphus: SisyphusConfigSchema.optional(),
|
||||
start_work: StartWorkConfigSchema.optional(),
|
||||
/** Migration history to prevent re-applying migrations (e.g., model version upgrades) */
|
||||
_migrations: z.array(z.string()).optional(),
|
||||
})
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
import { z } from "zod"
|
||||
|
||||
export const StartWorkConfigSchema = z.object({
|
||||
/** Enable auto-commit after each atomic task completion (default: true) */
|
||||
auto_commit: z.boolean().default(true),
|
||||
})
|
||||
|
||||
export type StartWorkConfig = z.infer<typeof StartWorkConfigSchema>
|
||||
@@ -51,6 +51,7 @@ export function createHooks(args: {
|
||||
|
||||
const skill = createSkillHooks({
|
||||
ctx,
|
||||
pluginConfig,
|
||||
isHookEnabled,
|
||||
safeHookEnabled,
|
||||
mergedSkills,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# src/features/ — 19 Feature Modules
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
# src/features/background-agent/ — Core Orchestration Engine
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
39 files (~10k LOC). Manages async task lifecycle: launch → queue → run → poll → complete/error. Concurrency limited per model/provider (default 5). Central to multi-agent orchestration.
|
||||
30 files (~10k LOC). Manages async task lifecycle: launch → queue → run → poll → complete/error. Concurrency limited per model/provider (default 5). Central to multi-agent orchestration.
|
||||
|
||||
## TASK LIFECYCLE
|
||||
|
||||
|
||||
@@ -80,12 +80,11 @@ export interface PluginManifest {
|
||||
/**
|
||||
* Hooks configuration
|
||||
*/
|
||||
export interface HookEntry {
|
||||
type: "command" | "prompt" | "agent"
|
||||
command?: string
|
||||
prompt?: string
|
||||
agent?: string
|
||||
}
|
||||
export type HookEntry =
|
||||
| { type: "command"; command?: string }
|
||||
| { type: "prompt"; prompt?: string }
|
||||
| { type: "agent"; agent?: string }
|
||||
| { type: "http"; url: string; headers?: Record<string, string>; allowedEnvVars?: string[]; timeout?: number }
|
||||
|
||||
export interface HookMatcher {
|
||||
matcher?: string
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# src/features/claude-tasks/ — Task Schema + Storage
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
|
||||
@@ -205,6 +205,45 @@ describe("ContextCollector", () => {
|
||||
const ids = pending.entries.map((e) => e.id)
|
||||
expect(ids).toEqual(["first", "second", "third"])
|
||||
})
|
||||
|
||||
it("keeps registration order even when Date.now values are not monotonic", () => {
|
||||
// given
|
||||
const sessionID = "ses_order_non_monotonic_time"
|
||||
const originalDateNow = Date.now
|
||||
const mockedTimestamps = [300, 100, 200]
|
||||
let timestampIndex = 0
|
||||
Date.now = () => mockedTimestamps[timestampIndex++] ?? 0
|
||||
|
||||
try {
|
||||
collector.register(sessionID, {
|
||||
id: "first",
|
||||
source: "custom",
|
||||
content: "First",
|
||||
priority: "normal",
|
||||
})
|
||||
collector.register(sessionID, {
|
||||
id: "second",
|
||||
source: "custom",
|
||||
content: "Second",
|
||||
priority: "normal",
|
||||
})
|
||||
collector.register(sessionID, {
|
||||
id: "third",
|
||||
source: "custom",
|
||||
content: "Third",
|
||||
priority: "normal",
|
||||
})
|
||||
} finally {
|
||||
Date.now = originalDateNow
|
||||
}
|
||||
|
||||
// when
|
||||
const pending = collector.getPending(sessionID)
|
||||
|
||||
// then
|
||||
const ids = pending.entries.map((entry) => entry.id)
|
||||
expect(ids).toEqual(["first", "second", "third"])
|
||||
})
|
||||
})
|
||||
|
||||
describe("consume", () => {
|
||||
|
||||
@@ -14,6 +14,8 @@ const PRIORITY_ORDER: Record<ContextPriority, number> = {
|
||||
|
||||
const CONTEXT_SEPARATOR = "\n\n---\n\n"
|
||||
|
||||
let registrationCounter = 0
|
||||
|
||||
export class ContextCollector {
|
||||
private sessions: Map<string, Map<string, ContextEntry>> = new Map()
|
||||
|
||||
@@ -30,7 +32,7 @@ export class ContextCollector {
|
||||
source: options.source,
|
||||
content: options.content,
|
||||
priority: options.priority ?? "normal",
|
||||
timestamp: Date.now(),
|
||||
registrationOrder: ++registrationCounter,
|
||||
metadata: options.metadata,
|
||||
}
|
||||
|
||||
@@ -77,7 +79,7 @@ export class ContextCollector {
|
||||
return entries.sort((a, b) => {
|
||||
const priorityDiff = PRIORITY_ORDER[a.priority] - PRIORITY_ORDER[b.priority]
|
||||
if (priorityDiff !== 0) return priorityDiff
|
||||
return a.timestamp - b.timestamp
|
||||
return a.registrationOrder - b.registrationOrder
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,6 +64,51 @@ describe("createContextInjectorMessagesTransformHook", () => {
|
||||
expect(output.messages[2].parts[1].text).toBe("Second message")
|
||||
})
|
||||
|
||||
it("uses deterministic synthetic part ID across repeated transforms", async () => {
|
||||
// given
|
||||
const hook = createContextInjectorMessagesTransformHook(collector)
|
||||
const sessionID = "ses_transform_deterministic"
|
||||
const baseMessage = createMockMessage("user", "Stable message", sessionID)
|
||||
|
||||
collector.register(sessionID, {
|
||||
id: "ctx-1",
|
||||
source: "keyword-detector",
|
||||
content: "Injected context",
|
||||
})
|
||||
const firstOutput = {
|
||||
messages: [structuredClone(baseMessage)],
|
||||
}
|
||||
|
||||
// when
|
||||
await hook["experimental.chat.messages.transform"]!({}, firstOutput)
|
||||
|
||||
// then
|
||||
const firstSyntheticPart = firstOutput.messages[0].parts[0]
|
||||
expect(
|
||||
"synthetic" in firstSyntheticPart && firstSyntheticPart.synthetic === true
|
||||
).toBe(true)
|
||||
|
||||
// given
|
||||
collector.register(sessionID, {
|
||||
id: "ctx-2",
|
||||
source: "keyword-detector",
|
||||
content: "Injected context",
|
||||
})
|
||||
const secondOutput = {
|
||||
messages: [structuredClone(baseMessage)],
|
||||
}
|
||||
|
||||
// when
|
||||
await hook["experimental.chat.messages.transform"]!({}, secondOutput)
|
||||
|
||||
// then
|
||||
const secondSyntheticPart = secondOutput.messages[0].parts[0]
|
||||
expect(
|
||||
"synthetic" in secondSyntheticPart && secondSyntheticPart.synthetic === true
|
||||
).toBe(true)
|
||||
expect(secondSyntheticPart.id).toBe(firstSyntheticPart.id)
|
||||
})
|
||||
|
||||
it("does nothing when no pending context", async () => {
|
||||
// given
|
||||
const hook = createContextInjectorMessagesTransformHook(collector)
|
||||
|
||||
@@ -148,7 +148,7 @@ export function createContextInjectorMessagesTransformHook(
|
||||
|
||||
// synthetic part pattern (minimal fields)
|
||||
const syntheticPart = {
|
||||
id: `synthetic_hook_${Date.now()}`,
|
||||
id: `synthetic_hook_${sessionID}`,
|
||||
messageID: lastUserMessage.info.id,
|
||||
sessionID: (lastUserMessage.info as { sessionID?: string }).sessionID ?? "",
|
||||
type: "text" as const,
|
||||
|
||||
@@ -27,8 +27,8 @@ export interface ContextEntry {
|
||||
content: string
|
||||
/** Priority for ordering (default: normal) */
|
||||
priority: ContextPriority
|
||||
/** Timestamp when registered */
|
||||
timestamp: number
|
||||
/** Monotonic order when registered */
|
||||
registrationOrder: number
|
||||
/** Optional metadata for debugging/logging */
|
||||
metadata?: Record<string, unknown>
|
||||
}
|
||||
|
||||
@@ -4,6 +4,8 @@ import {
|
||||
findFirstMessageWithAgent,
|
||||
findNearestMessageWithFieldsFromSDK,
|
||||
findFirstMessageWithAgentFromSDK,
|
||||
generateMessageId,
|
||||
generatePartId,
|
||||
injectHookMessage,
|
||||
} from "./injector"
|
||||
import { isSqliteBackend, resetSqliteBackendCache } from "../../shared/opencode-storage-detection"
|
||||
@@ -192,6 +194,40 @@ describe("findFirstMessageWithAgentFromSDK", () => {
|
||||
})
|
||||
})
|
||||
|
||||
describe("generateMessageId", () => {
|
||||
it("returns deterministic sequential IDs with fixed format", () => {
|
||||
// given
|
||||
const format = /^msg_[0-9a-f]{8}_\d{6}$/
|
||||
|
||||
// when
|
||||
const firstId = generateMessageId()
|
||||
const secondId = generateMessageId()
|
||||
|
||||
// then
|
||||
expect(firstId).toMatch(format)
|
||||
expect(secondId).toMatch(format)
|
||||
expect(secondId.split("_")[1]).toBe(firstId.split("_")[1])
|
||||
expect(Number(secondId.split("_")[2])).toBe(Number(firstId.split("_")[2]) + 1)
|
||||
})
|
||||
})
|
||||
|
||||
describe("generatePartId", () => {
|
||||
it("returns deterministic sequential IDs with fixed format", () => {
|
||||
// given
|
||||
const format = /^prt_[0-9a-f]{8}_\d{6}$/
|
||||
|
||||
// when
|
||||
const firstId = generatePartId()
|
||||
const secondId = generatePartId()
|
||||
|
||||
// then
|
||||
expect(firstId).toMatch(format)
|
||||
expect(secondId).toMatch(format)
|
||||
expect(secondId.split("_")[1]).toBe(firstId.split("_")[1])
|
||||
expect(Number(secondId.split("_")[2])).toBe(Number(firstId.split("_")[2]) + 1)
|
||||
})
|
||||
})
|
||||
|
||||
describe("injectHookMessage", () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs"
|
||||
import { randomBytes } from "node:crypto"
|
||||
import { join } from "node:path"
|
||||
import type { PluginInput } from "@opencode-ai/plugin"
|
||||
import { MESSAGE_STORAGE, PART_STORAGE } from "./constants"
|
||||
@@ -29,6 +30,10 @@ interface SDKMessage {
|
||||
}
|
||||
}
|
||||
|
||||
const processPrefix = randomBytes(4).toString("hex")
|
||||
let messageCounter = 0
|
||||
let partCounter = 0
|
||||
|
||||
function convertSDKMessageToStoredMessage(msg: SDKMessage): StoredMessage | null {
|
||||
const info = msg.info
|
||||
if (!info) return null
|
||||
@@ -204,16 +209,12 @@ export function findFirstMessageWithAgent(messageDir: string): string | null {
|
||||
return null
|
||||
}
|
||||
|
||||
function generateMessageId(): string {
|
||||
const timestamp = Date.now().toString(16)
|
||||
const random = Math.random().toString(36).substring(2, 14)
|
||||
return `msg_${timestamp}${random}`
|
||||
export function generateMessageId(): string {
|
||||
return `msg_${processPrefix}_${String(++messageCounter).padStart(6, "0")}`
|
||||
}
|
||||
|
||||
function generatePartId(): string {
|
||||
const timestamp = Date.now().toString(16)
|
||||
const random = Math.random().toString(36).substring(2, 10)
|
||||
return `prt_${timestamp}${random}`
|
||||
export function generatePartId(): string {
|
||||
return `prt_${processPrefix}_${String(++partCounter).padStart(6, "0")}`
|
||||
}
|
||||
|
||||
function getOrCreateMessageDir(sessionID: string): string {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# src/features/mcp-oauth/ — OAuth 2.0 + PKCE + DCR for MCP Servers
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# src/features/opencode-skill-loader/ — 4-Scope Skill Discovery
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# src/features/tmux-subagent/ — Tmux Pane Management
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
|
||||
+36
-26
@@ -1,10 +1,10 @@
|
||||
# src/hooks/ — 46 Lifecycle Hooks
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
46 hooks across 39 directories + 6 standalone files. Three-tier composition: Core(37) + Continuation(7) + Skill(2). All hooks follow `createXXXHook(deps) → HookFunction` factory pattern.
|
||||
46 hooks across 45 directories + 11 standalone files. Three-tier composition: Core(37) + Continuation(7) + Skill(2). All hooks follow `createXXXHook(deps) → HookFunction` factory pattern.
|
||||
|
||||
## HOOK TIERS
|
||||
|
||||
@@ -14,38 +14,48 @@
|
||||
hooks/
|
||||
├── atlas/ # Main orchestration (757 lines)
|
||||
├── anthropic-context-window-limit-recovery/ # Auto-summarize
|
||||
├── todo-continuation-enforcer.ts # Force TODO completion
|
||||
├── ralph-loop/ # Self-referential dev loop
|
||||
├── claude-code-hooks/ # settings.json compat layer - see AGENTS.md
|
||||
├── comment-checker/ # Prevents AI slop
|
||||
├── anthropic-effort/ # Reasoning effort level adjustment
|
||||
├── anthropic-image-context/ # Image context handling for Anthropic
|
||||
├── auto-slash-command/ # Detects /command patterns
|
||||
├── rules-injector/ # Conditional rules
|
||||
├── auto-update-checker/ # Plugin update check
|
||||
├── background-notification/ # OS notification
|
||||
├── beast-mode-system/ # Beast mode system prompt injection
|
||||
├── category-skill-reminder/ # Reminds of category skills
|
||||
├── claude-code-hooks/ # settings.json compat layer
|
||||
├── comment-checker/ # Prevents AI slop
|
||||
├── compaction-context-injector/ # Injects context on compaction
|
||||
├── compaction-todo-preserver/ # Preserves todos through compaction
|
||||
├── delegate-task-retry/ # Retries failed delegations
|
||||
├── directory-agents-injector/ # Auto-injects AGENTS.md
|
||||
├── directory-readme-injector/ # Auto-injects README.md
|
||||
├── edit-error-recovery/ # Recovers from failures
|
||||
├── thinking-block-validator/ # Ensures valid <thinking>
|
||||
├── context-window-monitor.ts # Reminds of headroom
|
||||
├── session-recovery/ # Auto-recovers from crashes
|
||||
├── think-mode/ # Dynamic thinking budget
|
||||
├── keyword-detector/ # ultrawork/search/analyze modes
|
||||
├── background-notification/ # OS notification
|
||||
├── prometheus-md-only/ # Planner read-only mode
|
||||
├── agent-usage-reminder/ # Specialized agent hints
|
||||
├── auto-update-checker/ # Plugin update check
|
||||
├── tool-output-truncator.ts # Prevents context bloat
|
||||
├── compaction-context-injector/ # Injects context on compaction
|
||||
├── delegate-task-retry/ # Retries failed delegations
|
||||
├── hashline-edit-diff-enhancer/ # Enhanced diff output for hashline edits
|
||||
├── hashline-read-enhancer/ # Adds LINE#ID hashes to Read output
|
||||
├── interactive-bash-session/ # Tmux session management
|
||||
├── json-error-recovery/ # JSON parse error correction
|
||||
├── keyword-detector/ # ultrawork/search/analyze modes
|
||||
├── model-fallback/ # Provider-level model fallback
|
||||
├── no-hephaestus-non-gpt/ # Block Hephaestus from non-GPT
|
||||
├── no-sisyphus-gpt/ # Block Sisyphus from GPT
|
||||
├── non-interactive-env/ # Non-TTY environment handling
|
||||
├── start-work/ # Sisyphus work session starter
|
||||
├── task-resume-info/ # Resume info for cancelled tasks
|
||||
├── prometheus-md-only/ # Planner read-only mode
|
||||
├── question-label-truncator/ # Auto-truncates question labels
|
||||
├── category-skill-reminder/ # Reminds of category skills
|
||||
├── empty-task-response-detector.ts # Detects empty responses
|
||||
├── sisyphus-junior-notepad/ # Sisyphus Junior notepad
|
||||
├── stop-continuation-guard/ # Guards stop continuation
|
||||
├── subagent-question-blocker/ # Blocks subagent questions
|
||||
├── ralph-loop/ # Self-referential dev loop
|
||||
├── read-image-resizer/ # Resize images for context efficiency
|
||||
├── rules-injector/ # Conditional rules
|
||||
├── runtime-fallback/ # Auto-switch models on API errors
|
||||
├── session-recovery/ # Auto-recovers from crashes
|
||||
├── sisyphus-junior-notepad/ # Sisyphus Junior notepad
|
||||
├── start-work/ # Sisyphus work session starter
|
||||
├── stop-continuation-guard/ # Guards stop continuation
|
||||
├── task-reminder/ # Task system usage reminders
|
||||
├── task-resume-info/ # Resume info for cancelled tasks
|
||||
├── tasks-todowrite-disabler/ # Disable TodoWrite when task system active
|
||||
├── think-mode/ # Dynamic thinking budget
|
||||
├── thinking-block-validator/ # Ensures valid <thinking>
|
||||
├── todo-continuation-enforcer/ # Force TODO completion
|
||||
├── unstable-agent-babysitter/ # Monitor unstable agent behavior
|
||||
├── write-existing-file-guard/ # Require Read before Write
|
||||
└── index.ts # Hook aggregation + registration
|
||||
```
|
||||
|
||||
|
||||
@@ -6,6 +6,8 @@ import {
|
||||
} from "./storage";
|
||||
import { TARGET_TOOLS, AGENT_TOOLS, REMINDER_MESSAGE } from "./constants";
|
||||
import type { AgentUsageState } from "./types";
|
||||
import { getSessionAgent } from "../../features/claude-code-session-state";
|
||||
import { getAgentConfigKey } from "../../shared/agent-display-names";
|
||||
|
||||
interface ToolExecuteInput {
|
||||
tool: string;
|
||||
@@ -26,6 +28,23 @@ interface EventInput {
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Only orchestrator agents should receive usage reminders.
|
||||
* Subagents (explore, librarian, oracle, etc.) are the targets of delegation,
|
||||
* so reminding them to delegate to themselves is counterproductive.
|
||||
*/
|
||||
const ORCHESTRATOR_AGENTS = new Set([
|
||||
"sisyphus",
|
||||
"sisyphus-junior",
|
||||
"atlas",
|
||||
"hephaestus",
|
||||
"prometheus",
|
||||
]);
|
||||
|
||||
function isOrchestratorAgent(agentName: string): boolean {
|
||||
return ORCHESTRATOR_AGENTS.has(getAgentConfigKey(agentName));
|
||||
}
|
||||
|
||||
export function createAgentUsageReminderHook(_ctx: PluginInput) {
|
||||
const sessionStates = new Map<string, AgentUsageState>();
|
||||
|
||||
@@ -60,6 +79,12 @@ export function createAgentUsageReminderHook(_ctx: PluginInput) {
|
||||
output: ToolExecuteOutput,
|
||||
) => {
|
||||
const { tool, sessionID } = input;
|
||||
|
||||
const agent = getSessionAgent(sessionID);
|
||||
if (agent && !isOrchestratorAgent(agent)) {
|
||||
return;
|
||||
}
|
||||
|
||||
const toolLower = tool.toLowerCase();
|
||||
|
||||
if (AGENT_TOOLS.has(toolLower)) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# src/hooks/anthropic-context-window-limit-recovery/ — Multi-Strategy Context Recovery
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
import { log } from "../../shared"
|
||||
import { log, normalizeModelID } from "../../shared"
|
||||
|
||||
const OPUS_4_6_PATTERN = /claude-opus-4[-.]6/i
|
||||
|
||||
function normalizeModelID(modelID: string): string {
|
||||
return modelID.replace(/\.(\d+)/g, "-$1")
|
||||
}
|
||||
|
||||
function isClaudeProvider(providerID: string, modelID: string): boolean {
|
||||
if (["anthropic", "google-vertex-anthropic", "opencode"].includes(providerID)) return true
|
||||
if (providerID === "github-copilot" && modelID.toLowerCase().includes("claude")) return true
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# src/hooks/atlas/ — Master Boulder Orchestrator
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@ import type { AtlasHookOptions, SessionState } from "./types"
|
||||
export function createAtlasHook(ctx: PluginInput, options?: AtlasHookOptions) {
|
||||
const sessions = new Map<string, SessionState>()
|
||||
const pendingFilePaths = new Map<string, string>()
|
||||
const autoCommit = options?.autoCommit ?? true
|
||||
|
||||
function getState(sessionID: string): SessionState {
|
||||
let state = sessions.get(sessionID)
|
||||
@@ -20,6 +21,6 @@ export function createAtlasHook(ctx: PluginInput, options?: AtlasHookOptions) {
|
||||
return {
|
||||
handler: createAtlasEventHandler({ ctx, options, sessions, getState }),
|
||||
"tool.execute.before": createToolExecuteBeforeHandler({ ctx, pendingFilePaths }),
|
||||
"tool.execute.after": createToolExecuteAfterHandler({ ctx, pendingFilePaths }),
|
||||
"tool.execute.after": createToolExecuteAfterHandler({ ctx, pendingFilePaths, autoCommit }),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,9 +14,9 @@ import type { ToolExecuteAfterInput, ToolExecuteAfterOutput } from "./types"
|
||||
export function createToolExecuteAfterHandler(input: {
|
||||
ctx: PluginInput
|
||||
pendingFilePaths: Map<string, string>
|
||||
}): (toolInput: ToolExecuteAfterInput, toolOutput: ToolExecuteAfterOutput) => Promise<void> {
|
||||
const { ctx, pendingFilePaths } = input
|
||||
|
||||
autoCommit: boolean
|
||||
}): (toolInput: ToolExecuteAfterInput, toolOutput: ToolExecuteAfterOutput) => Promise<void> {
|
||||
const { ctx, pendingFilePaths, autoCommit } = input
|
||||
return async (toolInput, toolOutput): Promise<void> => {
|
||||
// Guard against undefined output (e.g., from /review command - see issue #1035)
|
||||
if (!toolOutput) {
|
||||
@@ -76,7 +76,7 @@ export function createToolExecuteAfterHandler(input: {
|
||||
// Preserve original subagent response - critical for debugging failed tasks
|
||||
const originalResponse = toolOutput.output
|
||||
|
||||
toolOutput.output = `
|
||||
toolOutput.output = `
|
||||
## SUBAGENT WORK COMPLETED
|
||||
|
||||
${fileChanges}
|
||||
@@ -88,9 +88,8 @@ ${fileChanges}
|
||||
${originalResponse}
|
||||
|
||||
<system-reminder>
|
||||
${buildOrchestratorReminder(boulderState.plan_name, progress, subagentSessionId)}
|
||||
${buildOrchestratorReminder(boulderState.plan_name, progress, subagentSessionId, autoCommit)}
|
||||
</system-reminder>`
|
||||
|
||||
log(`[${HOOK_NAME}] Output transformed for orchestrator mode (boulder)`, {
|
||||
plan: boulderState.plan_name,
|
||||
progress: `${progress.completed}/${progress.total}`,
|
||||
|
||||
@@ -8,6 +8,8 @@ export interface AtlasHookOptions {
|
||||
backgroundManager?: BackgroundManager
|
||||
isContinuationStopped?: (sessionID: string) => boolean
|
||||
agentOverrides?: AgentOverrides
|
||||
/** Enable auto-commit after each atomic task completion (default: true) */
|
||||
autoCommit?: boolean
|
||||
}
|
||||
|
||||
export interface ToolExecuteAfterInput {
|
||||
|
||||
@@ -14,9 +14,22 @@ task(session_id="${sessionId}", prompt="fix: [describe the specific failure]")
|
||||
export function buildOrchestratorReminder(
|
||||
planName: string,
|
||||
progress: { total: number; completed: number },
|
||||
sessionId: string
|
||||
sessionId: string,
|
||||
autoCommit: boolean = true
|
||||
): string {
|
||||
const remaining = progress.total - progress.completed
|
||||
|
||||
const commitStep = autoCommit
|
||||
? `
|
||||
**STEP 8: COMMIT ATOMIC UNIT**
|
||||
|
||||
- Stage ONLY the verified changes
|
||||
- Commit with clear message describing what was done
|
||||
`
|
||||
: ""
|
||||
|
||||
const nextStepNumber = autoCommit ? 9 : 8
|
||||
|
||||
return `
|
||||
---
|
||||
|
||||
@@ -60,13 +73,8 @@ Update the plan file \`.sisyphus/plans/${planName}.md\`:
|
||||
- Use \`Edit\` tool to modify the checkbox
|
||||
|
||||
**DO THIS BEFORE ANYTHING ELSE. Unmarked = Untracked = Lost progress.**
|
||||
|
||||
**STEP 8: COMMIT ATOMIC UNIT**
|
||||
|
||||
- Stage ONLY the verified changes
|
||||
- Commit with clear message describing what was done
|
||||
|
||||
**STEP 9: PROCEED TO NEXT TASK**
|
||||
${commitStep}
|
||||
**STEP ${nextStepNumber}: PROCEED TO NEXT TASK**
|
||||
|
||||
- Read the plan file AGAIN to identify the next \`- [ ]\` task
|
||||
- Start immediately - DO NOT STOP
|
||||
|
||||
@@ -3,7 +3,7 @@ export const HOOK_NAME = "auto-slash-command" as const
|
||||
export const AUTO_SLASH_COMMAND_TAG_OPEN = "<auto-slash-command>"
|
||||
export const AUTO_SLASH_COMMAND_TAG_CLOSE = "</auto-slash-command>"
|
||||
|
||||
export const SLASH_COMMAND_PATTERN = /^\/([a-zA-Z][\w-]*)\s*(.*)/
|
||||
export const SLASH_COMMAND_PATTERN = /^\/([a-zA-Z@][\w:@/-]*)\s*(.*)/
|
||||
|
||||
export const EXCLUDED_COMMANDS = new Set([
|
||||
"ralph-loop",
|
||||
|
||||
@@ -102,6 +102,19 @@ After`
|
||||
expect(result?.args).toBe("project")
|
||||
})
|
||||
|
||||
it("should parse namespaced marketplace commands", () => {
|
||||
// given a namespaced command
|
||||
const text = "/daplug:run-prompt build bridge"
|
||||
|
||||
// when parsing
|
||||
const result = parseSlashCommand(text)
|
||||
|
||||
// then should keep full namespaced command
|
||||
expect(result).not.toBeNull()
|
||||
expect(result?.command).toBe("daplug:run-prompt")
|
||||
expect(result?.args).toBe("build bridge")
|
||||
})
|
||||
|
||||
it("should return null for non-slash text", () => {
|
||||
// given text without slash
|
||||
const text = "regular text"
|
||||
|
||||
@@ -0,0 +1,168 @@
|
||||
import { afterEach, beforeEach, describe, expect, it } from "bun:test"
|
||||
import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from "node:fs"
|
||||
import { tmpdir } from "node:os"
|
||||
import { join } from "node:path"
|
||||
import { executeSlashCommand } from "./executor"
|
||||
|
||||
const ENV_KEYS = [
|
||||
"CLAUDE_CONFIG_DIR",
|
||||
"CLAUDE_PLUGINS_HOME",
|
||||
"CLAUDE_SETTINGS_PATH",
|
||||
"OPENCODE_CONFIG_DIR",
|
||||
] as const
|
||||
|
||||
type EnvKey = (typeof ENV_KEYS)[number]
|
||||
type EnvSnapshot = Record<EnvKey, string | undefined>
|
||||
|
||||
function writePluginFixture(baseDir: string): void {
|
||||
const claudeConfigDir = join(baseDir, "claude-config")
|
||||
const pluginsHome = join(claudeConfigDir, "plugins")
|
||||
const settingsPath = join(claudeConfigDir, "settings.json")
|
||||
const opencodeConfigDir = join(baseDir, "opencode-config")
|
||||
const pluginInstallPath = join(baseDir, "installed-plugins", "daplug")
|
||||
const pluginKey = "daplug@1.0.0"
|
||||
|
||||
mkdirSync(join(pluginInstallPath, ".claude-plugin"), { recursive: true })
|
||||
mkdirSync(join(pluginInstallPath, "commands"), { recursive: true })
|
||||
|
||||
writeFileSync(
|
||||
join(pluginInstallPath, ".claude-plugin", "plugin.json"),
|
||||
JSON.stringify({ name: "daplug", version: "1.0.0" }, null, 2),
|
||||
)
|
||||
writeFileSync(
|
||||
join(pluginInstallPath, "commands", "run-prompt.md"),
|
||||
`---
|
||||
description: Run prompt from daplug
|
||||
---
|
||||
Execute daplug prompt flow.
|
||||
`,
|
||||
)
|
||||
|
||||
mkdirSync(pluginsHome, { recursive: true })
|
||||
writeFileSync(
|
||||
join(pluginsHome, "installed_plugins.json"),
|
||||
JSON.stringify(
|
||||
{
|
||||
version: 2,
|
||||
plugins: {
|
||||
[pluginKey]: [
|
||||
{
|
||||
scope: "user",
|
||||
installPath: pluginInstallPath,
|
||||
version: "1.0.0",
|
||||
installedAt: "2026-01-01T00:00:00.000Z",
|
||||
lastUpdated: "2026-01-01T00:00:00.000Z",
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
null,
|
||||
2,
|
||||
),
|
||||
)
|
||||
|
||||
mkdirSync(claudeConfigDir, { recursive: true })
|
||||
writeFileSync(
|
||||
settingsPath,
|
||||
JSON.stringify(
|
||||
{
|
||||
enabledPlugins: {
|
||||
[pluginKey]: true,
|
||||
},
|
||||
},
|
||||
null,
|
||||
2,
|
||||
),
|
||||
)
|
||||
mkdirSync(opencodeConfigDir, { recursive: true })
|
||||
|
||||
process.env.CLAUDE_CONFIG_DIR = claudeConfigDir
|
||||
process.env.CLAUDE_PLUGINS_HOME = pluginsHome
|
||||
process.env.CLAUDE_SETTINGS_PATH = settingsPath
|
||||
process.env.OPENCODE_CONFIG_DIR = opencodeConfigDir
|
||||
}
|
||||
|
||||
describe("auto-slash command executor plugin dispatch", () => {
|
||||
let tempDir = ""
|
||||
let envSnapshot: EnvSnapshot
|
||||
|
||||
beforeEach(() => {
|
||||
tempDir = mkdtempSync(join(tmpdir(), "omo-executor-plugin-test-"))
|
||||
envSnapshot = {
|
||||
CLAUDE_CONFIG_DIR: process.env.CLAUDE_CONFIG_DIR,
|
||||
CLAUDE_PLUGINS_HOME: process.env.CLAUDE_PLUGINS_HOME,
|
||||
CLAUDE_SETTINGS_PATH: process.env.CLAUDE_SETTINGS_PATH,
|
||||
OPENCODE_CONFIG_DIR: process.env.OPENCODE_CONFIG_DIR,
|
||||
}
|
||||
writePluginFixture(tempDir)
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
for (const key of ENV_KEYS) {
|
||||
const previousValue = envSnapshot[key]
|
||||
if (previousValue === undefined) {
|
||||
delete process.env[key]
|
||||
} else {
|
||||
process.env[key] = previousValue
|
||||
}
|
||||
}
|
||||
rmSync(tempDir, { recursive: true, force: true })
|
||||
})
|
||||
|
||||
it("resolves marketplace plugin commands when plugin loading is enabled", async () => {
|
||||
const result = await executeSlashCommand(
|
||||
{
|
||||
command: "daplug:run-prompt",
|
||||
args: "ship it",
|
||||
raw: "/daplug:run-prompt ship it",
|
||||
},
|
||||
{
|
||||
skills: [],
|
||||
pluginsEnabled: true,
|
||||
},
|
||||
)
|
||||
|
||||
expect(result.success).toBe(true)
|
||||
expect(result.replacementText).toContain("# /daplug:run-prompt Command")
|
||||
expect(result.replacementText).toContain("**Scope**: plugin")
|
||||
})
|
||||
|
||||
it("excludes marketplace commands when plugins are disabled via config toggle", async () => {
|
||||
const result = await executeSlashCommand(
|
||||
{
|
||||
command: "daplug:run-prompt",
|
||||
args: "",
|
||||
raw: "/daplug:run-prompt",
|
||||
},
|
||||
{
|
||||
skills: [],
|
||||
pluginsEnabled: false,
|
||||
},
|
||||
)
|
||||
|
||||
expect(result.success).toBe(false)
|
||||
expect(result.error).toBe(
|
||||
'Command "/daplug:run-prompt" not found. Use the skill tool to list available skills and commands.',
|
||||
)
|
||||
})
|
||||
|
||||
it("returns standard not-found for unknown namespaced commands", async () => {
|
||||
const result = await executeSlashCommand(
|
||||
{
|
||||
command: "daplug:missing",
|
||||
args: "",
|
||||
raw: "/daplug:missing",
|
||||
},
|
||||
{
|
||||
skills: [],
|
||||
pluginsEnabled: true,
|
||||
},
|
||||
)
|
||||
|
||||
expect(result.success).toBe(false)
|
||||
expect(result.error).toBe(
|
||||
'Command "/daplug:missing" not found. Use the skill tool to list available skills and commands.',
|
||||
)
|
||||
expect(result.error).not.toContain("Marketplace plugin commands")
|
||||
})
|
||||
})
|
||||
@@ -12,10 +12,15 @@ import { loadBuiltinCommands } from "../../features/builtin-commands"
|
||||
import type { CommandFrontmatter } from "../../features/claude-code-command-loader/types"
|
||||
import { isMarkdownFile } from "../../shared/file-utils"
|
||||
import { discoverAllSkills, type LoadedSkill, type LazyContentLoader } from "../../features/opencode-skill-loader"
|
||||
import {
|
||||
discoverInstalledPlugins,
|
||||
loadPluginCommands,
|
||||
loadPluginSkillsAsCommands,
|
||||
} from "../../features/claude-code-plugin-loader"
|
||||
import type { ParsedSlashCommand } from "./types"
|
||||
|
||||
interface CommandScope {
|
||||
type: "user" | "project" | "opencode" | "opencode-project" | "skill" | "builtin"
|
||||
type: "user" | "project" | "opencode" | "opencode-project" | "skill" | "builtin" | "plugin"
|
||||
}
|
||||
|
||||
interface CommandMetadata {
|
||||
@@ -99,6 +104,36 @@ function skillToCommandInfo(skill: LoadedSkill): CommandInfo {
|
||||
|
||||
export interface ExecutorOptions {
|
||||
skills?: LoadedSkill[]
|
||||
pluginsEnabled?: boolean
|
||||
enabledPluginsOverride?: Record<string, boolean>
|
||||
}
|
||||
|
||||
function discoverPluginCommands(options?: ExecutorOptions): CommandInfo[] {
|
||||
if (options?.pluginsEnabled === false) {
|
||||
return []
|
||||
}
|
||||
|
||||
const { plugins } = discoverInstalledPlugins({
|
||||
enabledPluginsOverride: options?.enabledPluginsOverride,
|
||||
})
|
||||
|
||||
const pluginDefinitions = {
|
||||
...loadPluginCommands(plugins),
|
||||
...loadPluginSkillsAsCommands(plugins),
|
||||
}
|
||||
|
||||
return Object.entries(pluginDefinitions).map(([name, definition]) => ({
|
||||
name,
|
||||
metadata: {
|
||||
name,
|
||||
description: definition.description || "",
|
||||
model: definition.model,
|
||||
agent: definition.agent,
|
||||
subtask: definition.subtask,
|
||||
},
|
||||
content: definition.template,
|
||||
scope: "plugin",
|
||||
}))
|
||||
}
|
||||
|
||||
async function discoverAllCommands(options?: ExecutorOptions): Promise<CommandInfo[]> {
|
||||
@@ -128,6 +163,7 @@ async function discoverAllCommands(options?: ExecutorOptions): Promise<CommandIn
|
||||
|
||||
const skills = options?.skills ?? await discoverAllSkills()
|
||||
const skillCommands = skills.map(skillToCommandInfo)
|
||||
const pluginCommands = discoverPluginCommands(options)
|
||||
|
||||
return [
|
||||
...builtinCommands,
|
||||
@@ -136,6 +172,7 @@ async function discoverAllCommands(options?: ExecutorOptions): Promise<CommandIn
|
||||
...opencodeGlobalCommands,
|
||||
...userCommands,
|
||||
...skillCommands,
|
||||
...pluginCommands,
|
||||
]
|
||||
}
|
||||
|
||||
@@ -202,9 +239,7 @@ export async function executeSlashCommand(parsed: ParsedSlashCommand, options?:
|
||||
if (!command) {
|
||||
return {
|
||||
success: false,
|
||||
error: parsed.command.includes(":")
|
||||
? `Marketplace plugin commands like "/${parsed.command}" are not supported. Use .claude/commands/ for custom commands.`
|
||||
: `Command "/${parsed.command}" not found. Use the skill tool to list available skills and commands.`,
|
||||
error: `Command "/${parsed.command}" not found. Use the skill tool to list available skills and commands.`,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -22,11 +22,15 @@ const sessionProcessedCommandExecutions = new Set<string>()
|
||||
|
||||
export interface AutoSlashCommandHookOptions {
|
||||
skills?: LoadedSkill[]
|
||||
pluginsEnabled?: boolean
|
||||
enabledPluginsOverride?: Record<string, boolean>
|
||||
}
|
||||
|
||||
export function createAutoSlashCommandHook(options?: AutoSlashCommandHookOptions) {
|
||||
const executorOptions: ExecutorOptions = {
|
||||
skills: options?.skills,
|
||||
pluginsEnabled: options?.pluginsEnabled,
|
||||
enabledPluginsOverride: options?.enabledPluginsOverride,
|
||||
}
|
||||
|
||||
return {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# src/hooks/claude-code-hooks/ — Claude Code Compatibility
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
import { join } from "path"
|
||||
import { existsSync } from "fs"
|
||||
import { getClaudeConfigDir } from "../../shared"
|
||||
import type { ClaudeHooksConfig, HookMatcher, HookCommand } from "./types"
|
||||
import type { ClaudeHooksConfig, HookMatcher, HookAction } from "./types"
|
||||
|
||||
interface RawHookMatcher {
|
||||
matcher?: string
|
||||
pattern?: string
|
||||
hooks: HookCommand[]
|
||||
hooks: HookAction[]
|
||||
}
|
||||
|
||||
interface RawClaudeHooksConfig {
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
import type { HookAction } from "./types"
|
||||
import type { CommandResult } from "../../shared/command-executor/execute-hook-command"
|
||||
import { executeHookCommand } from "../../shared"
|
||||
import { executeHttpHook } from "./execute-http-hook"
|
||||
import { DEFAULT_CONFIG } from "./plugin-config"
|
||||
|
||||
export function getHookIdentifier(hook: HookAction): string {
|
||||
if (hook.type === "http") return hook.url
|
||||
return hook.command.split("/").pop() || hook.command
|
||||
}
|
||||
|
||||
export async function dispatchHook(
|
||||
hook: HookAction,
|
||||
stdinJson: string,
|
||||
cwd: string
|
||||
): Promise<CommandResult> {
|
||||
if (hook.type === "http") {
|
||||
return executeHttpHook(hook, stdinJson)
|
||||
}
|
||||
|
||||
return executeHookCommand(
|
||||
hook.command,
|
||||
stdinJson,
|
||||
cwd,
|
||||
{ forceZsh: DEFAULT_CONFIG.forceZsh, zshPath: DEFAULT_CONFIG.zshPath }
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,312 @@
|
||||
import { describe, it, expect, mock, beforeEach, afterEach } from "bun:test"
|
||||
import type { HookHttp } from "./types"
|
||||
|
||||
const mockFetch = mock(() =>
|
||||
Promise.resolve(new Response(JSON.stringify({}), { status: 200 }))
|
||||
)
|
||||
|
||||
const originalFetch = globalThis.fetch
|
||||
|
||||
describe("executeHttpHook", () => {
|
||||
beforeEach(() => {
|
||||
globalThis.fetch = mockFetch as unknown as typeof fetch
|
||||
mockFetch.mockReset()
|
||||
mockFetch.mockImplementation(() =>
|
||||
Promise.resolve(new Response(JSON.stringify({}), { status: 200 }))
|
||||
)
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
globalThis.fetch = originalFetch
|
||||
})
|
||||
|
||||
describe("#given a basic HTTP hook", () => {
|
||||
const hook: HookHttp = {
|
||||
type: "http",
|
||||
url: "http://localhost:8080/hooks/pre-tool-use",
|
||||
}
|
||||
const stdinData = JSON.stringify({ hook_event_name: "PreToolUse", tool_name: "Bash" })
|
||||
|
||||
it("#when executed #then sends POST request with correct body", async () => {
|
||||
const { executeHttpHook } = await import("./execute-http-hook")
|
||||
|
||||
await executeHttpHook(hook, stdinData)
|
||||
|
||||
expect(mockFetch).toHaveBeenCalledTimes(1)
|
||||
const [url, options] = mockFetch.mock.calls[0] as unknown as [string, RequestInit]
|
||||
expect(url).toBe("http://localhost:8080/hooks/pre-tool-use")
|
||||
expect(options.method).toBe("POST")
|
||||
expect(options.body).toBe(stdinData)
|
||||
})
|
||||
|
||||
it("#when executed #then sets content-type to application/json", async () => {
|
||||
const { executeHttpHook } = await import("./execute-http-hook")
|
||||
|
||||
await executeHttpHook(hook, stdinData)
|
||||
|
||||
const [, options] = mockFetch.mock.calls[0] as unknown as [string, RequestInit]
|
||||
const headers = options.headers as Record<string, string>
|
||||
expect(headers["Content-Type"]).toBe("application/json")
|
||||
})
|
||||
})
|
||||
|
||||
describe("#given an HTTP hook with headers and env var interpolation", () => {
|
||||
const originalEnv = process.env
|
||||
|
||||
beforeEach(() => {
|
||||
process.env = { ...originalEnv, MY_TOKEN: "secret-123", OTHER_VAR: "other-value" }
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
process.env = originalEnv
|
||||
})
|
||||
|
||||
it("#when allowedEnvVars includes the var #then interpolates env var in headers", async () => {
|
||||
const hook: HookHttp = {
|
||||
type: "http",
|
||||
url: "http://localhost:8080/hooks",
|
||||
headers: { Authorization: "Bearer $MY_TOKEN" },
|
||||
allowedEnvVars: ["MY_TOKEN"],
|
||||
}
|
||||
const { executeHttpHook } = await import("./execute-http-hook")
|
||||
|
||||
await executeHttpHook(hook, "{}")
|
||||
|
||||
const [, options] = mockFetch.mock.calls[0] as unknown as [string, RequestInit]
|
||||
const headers = options.headers as Record<string, string>
|
||||
expect(headers["Authorization"]).toBe("Bearer secret-123")
|
||||
})
|
||||
|
||||
it("#when env var uses ${VAR} syntax #then interpolates correctly", async () => {
|
||||
const hook: HookHttp = {
|
||||
type: "http",
|
||||
url: "http://localhost:8080/hooks",
|
||||
headers: { Authorization: "Bearer ${MY_TOKEN}" },
|
||||
allowedEnvVars: ["MY_TOKEN"],
|
||||
}
|
||||
const { executeHttpHook } = await import("./execute-http-hook")
|
||||
|
||||
await executeHttpHook(hook, "{}")
|
||||
|
||||
const [, options] = mockFetch.mock.calls[0] as unknown as [string, RequestInit]
|
||||
const headers = options.headers as Record<string, string>
|
||||
expect(headers["Authorization"]).toBe("Bearer secret-123")
|
||||
})
|
||||
|
||||
it("#when env var not in allowedEnvVars #then replaces with empty string", async () => {
|
||||
const hook: HookHttp = {
|
||||
type: "http",
|
||||
url: "http://localhost:8080/hooks",
|
||||
headers: { Authorization: "Bearer $OTHER_VAR" },
|
||||
allowedEnvVars: ["MY_TOKEN"],
|
||||
}
|
||||
const { executeHttpHook } = await import("./execute-http-hook")
|
||||
|
||||
await executeHttpHook(hook, "{}")
|
||||
|
||||
const [, options] = mockFetch.mock.calls[0] as unknown as [string, RequestInit]
|
||||
const headers = options.headers as Record<string, string>
|
||||
expect(headers["Authorization"]).toBe("Bearer ")
|
||||
})
|
||||
})
|
||||
|
||||
describe("#given an HTTP hook with timeout", () => {
|
||||
it("#when timeout specified #then passes AbortSignal with timeout", async () => {
|
||||
const hook: HookHttp = {
|
||||
type: "http",
|
||||
url: "http://localhost:8080/hooks",
|
||||
timeout: 10,
|
||||
}
|
||||
const { executeHttpHook } = await import("./execute-http-hook")
|
||||
|
||||
await executeHttpHook(hook, "{}")
|
||||
|
||||
const [, options] = mockFetch.mock.calls[0] as unknown as [string, RequestInit]
|
||||
expect(options.signal).toBeDefined()
|
||||
})
|
||||
})
|
||||
|
||||
describe("#given hook URL scheme validation", () => {
|
||||
it("#when URL uses file:// scheme #then rejects with exit code 1", async () => {
|
||||
const hook: HookHttp = { type: "http", url: "file:///etc/passwd" }
|
||||
const { executeHttpHook } = await import("./execute-http-hook")
|
||||
|
||||
const result = await executeHttpHook(hook, "{}")
|
||||
|
||||
expect(result.exitCode).toBe(1)
|
||||
expect(result.stderr).toContain('HTTP hook URL scheme "file:" is not allowed')
|
||||
expect(mockFetch).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it("#when URL uses data: scheme #then rejects with exit code 1", async () => {
|
||||
const hook: HookHttp = { type: "http", url: "data:text/plain,hello" }
|
||||
const { executeHttpHook } = await import("./execute-http-hook")
|
||||
|
||||
const result = await executeHttpHook(hook, "{}")
|
||||
|
||||
expect(result.exitCode).toBe(1)
|
||||
expect(result.stderr).toContain('HTTP hook URL scheme "data:" is not allowed')
|
||||
expect(mockFetch).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it("#when URL uses ftp:// scheme #then rejects with exit code 1", async () => {
|
||||
const hook: HookHttp = { type: "http", url: "ftp://localhost/hooks" }
|
||||
const { executeHttpHook } = await import("./execute-http-hook")
|
||||
|
||||
const result = await executeHttpHook(hook, "{}")
|
||||
|
||||
expect(result.exitCode).toBe(1)
|
||||
expect(result.stderr).toContain('HTTP hook URL scheme "ftp:" is not allowed')
|
||||
expect(mockFetch).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it("#when URL uses http:// scheme #then allows hook execution", async () => {
|
||||
const hook: HookHttp = { type: "http", url: "http://localhost:8080/hooks" }
|
||||
const { executeHttpHook } = await import("./execute-http-hook")
|
||||
|
||||
const result = await executeHttpHook(hook, "{}")
|
||||
|
||||
expect(result.exitCode).toBe(0)
|
||||
expect(mockFetch).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
|
||||
it("#when URL uses https:// scheme #then allows hook execution", async () => {
|
||||
const hook: HookHttp = { type: "http", url: "https://example.com/hooks" }
|
||||
const { executeHttpHook } = await import("./execute-http-hook")
|
||||
|
||||
const result = await executeHttpHook(hook, "{}")
|
||||
|
||||
expect(result.exitCode).toBe(0)
|
||||
expect(mockFetch).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
|
||||
it("#when URL is invalid #then rejects with exit code 1", async () => {
|
||||
const hook: HookHttp = { type: "http", url: "not-a-valid-url" }
|
||||
const { executeHttpHook } = await import("./execute-http-hook")
|
||||
|
||||
const result = await executeHttpHook(hook, "{}")
|
||||
|
||||
expect(result.exitCode).toBe(1)
|
||||
expect(result.stderr).toContain("HTTP hook URL is invalid: not-a-valid-url")
|
||||
expect(mockFetch).not.toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
|
||||
describe("#given a successful HTTP response", () => {
|
||||
it("#when response has JSON body #then returns parsed output", async () => {
|
||||
mockFetch.mockImplementation(() =>
|
||||
Promise.resolve(
|
||||
new Response(JSON.stringify({ decision: "allow", reason: "ok" }), {
|
||||
status: 200,
|
||||
headers: { "Content-Type": "application/json" },
|
||||
})
|
||||
)
|
||||
)
|
||||
const hook: HookHttp = { type: "http", url: "http://localhost:8080/hooks" }
|
||||
const { executeHttpHook } = await import("./execute-http-hook")
|
||||
|
||||
const result = await executeHttpHook(hook, "{}")
|
||||
|
||||
expect(result.exitCode).toBe(0)
|
||||
expect(result.stdout).toContain('"decision":"allow"')
|
||||
})
|
||||
})
|
||||
|
||||
describe("#given a failing HTTP response", () => {
|
||||
it("#when response status is 4xx #then returns exit code 1", async () => {
|
||||
mockFetch.mockImplementation(() =>
|
||||
Promise.resolve(new Response("Bad Request", { status: 400 }))
|
||||
)
|
||||
const hook: HookHttp = { type: "http", url: "http://localhost:8080/hooks" }
|
||||
const { executeHttpHook } = await import("./execute-http-hook")
|
||||
|
||||
const result = await executeHttpHook(hook, "{}")
|
||||
|
||||
expect(result.exitCode).toBe(1)
|
||||
expect(result.stderr).toContain("400")
|
||||
})
|
||||
|
||||
it("#when fetch throws network error #then returns exit code 1", async () => {
|
||||
mockFetch.mockImplementation(() => Promise.reject(new Error("ECONNREFUSED")))
|
||||
const hook: HookHttp = { type: "http", url: "http://localhost:8080/hooks" }
|
||||
const { executeHttpHook } = await import("./execute-http-hook")
|
||||
|
||||
const result = await executeHttpHook(hook, "{}")
|
||||
|
||||
expect(result.exitCode).toBe(1)
|
||||
expect(result.stderr).toContain("ECONNREFUSED")
|
||||
})
|
||||
})
|
||||
|
||||
describe("#given response with exit code in JSON", () => {
|
||||
it("#when JSON contains exitCode 2 #then uses that exit code", async () => {
|
||||
mockFetch.mockImplementation(() =>
|
||||
Promise.resolve(
|
||||
new Response(JSON.stringify({ exitCode: 2, stderr: "blocked" }), {
|
||||
status: 200,
|
||||
headers: { "Content-Type": "application/json" },
|
||||
})
|
||||
)
|
||||
)
|
||||
const hook: HookHttp = { type: "http", url: "http://localhost:8080/hooks" }
|
||||
const { executeHttpHook } = await import("./execute-http-hook")
|
||||
|
||||
const result = await executeHttpHook(hook, "{}")
|
||||
|
||||
expect(result.exitCode).toBe(2)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
describe("interpolateEnvVars", () => {
|
||||
const originalEnv = process.env
|
||||
|
||||
beforeEach(() => {
|
||||
process.env = { ...originalEnv, TOKEN: "abc", SECRET: "xyz" }
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
process.env = originalEnv
|
||||
})
|
||||
|
||||
it("#given $VAR syntax #when var is allowed #then interpolates", async () => {
|
||||
const { interpolateEnvVars } = await import("./execute-http-hook")
|
||||
|
||||
const result = interpolateEnvVars("Bearer $TOKEN", ["TOKEN"])
|
||||
|
||||
expect(result).toBe("Bearer abc")
|
||||
})
|
||||
|
||||
it("#given ${VAR} syntax #when var is allowed #then interpolates", async () => {
|
||||
const { interpolateEnvVars } = await import("./execute-http-hook")
|
||||
|
||||
const result = interpolateEnvVars("Bearer ${TOKEN}", ["TOKEN"])
|
||||
|
||||
expect(result).toBe("Bearer abc")
|
||||
})
|
||||
|
||||
it("#given multiple vars #when some not allowed #then only interpolates allowed ones", async () => {
|
||||
const { interpolateEnvVars } = await import("./execute-http-hook")
|
||||
|
||||
const result = interpolateEnvVars("$TOKEN:$SECRET", ["TOKEN"])
|
||||
|
||||
expect(result).toBe("abc:")
|
||||
})
|
||||
|
||||
it("#given ${VAR} where value contains $ANOTHER #when both allowed #then does not double-interpolate", async () => {
|
||||
process.env = { ...process.env, TOKEN: "val$SECRET", SECRET: "oops" }
|
||||
const { interpolateEnvVars } = await import("./execute-http-hook")
|
||||
|
||||
const result = interpolateEnvVars("Bearer ${TOKEN}", ["TOKEN", "SECRET"])
|
||||
|
||||
expect(result).toBe("Bearer val$SECRET")
|
||||
})
|
||||
|
||||
it("#given no allowedEnvVars #when called #then replaces all with empty", async () => {
|
||||
const { interpolateEnvVars } = await import("./execute-http-hook")
|
||||
|
||||
const result = interpolateEnvVars("Bearer $TOKEN", [])
|
||||
|
||||
expect(result).toBe("Bearer ")
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,92 @@
|
||||
import type { HookHttp } from "./types"
|
||||
import type { CommandResult } from "../../shared/command-executor/execute-hook-command"
|
||||
|
||||
const DEFAULT_HTTP_HOOK_TIMEOUT_S = 30
|
||||
const ALLOWED_SCHEMES = new Set(["http:", "https:"])
|
||||
|
||||
export function interpolateEnvVars(
|
||||
value: string,
|
||||
allowedEnvVars: string[]
|
||||
): string {
|
||||
const allowedSet = new Set(allowedEnvVars)
|
||||
|
||||
return value.replace(/\$\{(\w+)\}|\$(\w+)/g, (_match, bracedVar: string | undefined, bareVar: string | undefined) => {
|
||||
const varName = (bracedVar ?? bareVar) as string
|
||||
if (allowedSet.has(varName)) {
|
||||
return process.env[varName] ?? ""
|
||||
}
|
||||
return ""
|
||||
})
|
||||
}
|
||||
|
||||
function resolveHeaders(
|
||||
hook: HookHttp
|
||||
): Record<string, string> {
|
||||
const headers: Record<string, string> = {
|
||||
"Content-Type": "application/json",
|
||||
}
|
||||
|
||||
if (!hook.headers) return headers
|
||||
|
||||
const allowedEnvVars = hook.allowedEnvVars ?? []
|
||||
for (const [key, value] of Object.entries(hook.headers)) {
|
||||
headers[key] = interpolateEnvVars(value, allowedEnvVars)
|
||||
}
|
||||
|
||||
return headers
|
||||
}
|
||||
|
||||
export async function executeHttpHook(
|
||||
hook: HookHttp,
|
||||
stdin: string
|
||||
): Promise<CommandResult> {
|
||||
try {
|
||||
const parsed = new URL(hook.url)
|
||||
if (!ALLOWED_SCHEMES.has(parsed.protocol)) {
|
||||
return {
|
||||
exitCode: 1,
|
||||
stderr: `HTTP hook URL scheme "${parsed.protocol}" is not allowed. Only http: and https: are permitted.`,
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
return { exitCode: 1, stderr: `HTTP hook URL is invalid: ${hook.url}` }
|
||||
}
|
||||
|
||||
const timeoutS = hook.timeout ?? DEFAULT_HTTP_HOOK_TIMEOUT_S
|
||||
const headers = resolveHeaders(hook)
|
||||
|
||||
try {
|
||||
const response = await fetch(hook.url, {
|
||||
method: "POST",
|
||||
headers,
|
||||
body: stdin,
|
||||
signal: AbortSignal.timeout(timeoutS * 1000),
|
||||
})
|
||||
|
||||
if (!response.ok) {
|
||||
return {
|
||||
exitCode: 1,
|
||||
stderr: `HTTP hook returned status ${response.status}: ${response.statusText}`,
|
||||
stdout: await response.text().catch(() => ""),
|
||||
}
|
||||
}
|
||||
|
||||
const body = await response.text()
|
||||
if (!body) {
|
||||
return { exitCode: 0, stdout: "", stderr: "" }
|
||||
}
|
||||
|
||||
try {
|
||||
const parsed = JSON.parse(body) as { exitCode?: number }
|
||||
if (typeof parsed.exitCode === "number") {
|
||||
return { exitCode: parsed.exitCode, stdout: body, stderr: "" }
|
||||
}
|
||||
} catch {
|
||||
}
|
||||
|
||||
return { exitCode: 0, stdout: body, stderr: "" }
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : String(error)
|
||||
return { exitCode: 1, stderr: `HTTP hook error: ${message}` }
|
||||
}
|
||||
}
|
||||
@@ -3,8 +3,8 @@ import type {
|
||||
PostToolUseOutput,
|
||||
ClaudeHooksConfig,
|
||||
} from "./types"
|
||||
import { findMatchingHooks, executeHookCommand, objectToSnakeCase, transformToolName, log } from "../../shared"
|
||||
import { DEFAULT_CONFIG } from "./plugin-config"
|
||||
import { findMatchingHooks, objectToSnakeCase, transformToolName, log } from "../../shared"
|
||||
import { dispatchHook, getHookIdentifier } from "./dispatch-hook"
|
||||
import { buildTranscriptFromSession, deleteTempTranscript } from "./transcript"
|
||||
import { isHookCommandDisabled, type PluginExtendedConfig } from "./config-loader"
|
||||
|
||||
@@ -94,22 +94,17 @@ export async function executePostToolUseHooks(
|
||||
for (const matcher of matchers) {
|
||||
if (!matcher.hooks || matcher.hooks.length === 0) continue
|
||||
for (const hook of matcher.hooks) {
|
||||
if (hook.type !== "command") continue
|
||||
if (hook.type !== "command" && hook.type !== "http") continue
|
||||
|
||||
if (isHookCommandDisabled("PostToolUse", hook.command, extendedConfig ?? null)) {
|
||||
log("PostToolUse hook command skipped (disabled by config)", { command: hook.command, toolName: ctx.toolName })
|
||||
const hookName = getHookIdentifier(hook)
|
||||
if (isHookCommandDisabled("PostToolUse", hookName, extendedConfig ?? null)) {
|
||||
log("PostToolUse hook command skipped (disabled by config)", { command: hookName, toolName: ctx.toolName })
|
||||
continue
|
||||
}
|
||||
|
||||
const hookName = hook.command.split("/").pop() || hook.command
|
||||
if (!firstHookName) firstHookName = hookName
|
||||
|
||||
const result = await executeHookCommand(
|
||||
hook.command,
|
||||
JSON.stringify(stdinData),
|
||||
ctx.cwd,
|
||||
{ forceZsh: DEFAULT_CONFIG.forceZsh, zshPath: DEFAULT_CONFIG.zshPath }
|
||||
)
|
||||
const result = await dispatchHook(hook, JSON.stringify(stdinData), ctx.cwd)
|
||||
|
||||
if (result.stdout) {
|
||||
messages.push(result.stdout)
|
||||
|
||||
@@ -3,8 +3,8 @@ import type {
|
||||
PreCompactOutput,
|
||||
ClaudeHooksConfig,
|
||||
} from "./types"
|
||||
import { findMatchingHooks, executeHookCommand, log } from "../../shared"
|
||||
import { DEFAULT_CONFIG } from "./plugin-config"
|
||||
import { findMatchingHooks, log } from "../../shared"
|
||||
import { dispatchHook, getHookIdentifier } from "./dispatch-hook"
|
||||
import { isHookCommandDisabled, type PluginExtendedConfig } from "./config-loader"
|
||||
|
||||
export interface PreCompactContext {
|
||||
@@ -50,22 +50,17 @@ export async function executePreCompactHooks(
|
||||
for (const matcher of matchers) {
|
||||
if (!matcher.hooks || matcher.hooks.length === 0) continue
|
||||
for (const hook of matcher.hooks) {
|
||||
if (hook.type !== "command") continue
|
||||
if (hook.type !== "command" && hook.type !== "http") continue
|
||||
|
||||
if (isHookCommandDisabled("PreCompact", hook.command, extendedConfig ?? null)) {
|
||||
log("PreCompact hook command skipped (disabled by config)", { command: hook.command })
|
||||
const hookName = getHookIdentifier(hook)
|
||||
if (isHookCommandDisabled("PreCompact", hookName, extendedConfig ?? null)) {
|
||||
log("PreCompact hook command skipped (disabled by config)", { command: hookName })
|
||||
continue
|
||||
}
|
||||
|
||||
const hookName = hook.command.split("/").pop() || hook.command
|
||||
if (!firstHookName) firstHookName = hookName
|
||||
|
||||
const result = await executeHookCommand(
|
||||
hook.command,
|
||||
JSON.stringify(stdinData),
|
||||
ctx.cwd,
|
||||
{ forceZsh: DEFAULT_CONFIG.forceZsh, zshPath: DEFAULT_CONFIG.zshPath }
|
||||
)
|
||||
const result = await dispatchHook(hook, JSON.stringify(stdinData), ctx.cwd)
|
||||
|
||||
if (result.exitCode === 2) {
|
||||
log("PreCompact hook blocked", { hookName, stderr: result.stderr })
|
||||
|
||||
@@ -4,8 +4,8 @@ import type {
|
||||
PermissionDecision,
|
||||
ClaudeHooksConfig,
|
||||
} from "./types"
|
||||
import { findMatchingHooks, executeHookCommand, objectToSnakeCase, transformToolName, log } from "../../shared"
|
||||
import { DEFAULT_CONFIG } from "./plugin-config"
|
||||
import { findMatchingHooks, objectToSnakeCase, transformToolName, log } from "../../shared"
|
||||
import { dispatchHook, getHookIdentifier } from "./dispatch-hook"
|
||||
import { isHookCommandDisabled, type PluginExtendedConfig } from "./config-loader"
|
||||
|
||||
export interface PreToolUseContext {
|
||||
@@ -77,22 +77,17 @@ export async function executePreToolUseHooks(
|
||||
for (const matcher of matchers) {
|
||||
if (!matcher.hooks || matcher.hooks.length === 0) continue
|
||||
for (const hook of matcher.hooks) {
|
||||
if (hook.type !== "command") continue
|
||||
if (hook.type !== "command" && hook.type !== "http") continue
|
||||
|
||||
if (isHookCommandDisabled("PreToolUse", hook.command, extendedConfig ?? null)) {
|
||||
log("PreToolUse hook command skipped (disabled by config)", { command: hook.command, toolName: ctx.toolName })
|
||||
const hookName = getHookIdentifier(hook)
|
||||
if (isHookCommandDisabled("PreToolUse", hookName, extendedConfig ?? null)) {
|
||||
log("PreToolUse hook command skipped (disabled by config)", { command: hookName, toolName: ctx.toolName })
|
||||
continue
|
||||
}
|
||||
|
||||
const hookName = hook.command.split("/").pop() || hook.command
|
||||
if (!firstHookName) firstHookName = hookName
|
||||
|
||||
const result = await executeHookCommand(
|
||||
hook.command,
|
||||
JSON.stringify(stdinData),
|
||||
ctx.cwd,
|
||||
{ forceZsh: DEFAULT_CONFIG.forceZsh, zshPath: DEFAULT_CONFIG.zshPath }
|
||||
)
|
||||
const result = await dispatchHook(hook, JSON.stringify(stdinData), ctx.cwd)
|
||||
|
||||
if (result.exitCode === 2) {
|
||||
return {
|
||||
|
||||
@@ -3,8 +3,8 @@ import type {
|
||||
StopOutput,
|
||||
ClaudeHooksConfig,
|
||||
} from "./types"
|
||||
import { findMatchingHooks, executeHookCommand, log } from "../../shared"
|
||||
import { DEFAULT_CONFIG } from "./plugin-config"
|
||||
import { findMatchingHooks, log } from "../../shared"
|
||||
import { dispatchHook, getHookIdentifier } from "./dispatch-hook"
|
||||
import { getTodoPath } from "./todo"
|
||||
import { isHookCommandDisabled, type PluginExtendedConfig } from "./config-loader"
|
||||
|
||||
@@ -68,19 +68,15 @@ export async function executeStopHooks(
|
||||
for (const matcher of matchers) {
|
||||
if (!matcher.hooks || matcher.hooks.length === 0) continue
|
||||
for (const hook of matcher.hooks) {
|
||||
if (hook.type !== "command") continue
|
||||
if (hook.type !== "command" && hook.type !== "http") continue
|
||||
|
||||
if (isHookCommandDisabled("Stop", hook.command, extendedConfig ?? null)) {
|
||||
log("Stop hook command skipped (disabled by config)", { command: hook.command })
|
||||
const hookName = getHookIdentifier(hook)
|
||||
if (isHookCommandDisabled("Stop", hookName, extendedConfig ?? null)) {
|
||||
log("Stop hook command skipped (disabled by config)", { command: hookName })
|
||||
continue
|
||||
}
|
||||
|
||||
const result = await executeHookCommand(
|
||||
hook.command,
|
||||
JSON.stringify(stdinData),
|
||||
ctx.cwd,
|
||||
{ forceZsh: DEFAULT_CONFIG.forceZsh, zshPath: DEFAULT_CONFIG.zshPath }
|
||||
)
|
||||
const result = await dispatchHook(hook, JSON.stringify(stdinData), ctx.cwd)
|
||||
|
||||
// Check exit code first - exit code 2 means block
|
||||
if (result.exitCode === 2) {
|
||||
|
||||
@@ -12,7 +12,7 @@ export type ClaudeHookEvent =
|
||||
|
||||
export interface HookMatcher {
|
||||
matcher: string
|
||||
hooks: HookCommand[]
|
||||
hooks: HookAction[]
|
||||
}
|
||||
|
||||
export interface HookCommand {
|
||||
@@ -20,6 +20,16 @@ export interface HookCommand {
|
||||
command: string
|
||||
}
|
||||
|
||||
export interface HookHttp {
|
||||
type: "http"
|
||||
url: string
|
||||
headers?: Record<string, string>
|
||||
allowedEnvVars?: string[]
|
||||
timeout?: number
|
||||
}
|
||||
|
||||
export type HookAction = HookCommand | HookHttp
|
||||
|
||||
export interface ClaudeHooksConfig {
|
||||
PreToolUse?: HookMatcher[]
|
||||
PostToolUse?: HookMatcher[]
|
||||
|
||||
@@ -3,8 +3,8 @@ import type {
|
||||
PostToolUseOutput,
|
||||
ClaudeHooksConfig,
|
||||
} from "./types"
|
||||
import { findMatchingHooks, executeHookCommand, log } from "../../shared"
|
||||
import { DEFAULT_CONFIG } from "./plugin-config"
|
||||
import { findMatchingHooks, log } from "../../shared"
|
||||
import { dispatchHook, getHookIdentifier } from "./dispatch-hook"
|
||||
import { isHookCommandDisabled, type PluginExtendedConfig } from "./config-loader"
|
||||
|
||||
const USER_PROMPT_SUBMIT_TAG_OPEN = "<user-prompt-submit-hook>"
|
||||
@@ -80,19 +80,15 @@ export async function executeUserPromptSubmitHooks(
|
||||
for (const matcher of matchers) {
|
||||
if (!matcher.hooks || matcher.hooks.length === 0) continue
|
||||
for (const hook of matcher.hooks) {
|
||||
if (hook.type !== "command") continue
|
||||
if (hook.type !== "command" && hook.type !== "http") continue
|
||||
|
||||
if (isHookCommandDisabled("UserPromptSubmit", hook.command, extendedConfig ?? null)) {
|
||||
log("UserPromptSubmit hook command skipped (disabled by config)", { command: hook.command })
|
||||
const hookName = getHookIdentifier(hook)
|
||||
if (isHookCommandDisabled("UserPromptSubmit", hookName, extendedConfig ?? null)) {
|
||||
log("UserPromptSubmit hook command skipped (disabled by config)", { command: hookName })
|
||||
continue
|
||||
}
|
||||
|
||||
const result = await executeHookCommand(
|
||||
hook.command,
|
||||
JSON.stringify(stdinData),
|
||||
ctx.cwd,
|
||||
{ forceZsh: DEFAULT_CONFIG.forceZsh, zshPath: DEFAULT_CONFIG.zshPath }
|
||||
)
|
||||
const result = await dispatchHook(hook, JSON.stringify(stdinData), ctx.cwd)
|
||||
|
||||
if (result.stdout) {
|
||||
const output = result.stdout.trim()
|
||||
|
||||
@@ -50,3 +50,4 @@ export { createRuntimeFallbackHook, type RuntimeFallbackHook, type RuntimeFallba
|
||||
export { createWriteExistingFileGuardHook } from "./write-existing-file-guard";
|
||||
export { createHashlineReadEnhancerHook } from "./hashline-read-enhancer";
|
||||
export { createJsonErrorRecoveryHook, JSON_ERROR_TOOL_EXCLUDE_LIST, JSON_ERROR_PATTERNS, JSON_ERROR_REMINDER } from "./json-error-recovery";
|
||||
export { createReadImageResizerHook } from "./read-image-resizer"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# src/hooks/keyword-detector/ — Mode Keyword Injection
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
|
||||
@@ -3,12 +3,15 @@ import { beforeEach, describe, expect, test } from "bun:test"
|
||||
import {
|
||||
clearPendingModelFallback,
|
||||
createModelFallbackHook,
|
||||
setSessionFallbackChain,
|
||||
setPendingModelFallback,
|
||||
} from "./hook"
|
||||
|
||||
describe("model fallback hook", () => {
|
||||
beforeEach(() => {
|
||||
clearPendingModelFallback("ses_model_fallback_main")
|
||||
clearPendingModelFallback("ses_model_fallback_ghcp")
|
||||
clearPendingModelFallback("ses_model_fallback_google")
|
||||
})
|
||||
|
||||
test("applies pending fallback on chat.message by overriding model", async () => {
|
||||
@@ -138,4 +141,92 @@ describe("model fallback hook", () => {
|
||||
expect(toastCalls.length).toBe(1)
|
||||
expect(toastCalls[0]?.title).toBe("Model fallback")
|
||||
})
|
||||
|
||||
test("transforms model names for github-copilot provider via fallback chain", async () => {
|
||||
//#given
|
||||
const sessionID = "ses_model_fallback_ghcp"
|
||||
clearPendingModelFallback(sessionID)
|
||||
|
||||
const hook = createModelFallbackHook() as unknown as {
|
||||
"chat.message"?: (
|
||||
input: { sessionID: string },
|
||||
output: { message: Record<string, unknown>; parts: Array<{ type: string; text?: string }> },
|
||||
) => Promise<void>
|
||||
}
|
||||
|
||||
// Set a custom fallback chain that routes through github-copilot
|
||||
setSessionFallbackChain(sessionID, [
|
||||
{ providers: ["github-copilot"], model: "claude-sonnet-4-6" },
|
||||
])
|
||||
|
||||
const set = setPendingModelFallback(
|
||||
sessionID,
|
||||
"Atlas (Plan Executor)",
|
||||
"github-copilot",
|
||||
"claude-sonnet-4-6",
|
||||
)
|
||||
expect(set).toBe(true)
|
||||
|
||||
const output = {
|
||||
message: {
|
||||
model: { providerID: "github-copilot", modelID: "claude-sonnet-4-6" },
|
||||
},
|
||||
parts: [{ type: "text", text: "continue" }],
|
||||
}
|
||||
|
||||
//#when
|
||||
await hook["chat.message"]?.({ sessionID }, output)
|
||||
|
||||
//#then — model name should be transformed from hyphen to dot notation
|
||||
expect(output.message["model"]).toEqual({
|
||||
providerID: "github-copilot",
|
||||
modelID: "claude-sonnet-4.6",
|
||||
})
|
||||
|
||||
clearPendingModelFallback(sessionID)
|
||||
})
|
||||
|
||||
test("transforms model names for google provider via fallback chain", async () => {
|
||||
//#given
|
||||
const sessionID = "ses_model_fallback_google"
|
||||
clearPendingModelFallback(sessionID)
|
||||
|
||||
const hook = createModelFallbackHook() as unknown as {
|
||||
"chat.message"?: (
|
||||
input: { sessionID: string },
|
||||
output: { message: Record<string, unknown>; parts: Array<{ type: string; text?: string }> },
|
||||
) => Promise<void>
|
||||
}
|
||||
|
||||
// Set a custom fallback chain that routes through google
|
||||
setSessionFallbackChain(sessionID, [
|
||||
{ providers: ["google"], model: "gemini-3-pro" },
|
||||
])
|
||||
|
||||
const set = setPendingModelFallback(
|
||||
sessionID,
|
||||
"Oracle",
|
||||
"google",
|
||||
"gemini-3-pro",
|
||||
)
|
||||
expect(set).toBe(true)
|
||||
|
||||
const output = {
|
||||
message: {
|
||||
model: { providerID: "google", modelID: "gemini-3-pro" },
|
||||
},
|
||||
parts: [{ type: "text", text: "continue" }],
|
||||
}
|
||||
|
||||
//#when
|
||||
await hook["chat.message"]?.({ sessionID }, output)
|
||||
|
||||
//#then — model name should be transformed from gemini-3-pro to gemini-3-pro-preview
|
||||
expect(output.message["model"]).toEqual({
|
||||
providerID: "google",
|
||||
modelID: "gemini-3-pro-preview",
|
||||
})
|
||||
|
||||
clearPendingModelFallback(sessionID)
|
||||
})
|
||||
})
|
||||
|
||||
@@ -3,6 +3,7 @@ import { getAgentConfigKey } from "../../shared/agent-display-names"
|
||||
import { AGENT_MODEL_REQUIREMENTS } from "../../shared/model-requirements"
|
||||
import { readConnectedProvidersCache, readProviderModelsCache } from "../../shared/connected-providers-cache"
|
||||
import { selectFallbackProvider } from "../../shared/model-error-classifier"
|
||||
import { transformModelForProvider } from "../../shared/provider-model-id-transform"
|
||||
import { log } from "../../shared/logger"
|
||||
import { getTaskToastManager } from "../../features/task-toast-manager"
|
||||
import type { ChatMessageInput, ChatMessageHandlerOutput } from "../../plugin/chat-message"
|
||||
@@ -145,7 +146,7 @@ export function getNextFallback(
|
||||
|
||||
return {
|
||||
providerID,
|
||||
modelID: fallback.model,
|
||||
modelID: transformModelForProvider(providerID, fallback.model),
|
||||
variant: fallback.variant,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -414,4 +414,157 @@ describe("preemptive-compaction", () => {
|
||||
restoreTimeouts()
|
||||
}
|
||||
})
|
||||
|
||||
// #given first compaction succeeded and context grew again
|
||||
// #when tool.execute.after runs after new high-token message
|
||||
// #then should trigger compaction again (re-compaction)
|
||||
it("should allow re-compaction when context grows after successful compaction", async () => {
|
||||
const hook = createPreemptiveCompactionHook(ctx as never, {} as never)
|
||||
const sessionID = "ses_recompact"
|
||||
|
||||
// given - first compaction cycle
|
||||
await hook.event({
|
||||
event: {
|
||||
type: "message.updated",
|
||||
properties: {
|
||||
info: {
|
||||
role: "assistant",
|
||||
sessionID,
|
||||
providerID: "anthropic",
|
||||
modelID: "claude-sonnet-4-6",
|
||||
finish: true,
|
||||
tokens: {
|
||||
input: 170000,
|
||||
output: 0,
|
||||
reasoning: 0,
|
||||
cache: { read: 10000, write: 0 },
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
await hook["tool.execute.after"](
|
||||
{ tool: "bash", sessionID, callID: "call_1" },
|
||||
{ title: "", output: "test", metadata: null }
|
||||
)
|
||||
|
||||
expect(ctx.client.session.summarize).toHaveBeenCalledTimes(1)
|
||||
|
||||
// when - new message with high tokens (context grew after compaction)
|
||||
await hook.event({
|
||||
event: {
|
||||
type: "message.updated",
|
||||
properties: {
|
||||
info: {
|
||||
role: "assistant",
|
||||
sessionID,
|
||||
providerID: "anthropic",
|
||||
modelID: "claude-sonnet-4-6",
|
||||
finish: true,
|
||||
tokens: {
|
||||
input: 170000,
|
||||
output: 0,
|
||||
reasoning: 0,
|
||||
cache: { read: 10000, write: 0 },
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
await hook["tool.execute.after"](
|
||||
{ tool: "bash", sessionID, callID: "call_2" },
|
||||
{ title: "", output: "test", metadata: null }
|
||||
)
|
||||
|
||||
// then - summarize should fire again
|
||||
expect(ctx.client.session.summarize).toHaveBeenCalledTimes(2)
|
||||
})
|
||||
|
||||
// #given modelContextLimitsCache has model-specific limit (256k)
|
||||
// #when tokens are above default 78% of 200k but below 78% of 256k
|
||||
// #then should NOT trigger compaction
|
||||
it("should use model-specific context limit from modelContextLimitsCache", async () => {
|
||||
const modelContextLimitsCache = new Map<string, number>()
|
||||
modelContextLimitsCache.set("opencode/kimi-k2.5-free", 262144)
|
||||
|
||||
const hook = createPreemptiveCompactionHook(ctx as never, {} as never, {
|
||||
anthropicContext1MEnabled: false,
|
||||
modelContextLimitsCache,
|
||||
})
|
||||
const sessionID = "ses_kimi_limit"
|
||||
|
||||
// 180k total tokens — above 78% of 200k (156k) but below 78% of 256k (204k)
|
||||
await hook.event({
|
||||
event: {
|
||||
type: "message.updated",
|
||||
properties: {
|
||||
info: {
|
||||
role: "assistant",
|
||||
sessionID,
|
||||
providerID: "opencode",
|
||||
modelID: "kimi-k2.5-free",
|
||||
finish: true,
|
||||
tokens: {
|
||||
input: 170000,
|
||||
output: 0,
|
||||
reasoning: 0,
|
||||
cache: { read: 10000, write: 0 },
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
await hook["tool.execute.after"](
|
||||
{ tool: "bash", sessionID, callID: "call_1" },
|
||||
{ title: "", output: "test", metadata: null }
|
||||
)
|
||||
|
||||
expect(ctx.client.session.summarize).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
// #given modelContextLimitsCache has model-specific limit (256k)
|
||||
// #when tokens exceed 78% of model-specific limit
|
||||
// #then should trigger compaction
|
||||
it("should trigger compaction at model-specific threshold", async () => {
|
||||
const modelContextLimitsCache = new Map<string, number>()
|
||||
modelContextLimitsCache.set("opencode/kimi-k2.5-free", 262144)
|
||||
|
||||
const hook = createPreemptiveCompactionHook(ctx as never, {} as never, {
|
||||
anthropicContext1MEnabled: false,
|
||||
modelContextLimitsCache,
|
||||
})
|
||||
const sessionID = "ses_kimi_trigger"
|
||||
|
||||
// 210k total — above 78% of 256k (≈204k)
|
||||
await hook.event({
|
||||
event: {
|
||||
type: "message.updated",
|
||||
properties: {
|
||||
info: {
|
||||
role: "assistant",
|
||||
sessionID,
|
||||
providerID: "opencode",
|
||||
modelID: "kimi-k2.5-free",
|
||||
finish: true,
|
||||
tokens: {
|
||||
input: 200000,
|
||||
output: 0,
|
||||
reasoning: 0,
|
||||
cache: { read: 10000, write: 0 },
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
await hook["tool.execute.after"](
|
||||
{ tool: "bash", sessionID, callID: "call_1" },
|
||||
{ title: "", output: "test", metadata: null }
|
||||
)
|
||||
|
||||
expect(ctx.client.session.summarize).toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
|
||||
@@ -7,6 +7,7 @@ const PREEMPTIVE_COMPACTION_TIMEOUT_MS = 120_000
|
||||
|
||||
type ModelCacheStateLike = {
|
||||
anthropicContext1MEnabled: boolean
|
||||
modelContextLimitsCache?: Map<string, number>
|
||||
}
|
||||
|
||||
function getAnthropicActualLimit(modelCacheState?: ModelCacheStateLike): number {
|
||||
@@ -91,10 +92,12 @@ export function createPreemptiveCompactionHook(
|
||||
const cached = tokenCache.get(sessionID)
|
||||
if (!cached) return
|
||||
|
||||
const actualLimit =
|
||||
isAnthropicProvider(cached.providerID)
|
||||
? getAnthropicActualLimit(modelCacheState)
|
||||
: DEFAULT_ACTUAL_LIMIT
|
||||
const modelSpecificLimit = !isAnthropicProvider(cached.providerID)
|
||||
? modelCacheState?.modelContextLimitsCache?.get(`${cached.providerID}/${cached.modelID}`)
|
||||
: undefined
|
||||
const actualLimit = isAnthropicProvider(cached.providerID)
|
||||
? getAnthropicActualLimit(modelCacheState)
|
||||
: modelSpecificLimit ?? DEFAULT_ACTUAL_LIMIT
|
||||
|
||||
const lastTokens = cached.tokens
|
||||
const totalInputTokens = (lastTokens?.input ?? 0) + (lastTokens?.cache?.read ?? 0)
|
||||
@@ -164,6 +167,7 @@ export function createPreemptiveCompactionHook(
|
||||
modelID: info.modelID ?? "",
|
||||
tokens: info.tokens,
|
||||
})
|
||||
compactedSessions.delete(info.sessionID)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# src/hooks/ralph-loop/ — Self-Referential Dev Loop
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
|
||||
@@ -0,0 +1,286 @@
|
||||
/// <reference types="bun-types" />
|
||||
|
||||
import { beforeEach, describe, expect, it, mock } from "bun:test"
|
||||
import type { PluginInput } from "@opencode-ai/plugin"
|
||||
|
||||
import type { ImageDimensions, ResizeResult } from "./types"
|
||||
|
||||
const mockParseImageDimensions = mock((): ImageDimensions | null => null)
|
||||
const mockCalculateTargetDimensions = mock((): ImageDimensions | null => null)
|
||||
const mockResizeImage = mock(async (): Promise<ResizeResult | null> => null)
|
||||
const mockGetSessionModel = mock((_sessionID: string) => ({
|
||||
providerID: "anthropic",
|
||||
modelID: "claude-sonnet-4-6",
|
||||
} as { providerID: string; modelID: string } | undefined))
|
||||
|
||||
mock.module("./image-dimensions", () => ({
|
||||
parseImageDimensions: mockParseImageDimensions,
|
||||
}))
|
||||
|
||||
mock.module("./image-resizer", () => ({
|
||||
calculateTargetDimensions: mockCalculateTargetDimensions,
|
||||
resizeImage: mockResizeImage,
|
||||
}))
|
||||
|
||||
mock.module("../../shared/session-model-state", () => ({
|
||||
getSessionModel: mockGetSessionModel,
|
||||
}))
|
||||
|
||||
import { createReadImageResizerHook } from "./hook"
|
||||
|
||||
type ToolOutput = {
|
||||
title: string
|
||||
output: string
|
||||
metadata: unknown
|
||||
attachments?: Array<{ mime: string; url: string; filename?: string }>
|
||||
}
|
||||
|
||||
function createMockContext(): PluginInput {
|
||||
return {
|
||||
client: {} as PluginInput["client"],
|
||||
directory: "/test",
|
||||
} as PluginInput
|
||||
}
|
||||
|
||||
function createInput(tool: string): { tool: string; sessionID: string; callID: string } {
|
||||
return {
|
||||
tool,
|
||||
sessionID: "session-1",
|
||||
callID: "call-1",
|
||||
}
|
||||
}
|
||||
|
||||
describe("createReadImageResizerHook", () => {
|
||||
beforeEach(() => {
|
||||
mockParseImageDimensions.mockReset()
|
||||
mockCalculateTargetDimensions.mockReset()
|
||||
mockResizeImage.mockReset()
|
||||
mockGetSessionModel.mockReset()
|
||||
mockGetSessionModel.mockReturnValue({ providerID: "anthropic", modelID: "claude-sonnet-4-6" })
|
||||
})
|
||||
|
||||
it("skips non-Read tools", async () => {
|
||||
//#given
|
||||
const hook = createReadImageResizerHook(createMockContext())
|
||||
const output: ToolOutput = {
|
||||
title: "Read",
|
||||
output: "original output",
|
||||
metadata: {},
|
||||
attachments: [{ mime: "image/png", url: "data:image/png;base64,old", filename: "image.png" }],
|
||||
}
|
||||
|
||||
//#when
|
||||
await hook["tool.execute.after"](createInput("Bash"), output)
|
||||
|
||||
//#then
|
||||
expect(output.output).toBe("original output")
|
||||
expect(mockParseImageDimensions).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it("skips when provider is not anthropic", async () => {
|
||||
//#given
|
||||
mockGetSessionModel.mockReturnValue({ providerID: "openai", modelID: "gpt-5.3-codex" })
|
||||
mockParseImageDimensions.mockReturnValue({ width: 3000, height: 2000 })
|
||||
mockCalculateTargetDimensions.mockReturnValue({ width: 1568, height: 1045 })
|
||||
const hook = createReadImageResizerHook(createMockContext())
|
||||
const output: ToolOutput = {
|
||||
title: "Read",
|
||||
output: "original output",
|
||||
metadata: {},
|
||||
attachments: [{ mime: "image/png", url: "data:image/png;base64,old", filename: "image.png" }],
|
||||
}
|
||||
|
||||
//#when
|
||||
await hook["tool.execute.after"](createInput("Read"), output)
|
||||
|
||||
//#then
|
||||
expect(output.output).toBe("original output")
|
||||
expect(mockParseImageDimensions).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it("skips when session model is unknown", async () => {
|
||||
//#given
|
||||
mockGetSessionModel.mockReturnValue(undefined)
|
||||
mockParseImageDimensions.mockReturnValue({ width: 3000, height: 2000 })
|
||||
const hook = createReadImageResizerHook(createMockContext())
|
||||
const output: ToolOutput = {
|
||||
title: "Read",
|
||||
output: "original output",
|
||||
metadata: {},
|
||||
attachments: [{ mime: "image/png", url: "data:image/png;base64,old", filename: "image.png" }],
|
||||
}
|
||||
|
||||
//#when
|
||||
await hook["tool.execute.after"](createInput("Read"), output)
|
||||
|
||||
//#then
|
||||
expect(output.output).toBe("original output")
|
||||
expect(mockParseImageDimensions).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it("skips Read output with no attachments", async () => {
|
||||
//#given
|
||||
const hook = createReadImageResizerHook(createMockContext())
|
||||
const output: ToolOutput = {
|
||||
title: "Read",
|
||||
output: "original output",
|
||||
metadata: {},
|
||||
}
|
||||
|
||||
//#when
|
||||
await hook["tool.execute.after"](createInput("Read"), output)
|
||||
|
||||
//#then
|
||||
expect(output.output).toBe("original output")
|
||||
expect(mockParseImageDimensions).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it("skips non-image attachments", async () => {
|
||||
//#given
|
||||
const hook = createReadImageResizerHook(createMockContext())
|
||||
const output: ToolOutput = {
|
||||
title: "Read",
|
||||
output: "original output",
|
||||
metadata: {},
|
||||
attachments: [{ mime: "application/pdf", url: "data:application/pdf;base64,AAAA", filename: "file.pdf" }],
|
||||
}
|
||||
|
||||
//#when
|
||||
await hook["tool.execute.after"](createInput("Read"), output)
|
||||
|
||||
//#then
|
||||
expect(output.output).toBe("original output")
|
||||
expect(mockParseImageDimensions).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it("skips unsupported image mime types", async () => {
|
||||
//#given
|
||||
const hook = createReadImageResizerHook(createMockContext())
|
||||
const output: ToolOutput = {
|
||||
title: "Read",
|
||||
output: "original output",
|
||||
metadata: {},
|
||||
attachments: [{ mime: "image/heic", url: "data:image/heic;base64,AAAA", filename: "photo.heic" }],
|
||||
}
|
||||
|
||||
//#when
|
||||
await hook["tool.execute.after"](createInput("Read"), output)
|
||||
|
||||
//#then
|
||||
expect(output.output).toBe("original output")
|
||||
expect(mockParseImageDimensions).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it("appends within-limits metadata when image is already valid", async () => {
|
||||
//#given
|
||||
mockParseImageDimensions.mockReturnValue({ width: 800, height: 600 })
|
||||
mockCalculateTargetDimensions.mockReturnValue(null)
|
||||
|
||||
const hook = createReadImageResizerHook(createMockContext())
|
||||
const output: ToolOutput = {
|
||||
title: "Read",
|
||||
output: "original output",
|
||||
metadata: {},
|
||||
attachments: [{ mime: "image/png", url: "data:image/png;base64,old", filename: "image.png" }],
|
||||
}
|
||||
|
||||
//#when
|
||||
await hook["tool.execute.after"](createInput("Read"), output)
|
||||
|
||||
//#then
|
||||
expect(output.output).toContain("[Image Info]")
|
||||
expect(output.output).toContain("within limits")
|
||||
expect(output.attachments?.[0]?.url).toBe("data:image/png;base64,old")
|
||||
expect(mockResizeImage).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it("replaces attachment URL and appends resize metadata for oversized image", async () => {
|
||||
//#given
|
||||
mockParseImageDimensions.mockReturnValue({ width: 3000, height: 2000 })
|
||||
mockCalculateTargetDimensions.mockReturnValue({ width: 1568, height: 1045 })
|
||||
mockResizeImage.mockResolvedValue({
|
||||
resizedDataUrl: "data:image/png;base64,resized",
|
||||
original: { width: 3000, height: 2000 },
|
||||
resized: { width: 1568, height: 1045 },
|
||||
})
|
||||
|
||||
const hook = createReadImageResizerHook(createMockContext())
|
||||
const output: ToolOutput = {
|
||||
title: "Read",
|
||||
output: "original output",
|
||||
metadata: {},
|
||||
attachments: [{ mime: "image/png", url: "data:image/png;base64,old", filename: "big.png" }],
|
||||
}
|
||||
|
||||
//#when
|
||||
await hook["tool.execute.after"](createInput("Read"), output)
|
||||
|
||||
//#then
|
||||
expect(output.attachments?.[0]?.url).toBe("data:image/png;base64,resized")
|
||||
expect(output.output).toContain("[Image Resize Info]")
|
||||
expect(output.output).toContain("resized")
|
||||
})
|
||||
|
||||
it("keeps original attachment URL and marks resize skipped when resize fails", async () => {
|
||||
//#given
|
||||
mockParseImageDimensions.mockReturnValue({ width: 3000, height: 2000 })
|
||||
mockCalculateTargetDimensions.mockReturnValue({ width: 1568, height: 1045 })
|
||||
mockResizeImage.mockResolvedValue(null)
|
||||
|
||||
const hook = createReadImageResizerHook(createMockContext())
|
||||
const output: ToolOutput = {
|
||||
title: "Read",
|
||||
output: "original output",
|
||||
metadata: {},
|
||||
attachments: [{ mime: "image/png", url: "data:image/png;base64,old", filename: "fail.png" }],
|
||||
}
|
||||
|
||||
//#when
|
||||
await hook["tool.execute.after"](createInput("Read"), output)
|
||||
|
||||
//#then
|
||||
expect(output.attachments?.[0]?.url).toBe("data:image/png;base64,old")
|
||||
expect(output.output).toContain("resize skipped")
|
||||
})
|
||||
|
||||
it("appends unknown-dimensions metadata when parsing fails", async () => {
|
||||
//#given
|
||||
mockParseImageDimensions.mockReturnValue(null)
|
||||
|
||||
const hook = createReadImageResizerHook(createMockContext())
|
||||
const output: ToolOutput = {
|
||||
title: "Read",
|
||||
output: "original output",
|
||||
metadata: {},
|
||||
attachments: [{ mime: "image/png", url: "data:image/png;base64,old", filename: "corrupt.png" }],
|
||||
}
|
||||
|
||||
//#when
|
||||
await hook["tool.execute.after"](createInput("Read"), output)
|
||||
|
||||
//#then
|
||||
expect(output.output).toContain("dimensions could not be parsed")
|
||||
expect(mockCalculateTargetDimensions).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
it("fires for lowercase read tool name", async () => {
|
||||
//#given
|
||||
mockParseImageDimensions.mockReturnValue({ width: 800, height: 600 })
|
||||
mockCalculateTargetDimensions.mockReturnValue(null)
|
||||
|
||||
const hook = createReadImageResizerHook(createMockContext())
|
||||
const output: ToolOutput = {
|
||||
title: "Read",
|
||||
output: "original output",
|
||||
metadata: {},
|
||||
attachments: [{ mime: "image/png", url: "data:image/png;base64,old", filename: "image.png" }],
|
||||
}
|
||||
|
||||
//#when
|
||||
await hook["tool.execute.after"](createInput("read"), output)
|
||||
|
||||
//#then
|
||||
expect(mockParseImageDimensions).toHaveBeenCalledTimes(1)
|
||||
expect(output.output).toContain("within limits")
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,197 @@
|
||||
import type { PluginInput } from "@opencode-ai/plugin"
|
||||
import type { ImageAttachment, ImageDimensions } from "./types"
|
||||
import { parseImageDimensions } from "./image-dimensions"
|
||||
import { calculateTargetDimensions, resizeImage } from "./image-resizer"
|
||||
import { log } from "../../shared"
|
||||
import { getSessionModel } from "../../shared/session-model-state"
|
||||
const SUPPORTED_IMAGE_MIMES = new Set(["image/png", "image/jpeg", "image/gif", "image/webp"])
|
||||
const TOKEN_DIVISOR = 750
|
||||
interface ResizeEntry {
|
||||
filename: string
|
||||
originalDims: ImageDimensions | null
|
||||
resizedDims: ImageDimensions | null
|
||||
status: "resized" | "within-limits" | "resize-skipped" | "unknown-dims"
|
||||
}
|
||||
function isReadTool(toolName: string): boolean {
|
||||
return toolName.toLowerCase() === "read"
|
||||
}
|
||||
function asRecord(value: unknown): Record<string, unknown> | null {
|
||||
if (!value || typeof value !== "object" || Array.isArray(value)) {
|
||||
return null
|
||||
}
|
||||
return value as Record<string, unknown>
|
||||
}
|
||||
function isImageAttachmentRecord(
|
||||
value: Record<string, unknown>,
|
||||
): value is Record<string, unknown> & ImageAttachment {
|
||||
const filename = value.filename
|
||||
return (
|
||||
typeof value.mime === "string" &&
|
||||
typeof value.url === "string" &&
|
||||
(typeof filename === "undefined" || typeof filename === "string")
|
||||
)
|
||||
}
|
||||
function extractImageAttachments(output: Record<string, unknown>): ImageAttachment[] {
|
||||
const attachmentsValue = output.attachments
|
||||
if (!Array.isArray(attachmentsValue)) {
|
||||
return []
|
||||
}
|
||||
const attachments: ImageAttachment[] = []
|
||||
for (const attachmentValue of attachmentsValue) {
|
||||
const attachmentRecord = asRecord(attachmentValue)
|
||||
if (!attachmentRecord) {
|
||||
continue
|
||||
}
|
||||
|
||||
const mime = attachmentRecord.mime
|
||||
const url = attachmentRecord.url
|
||||
if (typeof mime !== "string" || typeof url !== "string") {
|
||||
continue
|
||||
}
|
||||
|
||||
const normalizedMime = mime.toLowerCase()
|
||||
if (!SUPPORTED_IMAGE_MIMES.has(normalizedMime)) {
|
||||
continue
|
||||
}
|
||||
|
||||
attachmentRecord.mime = normalizedMime
|
||||
attachmentRecord.url = url
|
||||
if (isImageAttachmentRecord(attachmentRecord)) {
|
||||
attachments.push(attachmentRecord)
|
||||
}
|
||||
}
|
||||
|
||||
return attachments
|
||||
}
|
||||
function calculateTokens(width: number, height: number): number {
|
||||
return Math.ceil((width * height) / TOKEN_DIVISOR)
|
||||
}
|
||||
function formatResizeAppendix(entries: ResizeEntry[]): string {
|
||||
const header = entries.some((entry) => entry.status === "resized") ? "[Image Resize Info]" : "[Image Info]"
|
||||
const lines = [`\n\n${header}`]
|
||||
|
||||
for (const entry of entries) {
|
||||
if (entry.status === "unknown-dims" || !entry.originalDims) {
|
||||
lines.push(`- ${entry.filename}: dimensions could not be parsed`)
|
||||
continue
|
||||
}
|
||||
|
||||
const original = entry.originalDims
|
||||
const originalText = `${original.width}x${original.height}`
|
||||
const originalTokens = calculateTokens(original.width, original.height)
|
||||
|
||||
if (entry.status === "within-limits") {
|
||||
lines.push(`- ${entry.filename}: ${originalText} (within limits, tokens: ${originalTokens})`)
|
||||
continue
|
||||
}
|
||||
|
||||
if (entry.status === "resize-skipped") {
|
||||
lines.push(`- ${entry.filename}: ${originalText} (resize skipped, tokens: ${originalTokens})`)
|
||||
continue
|
||||
}
|
||||
|
||||
if (!entry.resizedDims) {
|
||||
lines.push(`- ${entry.filename}: ${originalText} (resize skipped, tokens: ${originalTokens})`)
|
||||
continue
|
||||
}
|
||||
|
||||
const resized = entry.resizedDims
|
||||
const resizedText = `${resized.width}x${resized.height}`
|
||||
const resizedTokens = calculateTokens(resized.width, resized.height)
|
||||
lines.push(
|
||||
`- ${entry.filename}: ${originalText} -> ${resizedText} (resized, tokens: ${originalTokens} -> ${resizedTokens})`,
|
||||
)
|
||||
}
|
||||
|
||||
return lines.join("\n")
|
||||
}
|
||||
function resolveFilename(attachment: ImageAttachment, index: number): string {
|
||||
if (attachment.filename && attachment.filename.trim().length > 0) {
|
||||
return attachment.filename
|
||||
}
|
||||
|
||||
return `image-${index + 1}`
|
||||
}
|
||||
export function createReadImageResizerHook(_ctx: PluginInput) {
|
||||
return {
|
||||
"tool.execute.after": async (
|
||||
input: { tool: string; sessionID: string; callID: string },
|
||||
output: { title: string; output: string; metadata: unknown },
|
||||
) => {
|
||||
if (!isReadTool(input.tool)) {
|
||||
return
|
||||
}
|
||||
|
||||
const sessionModel = getSessionModel(input.sessionID)
|
||||
if (sessionModel?.providerID !== "anthropic") {
|
||||
return
|
||||
}
|
||||
|
||||
if (typeof output.output !== "string") {
|
||||
return
|
||||
}
|
||||
|
||||
const outputRecord = output as Record<string, unknown>
|
||||
const attachments = extractImageAttachments(outputRecord)
|
||||
if (attachments.length === 0) {
|
||||
return
|
||||
}
|
||||
|
||||
const entries: ResizeEntry[] = []
|
||||
for (const [index, attachment] of attachments.entries()) {
|
||||
const filename = resolveFilename(attachment, index)
|
||||
|
||||
try {
|
||||
const originalDims = parseImageDimensions(attachment.url, attachment.mime)
|
||||
if (!originalDims) {
|
||||
entries.push({ filename, originalDims: null, resizedDims: null, status: "unknown-dims" })
|
||||
continue
|
||||
}
|
||||
|
||||
const targetDims = calculateTargetDimensions(originalDims.width, originalDims.height)
|
||||
if (!targetDims) {
|
||||
entries.push({
|
||||
filename,
|
||||
originalDims,
|
||||
resizedDims: null,
|
||||
status: "within-limits",
|
||||
})
|
||||
continue
|
||||
}
|
||||
|
||||
const resizedResult = await resizeImage(attachment.url, attachment.mime, targetDims)
|
||||
if (!resizedResult) {
|
||||
entries.push({
|
||||
filename,
|
||||
originalDims,
|
||||
resizedDims: null,
|
||||
status: "resize-skipped",
|
||||
})
|
||||
continue
|
||||
}
|
||||
|
||||
attachment.url = resizedResult.resizedDataUrl
|
||||
|
||||
entries.push({
|
||||
filename,
|
||||
originalDims: resizedResult.original,
|
||||
resizedDims: resizedResult.resized,
|
||||
status: "resized",
|
||||
})
|
||||
} catch (error) {
|
||||
log("[read-image-resizer] attachment processing failed", {
|
||||
error: error instanceof Error ? error.message : String(error),
|
||||
filename,
|
||||
})
|
||||
entries.push({ filename, originalDims: null, resizedDims: null, status: "unknown-dims" })
|
||||
}
|
||||
}
|
||||
|
||||
if (entries.length === 0) {
|
||||
return
|
||||
}
|
||||
|
||||
output.output += formatResizeAppendix(entries)
|
||||
},
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,126 @@
|
||||
/// <reference types="bun-types" />
|
||||
|
||||
import { describe, expect, it } from "bun:test"
|
||||
|
||||
import { parseImageDimensions } from "./image-dimensions"
|
||||
|
||||
const PNG_1X1_DATA_URL =
|
||||
"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg=="
|
||||
|
||||
const GIF_1X1_DATA_URL =
|
||||
"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"
|
||||
|
||||
function createPngDataUrl(width: number, height: number): string {
|
||||
const buf = Buffer.alloc(33)
|
||||
buf.set([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a], 0)
|
||||
buf.writeUInt32BE(13, 8)
|
||||
buf.set([0x49, 0x48, 0x44, 0x52], 12)
|
||||
buf.writeUInt32BE(width, 16)
|
||||
buf.writeUInt32BE(height, 20)
|
||||
return `data:image/png;base64,${buf.toString("base64")}`
|
||||
}
|
||||
|
||||
function createGifDataUrl(width: number, height: number): string {
|
||||
const buf = Buffer.alloc(10)
|
||||
buf.set([0x47, 0x49, 0x46, 0x38, 0x39, 0x61], 0)
|
||||
buf.writeUInt16LE(width, 6)
|
||||
buf.writeUInt16LE(height, 8)
|
||||
return `data:image/gif;base64,${buf.toString("base64")}`
|
||||
}
|
||||
|
||||
function createLargePngDataUrl(width: number, height: number, extraBase64Chars: number): string {
|
||||
const baseDataUrl = createPngDataUrl(width, height)
|
||||
const base64Data = baseDataUrl.slice(baseDataUrl.indexOf(",") + 1)
|
||||
const paddedBase64 = `${base64Data}${"A".repeat(extraBase64Chars)}`
|
||||
return `data:image/png;base64,${paddedBase64}`
|
||||
}
|
||||
|
||||
describe("parseImageDimensions", () => {
|
||||
it("parses PNG 1x1 dimensions", () => {
|
||||
//#given
|
||||
const dataUrl = PNG_1X1_DATA_URL
|
||||
|
||||
//#when
|
||||
const result = parseImageDimensions(dataUrl, "image/png")
|
||||
|
||||
//#then
|
||||
expect(result).toEqual({ width: 1, height: 1 })
|
||||
})
|
||||
|
||||
it("parses PNG dimensions from IHDR", () => {
|
||||
//#given
|
||||
const dataUrl = createPngDataUrl(3000, 2000)
|
||||
|
||||
//#when
|
||||
const result = parseImageDimensions(dataUrl, "image/png")
|
||||
|
||||
//#then
|
||||
expect(result).toEqual({ width: 3000, height: 2000 })
|
||||
})
|
||||
|
||||
it("parses PNG dimensions from a very large base64 payload", () => {
|
||||
//#given
|
||||
const dataUrl = createLargePngDataUrl(4096, 2160, 10 * 1024 * 1024)
|
||||
|
||||
//#when
|
||||
const result = parseImageDimensions(dataUrl, "image/png")
|
||||
|
||||
//#then
|
||||
expect(result).toEqual({ width: 4096, height: 2160 })
|
||||
})
|
||||
|
||||
it("parses GIF 1x1 dimensions", () => {
|
||||
//#given
|
||||
const dataUrl = GIF_1X1_DATA_URL
|
||||
|
||||
//#when
|
||||
const result = parseImageDimensions(dataUrl, "image/gif")
|
||||
|
||||
//#then
|
||||
expect(result).toEqual({ width: 1, height: 1 })
|
||||
})
|
||||
|
||||
it("parses GIF dimensions from logical screen descriptor", () => {
|
||||
//#given
|
||||
const dataUrl = createGifDataUrl(320, 240)
|
||||
|
||||
//#when
|
||||
const result = parseImageDimensions(dataUrl, "image/gif")
|
||||
|
||||
//#then
|
||||
expect(result).toEqual({ width: 320, height: 240 })
|
||||
})
|
||||
|
||||
it("returns null for empty input", () => {
|
||||
//#given
|
||||
const dataUrl = ""
|
||||
|
||||
//#when
|
||||
const result = parseImageDimensions(dataUrl, "image/png")
|
||||
|
||||
//#then
|
||||
expect(result).toBeNull()
|
||||
})
|
||||
|
||||
it("returns null for too-short PNG buffer", () => {
|
||||
//#given
|
||||
const dataUrl = "data:image/png;base64,AAAA"
|
||||
|
||||
//#when
|
||||
const result = parseImageDimensions(dataUrl, "image/png")
|
||||
|
||||
//#then
|
||||
expect(result).toBeNull()
|
||||
})
|
||||
|
||||
it("returns null for unsupported mime type", () => {
|
||||
//#given
|
||||
const dataUrl = PNG_1X1_DATA_URL
|
||||
|
||||
//#when
|
||||
const result = parseImageDimensions(dataUrl, "image/heic")
|
||||
|
||||
//#then
|
||||
expect(result).toBeNull()
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,191 @@
|
||||
import type { ImageDimensions } from "./types"
|
||||
|
||||
import { extractBase64Data } from "../../tools/look-at/mime-type-inference"
|
||||
|
||||
const HEADER_BYTES = 32_768
|
||||
const HEADER_BASE64_CHARS = Math.ceil(HEADER_BYTES / 3) * 4
|
||||
|
||||
function toImageDimensions(width: number, height: number): ImageDimensions | null {
|
||||
if (!Number.isFinite(width) || !Number.isFinite(height)) {
|
||||
return null
|
||||
}
|
||||
|
||||
if (width <= 0 || height <= 0) {
|
||||
return null
|
||||
}
|
||||
|
||||
return { width, height }
|
||||
}
|
||||
|
||||
function parsePngDimensions(buffer: Buffer): ImageDimensions | null {
|
||||
if (buffer.length < 24) {
|
||||
return null
|
||||
}
|
||||
|
||||
const isPngSignature =
|
||||
buffer[0] === 0x89 &&
|
||||
buffer[1] === 0x50 &&
|
||||
buffer[2] === 0x4e &&
|
||||
buffer[3] === 0x47 &&
|
||||
buffer[4] === 0x0d &&
|
||||
buffer[5] === 0x0a &&
|
||||
buffer[6] === 0x1a &&
|
||||
buffer[7] === 0x0a
|
||||
|
||||
if (!isPngSignature || buffer.toString("ascii", 12, 16) !== "IHDR") {
|
||||
return null
|
||||
}
|
||||
|
||||
const width = buffer.readUInt32BE(16)
|
||||
const height = buffer.readUInt32BE(20)
|
||||
return toImageDimensions(width, height)
|
||||
}
|
||||
|
||||
function parseGifDimensions(buffer: Buffer): ImageDimensions | null {
|
||||
if (buffer.length < 10) {
|
||||
return null
|
||||
}
|
||||
|
||||
if (buffer.toString("ascii", 0, 4) !== "GIF8") {
|
||||
return null
|
||||
}
|
||||
|
||||
const width = buffer.readUInt16LE(6)
|
||||
const height = buffer.readUInt16LE(8)
|
||||
return toImageDimensions(width, height)
|
||||
}
|
||||
|
||||
function parseJpegDimensions(buffer: Buffer): ImageDimensions | null {
|
||||
if (buffer.length < 4 || buffer[0] !== 0xff || buffer[1] !== 0xd8) {
|
||||
return null
|
||||
}
|
||||
|
||||
let offset = 2
|
||||
|
||||
while (offset < buffer.length) {
|
||||
if (buffer[offset] !== 0xff) {
|
||||
offset += 1
|
||||
continue
|
||||
}
|
||||
|
||||
while (offset < buffer.length && buffer[offset] === 0xff) {
|
||||
offset += 1
|
||||
}
|
||||
|
||||
if (offset >= buffer.length) {
|
||||
return null
|
||||
}
|
||||
|
||||
const marker = buffer[offset]
|
||||
offset += 1
|
||||
|
||||
if (marker === 0xd9 || marker === 0xda) {
|
||||
break
|
||||
}
|
||||
|
||||
if (offset + 1 >= buffer.length) {
|
||||
return null
|
||||
}
|
||||
|
||||
const segmentLength = buffer.readUInt16BE(offset)
|
||||
if (segmentLength < 2) {
|
||||
return null
|
||||
}
|
||||
|
||||
if ((marker === 0xc0 || marker === 0xc2) && offset + 7 < buffer.length) {
|
||||
const height = buffer.readUInt16BE(offset + 3)
|
||||
const width = buffer.readUInt16BE(offset + 5)
|
||||
return toImageDimensions(width, height)
|
||||
}
|
||||
|
||||
offset += segmentLength
|
||||
}
|
||||
|
||||
return null
|
||||
}
|
||||
|
||||
function readUInt24LE(buffer: Buffer, offset: number): number {
|
||||
return buffer[offset] | (buffer[offset + 1] << 8) | (buffer[offset + 2] << 16)
|
||||
}
|
||||
|
||||
function parseWebpDimensions(buffer: Buffer): ImageDimensions | null {
|
||||
if (buffer.length < 16) {
|
||||
return null
|
||||
}
|
||||
|
||||
if (buffer.toString("ascii", 0, 4) !== "RIFF" || buffer.toString("ascii", 8, 12) !== "WEBP") {
|
||||
return null
|
||||
}
|
||||
|
||||
const chunkType = buffer.toString("ascii", 12, 16)
|
||||
|
||||
if (chunkType === "VP8 ") {
|
||||
if (buffer[23] !== 0x9d || buffer[24] !== 0x01 || buffer[25] !== 0x2a) {
|
||||
return null
|
||||
}
|
||||
|
||||
const width = buffer.readUInt16LE(26) & 0x3fff
|
||||
const height = buffer.readUInt16LE(28) & 0x3fff
|
||||
return toImageDimensions(width, height)
|
||||
}
|
||||
|
||||
if (chunkType === "VP8L") {
|
||||
if (buffer.length < 25 || buffer[20] !== 0x2f) {
|
||||
return null
|
||||
}
|
||||
|
||||
const bits = buffer.readUInt32LE(21)
|
||||
const width = (bits & 0x3fff) + 1
|
||||
const height = ((bits >>> 14) & 0x3fff) + 1
|
||||
return toImageDimensions(width, height)
|
||||
}
|
||||
|
||||
if (chunkType === "VP8X") {
|
||||
const width = readUInt24LE(buffer, 24) + 1
|
||||
const height = readUInt24LE(buffer, 27) + 1
|
||||
return toImageDimensions(width, height)
|
||||
}
|
||||
|
||||
return null
|
||||
}
|
||||
|
||||
export function parseImageDimensions(base64DataUrl: string, mimeType: string): ImageDimensions | null {
|
||||
try {
|
||||
if (!base64DataUrl || !mimeType) {
|
||||
return null
|
||||
}
|
||||
|
||||
const rawBase64 = extractBase64Data(base64DataUrl)
|
||||
if (!rawBase64) {
|
||||
return null
|
||||
}
|
||||
|
||||
const headerBase64 = rawBase64.length > HEADER_BASE64_CHARS ? rawBase64.slice(0, HEADER_BASE64_CHARS) : rawBase64
|
||||
const buffer = Buffer.from(headerBase64, "base64")
|
||||
if (buffer.length === 0) {
|
||||
return null
|
||||
}
|
||||
|
||||
const normalizedMime = mimeType.toLowerCase()
|
||||
|
||||
if (normalizedMime === "image/png") {
|
||||
return parsePngDimensions(buffer)
|
||||
}
|
||||
|
||||
if (normalizedMime === "image/gif") {
|
||||
return parseGifDimensions(buffer)
|
||||
}
|
||||
|
||||
if (normalizedMime === "image/jpeg" || normalizedMime === "image/jpg") {
|
||||
return parseJpegDimensions(buffer)
|
||||
}
|
||||
|
||||
if (normalizedMime === "image/webp") {
|
||||
return parseWebpDimensions(buffer)
|
||||
}
|
||||
|
||||
return null
|
||||
} catch {
|
||||
return null
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,132 @@
|
||||
/// <reference types="bun-types" />
|
||||
|
||||
import { afterEach, describe, expect, it, mock } from "bun:test"
|
||||
|
||||
const PNG_1X1_DATA_URL =
|
||||
"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg=="
|
||||
|
||||
type ImageResizerModule = typeof import("./image-resizer")
|
||||
|
||||
async function importFreshImageResizerModule(): Promise<ImageResizerModule> {
|
||||
return import(`./image-resizer?test-${Date.now()}-${Math.random()}`)
|
||||
}
|
||||
|
||||
describe("calculateTargetDimensions", () => {
|
||||
it("returns null when dimensions are already within limits", async () => {
|
||||
//#given
|
||||
const { calculateTargetDimensions } = await importFreshImageResizerModule()
|
||||
|
||||
//#when
|
||||
const result = calculateTargetDimensions(800, 600)
|
||||
|
||||
//#then
|
||||
expect(result).toBeNull()
|
||||
})
|
||||
|
||||
it("returns null at exact long-edge boundary", async () => {
|
||||
//#given
|
||||
const { calculateTargetDimensions } = await importFreshImageResizerModule()
|
||||
|
||||
//#when
|
||||
const result = calculateTargetDimensions(1568, 1000)
|
||||
|
||||
//#then
|
||||
expect(result).toBeNull()
|
||||
})
|
||||
|
||||
it("scales landscape dimensions by max long edge", async () => {
|
||||
//#given
|
||||
const { calculateTargetDimensions } = await importFreshImageResizerModule()
|
||||
|
||||
//#when
|
||||
const result = calculateTargetDimensions(3000, 2000)
|
||||
|
||||
//#then
|
||||
expect(result).toEqual({
|
||||
width: 1568,
|
||||
height: Math.floor(2000 * (1568 / 3000)),
|
||||
})
|
||||
})
|
||||
|
||||
it("scales portrait dimensions by max long edge", async () => {
|
||||
//#given
|
||||
const { calculateTargetDimensions } = await importFreshImageResizerModule()
|
||||
|
||||
//#when
|
||||
const result = calculateTargetDimensions(2000, 3000)
|
||||
|
||||
//#then
|
||||
expect(result).toEqual({
|
||||
width: Math.floor(2000 * (1568 / 3000)),
|
||||
height: 1568,
|
||||
})
|
||||
})
|
||||
|
||||
it("scales square dimensions to exact target", async () => {
|
||||
//#given
|
||||
const { calculateTargetDimensions } = await importFreshImageResizerModule()
|
||||
|
||||
//#when
|
||||
const result = calculateTargetDimensions(4000, 4000)
|
||||
|
||||
//#then
|
||||
expect(result).toEqual({ width: 1568, height: 1568 })
|
||||
})
|
||||
|
||||
it("uses custom maxLongEdge when provided", async () => {
|
||||
//#given
|
||||
const { calculateTargetDimensions } = await importFreshImageResizerModule()
|
||||
|
||||
//#when
|
||||
const result = calculateTargetDimensions(2000, 1000, 1000)
|
||||
|
||||
//#then
|
||||
expect(result).toEqual({ width: 1000, height: 500 })
|
||||
})
|
||||
})
|
||||
|
||||
describe("resizeImage", () => {
|
||||
afterEach(() => {
|
||||
mock.restore()
|
||||
})
|
||||
|
||||
it("returns null when sharp import fails", async () => {
|
||||
//#given
|
||||
mock.module("sharp", () => {
|
||||
throw new Error("sharp unavailable")
|
||||
})
|
||||
const { resizeImage } = await importFreshImageResizerModule()
|
||||
|
||||
//#when
|
||||
const result = await resizeImage(PNG_1X1_DATA_URL, "image/png", {
|
||||
width: 1,
|
||||
height: 1,
|
||||
})
|
||||
|
||||
//#then
|
||||
expect(result).toBeNull()
|
||||
})
|
||||
|
||||
it("returns null when sharp throws during resize", async () => {
|
||||
//#given
|
||||
const mockSharpFactory = mock(() => ({
|
||||
resize: () => {
|
||||
throw new Error("resize failed")
|
||||
},
|
||||
}))
|
||||
|
||||
mock.module("sharp", () => ({
|
||||
default: mockSharpFactory,
|
||||
}))
|
||||
const { resizeImage } = await importFreshImageResizerModule()
|
||||
|
||||
//#when
|
||||
const result = await resizeImage(PNG_1X1_DATA_URL, "image/png", {
|
||||
width: 1,
|
||||
height: 1,
|
||||
})
|
||||
|
||||
//#then
|
||||
expect(result).toBeNull()
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,184 @@
|
||||
import type { ImageDimensions, ResizeResult } from "./types"
|
||||
import { extractBase64Data } from "../../tools/look-at/mime-type-inference"
|
||||
import { log } from "../../shared"
|
||||
|
||||
const ANTHROPIC_MAX_LONG_EDGE = 1568
|
||||
const ANTHROPIC_MAX_FILE_SIZE = 5 * 1024 * 1024
|
||||
|
||||
type SharpFormat = "jpeg" | "png" | "gif" | "webp"
|
||||
|
||||
interface SharpMetadata {
|
||||
width?: number
|
||||
height?: number
|
||||
}
|
||||
|
||||
interface SharpInstance {
|
||||
resize(width: number, height: number, options: { fit: "inside" }): SharpInstance
|
||||
toFormat(format: SharpFormat, options?: { quality?: number }): SharpInstance
|
||||
toBuffer(): Promise<Buffer>
|
||||
metadata(): Promise<SharpMetadata>
|
||||
}
|
||||
|
||||
type SharpFactory = (input: Buffer) => SharpInstance
|
||||
|
||||
function resolveSharpFactory(sharpModule: unknown): SharpFactory | null {
|
||||
if (typeof sharpModule === "function") {
|
||||
return sharpModule as SharpFactory
|
||||
}
|
||||
|
||||
if (!sharpModule || typeof sharpModule !== "object") {
|
||||
return null
|
||||
}
|
||||
|
||||
const defaultExport = Reflect.get(sharpModule, "default")
|
||||
return typeof defaultExport === "function" ? (defaultExport as SharpFactory) : null
|
||||
}
|
||||
|
||||
function resolveSharpFormat(mimeType: string): SharpFormat {
|
||||
const normalizedMime = mimeType.toLowerCase()
|
||||
if (normalizedMime === "image/png") {
|
||||
return "png"
|
||||
}
|
||||
if (normalizedMime === "image/gif") {
|
||||
return "gif"
|
||||
}
|
||||
if (normalizedMime === "image/webp") {
|
||||
return "webp"
|
||||
}
|
||||
return "jpeg"
|
||||
}
|
||||
|
||||
function canAdjustQuality(format: SharpFormat): boolean {
|
||||
return format === "jpeg" || format === "webp"
|
||||
}
|
||||
|
||||
function toDimensions(metadata: SharpMetadata): ImageDimensions | null {
|
||||
const { width, height } = metadata
|
||||
if (!width || !height) {
|
||||
return null
|
||||
}
|
||||
return { width, height }
|
||||
}
|
||||
|
||||
async function renderResizedBuffer(args: {
|
||||
sharpFactory: SharpFactory
|
||||
inputBuffer: Buffer
|
||||
target: ImageDimensions
|
||||
format: SharpFormat
|
||||
quality?: number
|
||||
}): Promise<Buffer> {
|
||||
const { sharpFactory, inputBuffer, target, format, quality } = args
|
||||
return sharpFactory(inputBuffer)
|
||||
.resize(target.width, target.height, { fit: "inside" })
|
||||
.toFormat(format, quality ? { quality } : undefined)
|
||||
.toBuffer()
|
||||
}
|
||||
|
||||
function getErrorMessage(error: unknown): string {
|
||||
return error instanceof Error ? error.message : String(error)
|
||||
}
|
||||
|
||||
export function calculateTargetDimensions(
|
||||
width: number,
|
||||
height: number,
|
||||
maxLongEdge = ANTHROPIC_MAX_LONG_EDGE,
|
||||
): ImageDimensions | null {
|
||||
if (width <= 0 || height <= 0 || maxLongEdge <= 0) {
|
||||
return null
|
||||
}
|
||||
|
||||
const longEdge = Math.max(width, height)
|
||||
if (longEdge <= maxLongEdge) {
|
||||
return null
|
||||
}
|
||||
|
||||
if (width >= height) {
|
||||
return {
|
||||
width: maxLongEdge,
|
||||
height: Math.max(1, Math.floor((height * maxLongEdge) / width)),
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
width: Math.max(1, Math.floor((width * maxLongEdge) / height)),
|
||||
height: maxLongEdge,
|
||||
}
|
||||
}
|
||||
|
||||
export async function resizeImage(
|
||||
base64DataUrl: string,
|
||||
mimeType: string,
|
||||
target: ImageDimensions,
|
||||
): Promise<ResizeResult | null> {
|
||||
try {
|
||||
const sharpModuleName = "sharp"
|
||||
const sharpModule = await import(sharpModuleName).catch(() => null)
|
||||
if (!sharpModule) {
|
||||
log("[read-image-resizer] sharp unavailable, skipping resize")
|
||||
return null
|
||||
}
|
||||
|
||||
const sharpFactory = resolveSharpFactory(sharpModule)
|
||||
if (!sharpFactory) {
|
||||
log("[read-image-resizer] sharp import has unexpected shape")
|
||||
return null
|
||||
}
|
||||
|
||||
const rawBase64 = extractBase64Data(base64DataUrl)
|
||||
if (!rawBase64) {
|
||||
return null
|
||||
}
|
||||
|
||||
const inputBuffer = Buffer.from(rawBase64, "base64")
|
||||
if (inputBuffer.length === 0) {
|
||||
return null
|
||||
}
|
||||
|
||||
const original = toDimensions(await sharpFactory(inputBuffer).metadata())
|
||||
if (!original) {
|
||||
return null
|
||||
}
|
||||
|
||||
const format = resolveSharpFormat(mimeType)
|
||||
let resizedBuffer = await renderResizedBuffer({
|
||||
sharpFactory,
|
||||
inputBuffer,
|
||||
target,
|
||||
format,
|
||||
})
|
||||
|
||||
if (resizedBuffer.length > ANTHROPIC_MAX_FILE_SIZE && canAdjustQuality(format)) {
|
||||
for (const quality of [80, 60, 40]) {
|
||||
resizedBuffer = await renderResizedBuffer({
|
||||
sharpFactory,
|
||||
inputBuffer,
|
||||
target,
|
||||
format,
|
||||
quality,
|
||||
})
|
||||
|
||||
if (resizedBuffer.length <= ANTHROPIC_MAX_FILE_SIZE) {
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const resized = toDimensions(await sharpFactory(resizedBuffer).metadata())
|
||||
if (!resized) {
|
||||
return null
|
||||
}
|
||||
|
||||
return {
|
||||
resizedDataUrl: `data:${mimeType};base64,${resizedBuffer.toString("base64")}`,
|
||||
original,
|
||||
resized,
|
||||
}
|
||||
} catch (error) {
|
||||
log("[read-image-resizer] resize failed", {
|
||||
error: getErrorMessage(error),
|
||||
mimeType,
|
||||
target,
|
||||
})
|
||||
return null
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
export { createReadImageResizerHook } from "./hook"
|
||||
@@ -0,0 +1,16 @@
|
||||
export interface ImageDimensions {
|
||||
width: number
|
||||
height: number
|
||||
}
|
||||
|
||||
export interface ImageAttachment {
|
||||
mime: string
|
||||
url: string
|
||||
filename?: string
|
||||
}
|
||||
|
||||
export interface ResizeResult {
|
||||
resizedDataUrl: string
|
||||
original: ImageDimensions
|
||||
resized: ImageDimensions
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
# src/hooks/rules-injector/ — Conditional Rules Injection
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@ import {
|
||||
getAfplayPath,
|
||||
getPaplayPath,
|
||||
getAplayPath,
|
||||
getTerminalNotifierPath,
|
||||
} from "./session-notification-utils"
|
||||
import { buildWindowsToastScript, escapeAppleScriptText, escapePowerShellSingleQuotedText } from "./session-notification-formatting"
|
||||
|
||||
@@ -39,6 +40,19 @@ export async function sendSessionNotification(
|
||||
): Promise<void> {
|
||||
switch (platform) {
|
||||
case "darwin": {
|
||||
// Try terminal-notifier first — deterministic click-to-focus
|
||||
const terminalNotifierPath = await getTerminalNotifierPath()
|
||||
if (terminalNotifierPath) {
|
||||
const bundleId = process.env.__CFBundleIdentifier
|
||||
const args = [terminalNotifierPath, "-title", title, "-message", message]
|
||||
if (bundleId) {
|
||||
args.push("-activate", bundleId)
|
||||
}
|
||||
await ctx.$`${args}`.catch(() => {})
|
||||
break
|
||||
}
|
||||
|
||||
// Fallback: osascript (click may open Finder instead of terminal)
|
||||
const osascriptPath = await getOsascriptPath()
|
||||
if (!osascriptPath) return
|
||||
|
||||
|
||||
@@ -32,11 +32,13 @@ export const getPowershellPath = createCommandFinder("powershell")
|
||||
export const getAfplayPath = createCommandFinder("afplay")
|
||||
export const getPaplayPath = createCommandFinder("paplay")
|
||||
export const getAplayPath = createCommandFinder("aplay")
|
||||
export const getTerminalNotifierPath = createCommandFinder("terminal-notifier")
|
||||
|
||||
export function startBackgroundCheck(platform: Platform): void {
|
||||
if (platform === "darwin") {
|
||||
getOsascriptPath().catch(() => {})
|
||||
getAfplayPath().catch(() => {})
|
||||
getTerminalNotifierPath().catch(() => {})
|
||||
} else if (platform === "linux") {
|
||||
getNotifySendPath().catch(() => {})
|
||||
getPaplayPath().catch(() => {})
|
||||
|
||||
@@ -365,4 +365,87 @@ describe("session-notification", () => {
|
||||
// then - only one notification should be sent
|
||||
expect(notificationCalls).toHaveLength(1)
|
||||
})
|
||||
|
||||
function createSenderMockCtx() {
|
||||
const notifyCalls: string[] = []
|
||||
const mockCtx = {
|
||||
$: async (cmd: TemplateStringsArray | string, ...values: any[]) => {
|
||||
const cmdStr = typeof cmd === "string"
|
||||
? cmd
|
||||
: cmd.reduce((acc, part, i) => acc + part + (values[i] ?? ""), "")
|
||||
notifyCalls.push(cmdStr)
|
||||
return { stdout: "", stderr: "", exitCode: 0 }
|
||||
},
|
||||
} as any
|
||||
return { mockCtx, notifyCalls }
|
||||
}
|
||||
|
||||
test("should use terminal-notifier with -activate when available on darwin", async () => {
|
||||
// given - terminal-notifier is available and __CFBundleIdentifier is set
|
||||
spyOn(sender, "sendSessionNotification").mockRestore()
|
||||
const { mockCtx, notifyCalls } = createSenderMockCtx()
|
||||
spyOn(utils, "getTerminalNotifierPath").mockResolvedValue("/usr/local/bin/terminal-notifier")
|
||||
const originalEnv = process.env.__CFBundleIdentifier
|
||||
process.env.__CFBundleIdentifier = "com.mitchellh.ghostty"
|
||||
|
||||
try {
|
||||
// when - sendSessionNotification is called directly on darwin
|
||||
await sender.sendSessionNotification(mockCtx, "darwin", "Test Title", "Test Message")
|
||||
|
||||
// then - notification uses terminal-notifier with -activate flag
|
||||
expect(notifyCalls.length).toBeGreaterThanOrEqual(1)
|
||||
const tnCall = notifyCalls.find(c => c.includes("terminal-notifier"))
|
||||
expect(tnCall).toBeDefined()
|
||||
expect(tnCall).toContain("-activate")
|
||||
expect(tnCall).toContain("com.mitchellh.ghostty")
|
||||
} finally {
|
||||
if (originalEnv !== undefined) {
|
||||
process.env.__CFBundleIdentifier = originalEnv
|
||||
} else {
|
||||
delete process.env.__CFBundleIdentifier
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
test("should fall back to osascript when terminal-notifier is not available", async () => {
|
||||
// given - terminal-notifier is NOT available
|
||||
spyOn(sender, "sendSessionNotification").mockRestore()
|
||||
const { mockCtx, notifyCalls } = createSenderMockCtx()
|
||||
spyOn(utils, "getTerminalNotifierPath").mockResolvedValue(null)
|
||||
spyOn(utils, "getOsascriptPath").mockResolvedValue("/usr/bin/osascript")
|
||||
|
||||
// when - sendSessionNotification is called directly on darwin
|
||||
await sender.sendSessionNotification(mockCtx, "darwin", "Test Title", "Test Message")
|
||||
|
||||
// then - notification uses osascript (fallback)
|
||||
expect(notifyCalls.length).toBeGreaterThanOrEqual(1)
|
||||
const osascriptCall = notifyCalls.find(c => c.includes("osascript"))
|
||||
expect(osascriptCall).toBeDefined()
|
||||
const tnCall = notifyCalls.find(c => c.includes("terminal-notifier"))
|
||||
expect(tnCall).toBeUndefined()
|
||||
})
|
||||
|
||||
test("should use terminal-notifier without -activate when __CFBundleIdentifier is not set", async () => {
|
||||
// given - terminal-notifier available but no bundle ID
|
||||
spyOn(sender, "sendSessionNotification").mockRestore()
|
||||
const { mockCtx, notifyCalls } = createSenderMockCtx()
|
||||
spyOn(utils, "getTerminalNotifierPath").mockResolvedValue("/usr/local/bin/terminal-notifier")
|
||||
const originalEnv = process.env.__CFBundleIdentifier
|
||||
delete process.env.__CFBundleIdentifier
|
||||
|
||||
try {
|
||||
// when - sendSessionNotification is called directly on darwin
|
||||
await sender.sendSessionNotification(mockCtx, "darwin", "Test Title", "Test Message")
|
||||
|
||||
// then - terminal-notifier used but without -activate flag
|
||||
expect(notifyCalls.length).toBeGreaterThanOrEqual(1)
|
||||
const tnCall = notifyCalls.find(c => c.includes("terminal-notifier"))
|
||||
expect(tnCall).toBeDefined()
|
||||
expect(tnCall).not.toContain("-activate")
|
||||
} finally {
|
||||
if (originalEnv !== undefined) {
|
||||
process.env.__CFBundleIdentifier = originalEnv
|
||||
}
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# src/hooks/session-recovery/ — Auto Session Error Recovery
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
|
||||
@@ -16,6 +16,8 @@
|
||||
* inconsistencies defensively while maintaining backwards compatibility.
|
||||
*/
|
||||
|
||||
import { normalizeModelID } from "../../shared"
|
||||
|
||||
/**
|
||||
* Extracts provider-specific prefix from model ID (if present).
|
||||
* Custom providers may use prefixes for routing (e.g., vertex_ai/, openai/).
|
||||
@@ -36,24 +38,6 @@ function extractModelPrefix(modelID: string): { prefix: string; base: string } {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Normalizes model IDs to use consistent hyphen formatting.
|
||||
* GitHub Copilot may use dots (claude-opus-4.6) but our maps use hyphens (claude-opus-4-6).
|
||||
* This ensures lookups work regardless of format.
|
||||
*
|
||||
* @example
|
||||
* normalizeModelID("claude-opus-4.6") // "claude-opus-4-6"
|
||||
* normalizeModelID("gemini-3.5-pro") // "gemini-3-5-pro"
|
||||
* normalizeModelID("gpt-5.2") // "gpt-5-2"
|
||||
* normalizeModelID("vertex_ai/claude-opus-4.6") // "vertex_ai/claude-opus-4-6"
|
||||
*/
|
||||
function normalizeModelID(modelID: string): string {
|
||||
// Replace dots with hyphens when followed by a digit
|
||||
// This handles version numbers like 4.5 → 4-5, 5.2 → 5-2
|
||||
return modelID.replace(/\.(\d+)/g, "-$1")
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Maps model IDs to their "high reasoning" variant (internal convention)
|
||||
// For OpenAI models, this signals that reasoning_effort should be set to "high"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# src/hooks/todo-continuation-enforcer/ — Boulder Continuation Mechanism
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { initConfigContext } from "./cli/config-manager/config-context"
|
||||
import type { Plugin } from "@opencode-ai/plugin"
|
||||
|
||||
import type { HookName } from "./config"
|
||||
@@ -14,6 +15,8 @@ import { injectServerAuthIntoClient, log } from "./shared"
|
||||
import { startTmuxCheck } from "./tools"
|
||||
|
||||
const OhMyOpenCodePlugin: Plugin = async (ctx) => {
|
||||
// Initialize config context for plugin runtime (prevents warnings from hooks)
|
||||
initConfigContext("opencode", null)
|
||||
log("[OhMyOpenCodePlugin] ENTRY - plugin loading", {
|
||||
directory: ctx.directory,
|
||||
})
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
# src/mcp/ — 3 Built-in Remote MCPs
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
|
||||
+162
-2
@@ -1,5 +1,10 @@
|
||||
import { describe, expect, it } from "bun:test";
|
||||
import { mergeConfigs, parseConfigPartially } from "./plugin-config";
|
||||
import {
|
||||
detectLikelyBuiltinAgentTypos,
|
||||
detectUnknownBuiltinAgentKeys,
|
||||
mergeConfigs,
|
||||
parseConfigPartially,
|
||||
} from "./plugin-config";
|
||||
import type { OhMyOpenCodeConfig } from "./config";
|
||||
|
||||
describe("mergeConfigs", () => {
|
||||
@@ -115,6 +120,27 @@ describe("mergeConfigs", () => {
|
||||
expect(result.disabled_hooks).toContain("session-recovery");
|
||||
expect(result.disabled_hooks?.length).toBe(3);
|
||||
});
|
||||
|
||||
it("should deep merge custom_agents", () => {
|
||||
const base: OhMyOpenCodeConfig = {
|
||||
custom_agents: {
|
||||
translator: { model: "google/gemini-3-flash-preview" },
|
||||
},
|
||||
}
|
||||
|
||||
const override: OhMyOpenCodeConfig = {
|
||||
custom_agents: {
|
||||
translator: { temperature: 0 },
|
||||
"database-architect": { model: "openai/gpt-5.3-codex" },
|
||||
},
|
||||
}
|
||||
|
||||
const result = mergeConfigs(base, override)
|
||||
|
||||
expect(result.custom_agents?.translator?.model).toBe("google/gemini-3-flash-preview")
|
||||
expect(result.custom_agents?.translator?.temperature).toBe(0)
|
||||
expect(result.custom_agents?.["database-architect"]?.model).toBe("openai/gpt-5.3-codex")
|
||||
})
|
||||
});
|
||||
});
|
||||
|
||||
@@ -165,7 +191,9 @@ describe("parseConfigPartially", () => {
|
||||
|
||||
expect(result).not.toBeNull();
|
||||
expect(result!.disabled_hooks).toEqual(["comment-checker"]);
|
||||
expect(result!.agents).toBeUndefined();
|
||||
expect(result!.agents?.oracle?.model).toBe("openai/gpt-5.2");
|
||||
expect(result!.agents?.momus?.model).toBe("openai/gpt-5.2");
|
||||
expect((result!.agents as Record<string, unknown>)?.prometheus).toBeUndefined();
|
||||
});
|
||||
|
||||
it("should preserve valid agents when a non-agent section is invalid", () => {
|
||||
@@ -182,6 +210,36 @@ describe("parseConfigPartially", () => {
|
||||
expect(result!.agents?.oracle?.model).toBe("openai/gpt-5.2");
|
||||
expect(result!.disabled_hooks).toEqual(["not-a-real-hook"]);
|
||||
});
|
||||
|
||||
it("should preserve valid built-in agent entries when agents contains unknown keys", () => {
|
||||
const rawConfig = {
|
||||
agents: {
|
||||
sisyphus: { model: "openai/gpt-5.3-codex" },
|
||||
sisyphuss: { model: "openai/gpt-5.3-codex" },
|
||||
},
|
||||
};
|
||||
|
||||
const result = parseConfigPartially(rawConfig);
|
||||
|
||||
expect(result).not.toBeNull();
|
||||
expect(result!.agents?.sisyphus?.model).toBe("openai/gpt-5.3-codex");
|
||||
expect((result!.agents as Record<string, unknown>)?.sisyphuss).toBeUndefined();
|
||||
});
|
||||
|
||||
it("should preserve valid custom_agents entries when custom_agents contains reserved names", () => {
|
||||
const rawConfig = {
|
||||
custom_agents: {
|
||||
translator: { model: "google/gemini-3-flash-preview" },
|
||||
sisyphus: { model: "openai/gpt-5.3-codex" },
|
||||
},
|
||||
};
|
||||
|
||||
const result = parseConfigPartially(rawConfig);
|
||||
|
||||
expect(result).not.toBeNull();
|
||||
expect(result!.custom_agents?.translator?.model).toBe("google/gemini-3-flash-preview");
|
||||
expect((result!.custom_agents as Record<string, unknown>)?.sisyphus).toBeUndefined();
|
||||
});
|
||||
});
|
||||
|
||||
describe("completely invalid config", () => {
|
||||
@@ -237,3 +295,105 @@ describe("parseConfigPartially", () => {
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("detectLikelyBuiltinAgentTypos", () => {
|
||||
it("detects near-miss builtin agent keys", () => {
|
||||
const rawConfig = {
|
||||
agents: {
|
||||
sisyphuss: { model: "openai/gpt-5.2" },
|
||||
},
|
||||
}
|
||||
|
||||
const warnings = detectLikelyBuiltinAgentTypos(rawConfig)
|
||||
|
||||
expect(warnings).toEqual([
|
||||
{
|
||||
key: "sisyphuss",
|
||||
suggestion: "sisyphus",
|
||||
},
|
||||
])
|
||||
})
|
||||
|
||||
it("suggests canonical key casing for OpenCode-Builder typos", () => {
|
||||
const rawConfig = {
|
||||
agents: {
|
||||
"opencode-buildr": { model: "openai/gpt-5.2" },
|
||||
},
|
||||
}
|
||||
|
||||
const warnings = detectLikelyBuiltinAgentTypos(rawConfig)
|
||||
|
||||
expect(warnings).toEqual([
|
||||
{
|
||||
key: "opencode-buildr",
|
||||
suggestion: "OpenCode-Builder",
|
||||
},
|
||||
])
|
||||
})
|
||||
|
||||
it("does not flag valid custom agent names", () => {
|
||||
const rawConfig = {
|
||||
agents: {
|
||||
translator: { model: "google/gemini-3-flash-preview" },
|
||||
},
|
||||
}
|
||||
|
||||
const warnings = detectLikelyBuiltinAgentTypos(rawConfig)
|
||||
|
||||
expect(warnings).toEqual([])
|
||||
})
|
||||
})
|
||||
|
||||
describe("detectUnknownBuiltinAgentKeys", () => {
|
||||
it("returns unknown keys under agents", () => {
|
||||
const rawConfig = {
|
||||
agents: {
|
||||
sisyphus: { model: "openai/gpt-5.2" },
|
||||
translator: { model: "google/gemini-3-flash-preview" },
|
||||
},
|
||||
}
|
||||
|
||||
const unknownKeys = detectUnknownBuiltinAgentKeys(rawConfig)
|
||||
|
||||
expect(unknownKeys).toEqual(["translator"])
|
||||
})
|
||||
|
||||
it("returns empty array when all keys are built-ins", () => {
|
||||
const rawConfig = {
|
||||
agents: {
|
||||
sisyphus: { model: "openai/gpt-5.2" },
|
||||
prometheus: { model: "openai/gpt-5.2" },
|
||||
},
|
||||
}
|
||||
|
||||
const unknownKeys = detectUnknownBuiltinAgentKeys(rawConfig)
|
||||
|
||||
expect(unknownKeys).toEqual([])
|
||||
})
|
||||
|
||||
it("excludes typo keys when explicitly provided", () => {
|
||||
const rawConfig = {
|
||||
agents: {
|
||||
sisyphuss: { model: "openai/gpt-5.2" },
|
||||
translator: { model: "google/gemini-3-flash-preview" },
|
||||
},
|
||||
}
|
||||
|
||||
const unknownKeys = detectUnknownBuiltinAgentKeys(rawConfig, ["sisyphuss"])
|
||||
|
||||
expect(unknownKeys).toEqual(["translator"])
|
||||
})
|
||||
|
||||
it("excludes typo keys case-insensitively", () => {
|
||||
const rawConfig = {
|
||||
agents: {
|
||||
Sisyphuss: { model: "openai/gpt-5.2" },
|
||||
translator: { model: "google/gemini-3-flash-preview" },
|
||||
},
|
||||
}
|
||||
|
||||
const unknownKeys = detectUnknownBuiltinAgentKeys(rawConfig, ["sisyphuss"])
|
||||
|
||||
expect(unknownKeys).toEqual(["translator"])
|
||||
})
|
||||
})
|
||||
|
||||
+162
-1
@@ -1,6 +1,10 @@
|
||||
import * as fs from "fs";
|
||||
import * as path from "path";
|
||||
import { OhMyOpenCodeConfigSchema, type OhMyOpenCodeConfig } from "./config";
|
||||
import {
|
||||
OhMyOpenCodeConfigSchema,
|
||||
OverridableAgentNameSchema,
|
||||
type OhMyOpenCodeConfig,
|
||||
} from "./config";
|
||||
import {
|
||||
log,
|
||||
deepMerge,
|
||||
@@ -11,6 +15,90 @@ import {
|
||||
migrateConfigFile,
|
||||
} from "./shared";
|
||||
|
||||
const BUILTIN_AGENT_OVERRIDE_KEYS = OverridableAgentNameSchema.options;
|
||||
const BUILTIN_AGENT_OVERRIDE_KEYS_BY_LOWER = new Map(
|
||||
BUILTIN_AGENT_OVERRIDE_KEYS.map((key) => [key.toLowerCase(), key]),
|
||||
);
|
||||
|
||||
function levenshteinDistance(a: string, b: string): number {
|
||||
const rows = a.length + 1;
|
||||
const cols = b.length + 1;
|
||||
const matrix: number[][] = Array.from({ length: rows }, () => Array(cols).fill(0));
|
||||
|
||||
for (let i = 0; i < rows; i += 1) matrix[i][0] = i;
|
||||
for (let j = 0; j < cols; j += 1) matrix[0][j] = j;
|
||||
|
||||
for (let i = 1; i < rows; i += 1) {
|
||||
for (let j = 1; j < cols; j += 1) {
|
||||
const cost = a[i - 1] === b[j - 1] ? 0 : 1;
|
||||
matrix[i][j] = Math.min(
|
||||
matrix[i - 1][j] + 1,
|
||||
matrix[i][j - 1] + 1,
|
||||
matrix[i - 1][j - 1] + cost,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
return matrix[rows - 1][cols - 1];
|
||||
}
|
||||
|
||||
type AgentTypoWarning = {
|
||||
key: string;
|
||||
suggestion: string;
|
||||
};
|
||||
|
||||
export function detectLikelyBuiltinAgentTypos(
|
||||
rawConfig: Record<string, unknown>,
|
||||
): AgentTypoWarning[] {
|
||||
const agents = rawConfig.agents;
|
||||
if (!agents || typeof agents !== "object") return [];
|
||||
|
||||
const warnings: AgentTypoWarning[] = [];
|
||||
for (const key of Object.keys(agents)) {
|
||||
const lowerKey = key.toLowerCase();
|
||||
if (BUILTIN_AGENT_OVERRIDE_KEYS_BY_LOWER.has(lowerKey)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
let bestMatchLower: string | undefined;
|
||||
let bestDistance = Number.POSITIVE_INFINITY;
|
||||
for (const builtinKey of BUILTIN_AGENT_OVERRIDE_KEYS) {
|
||||
const distance = levenshteinDistance(lowerKey, builtinKey.toLowerCase());
|
||||
if (distance < bestDistance) {
|
||||
bestDistance = distance;
|
||||
bestMatchLower = builtinKey.toLowerCase();
|
||||
}
|
||||
}
|
||||
|
||||
if (bestMatchLower && bestDistance <= 2) {
|
||||
const suggestion = BUILTIN_AGENT_OVERRIDE_KEYS_BY_LOWER.get(bestMatchLower) ?? bestMatchLower;
|
||||
warnings.push({ key, suggestion });
|
||||
}
|
||||
}
|
||||
|
||||
return warnings;
|
||||
}
|
||||
|
||||
export function detectUnknownBuiltinAgentKeys(
|
||||
rawConfig: Record<string, unknown>,
|
||||
excludeKeys: string[] = [],
|
||||
): string[] {
|
||||
const agents = rawConfig.agents;
|
||||
if (!agents || typeof agents !== "object") return [];
|
||||
|
||||
const excluded = new Set(excludeKeys.map((key) => key.toLowerCase()));
|
||||
|
||||
return Object.keys(agents).filter(
|
||||
(key) => {
|
||||
const lower = key.toLowerCase();
|
||||
return (
|
||||
!BUILTIN_AGENT_OVERRIDE_KEYS_BY_LOWER.has(lower)
|
||||
&& !excluded.has(lower)
|
||||
);
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
export function parseConfigPartially(
|
||||
rawConfig: Record<string, unknown>
|
||||
): OhMyOpenCodeConfig | null {
|
||||
@@ -22,7 +110,52 @@ export function parseConfigPartially(
|
||||
const partialConfig: Record<string, unknown> = {};
|
||||
const invalidSections: string[] = [];
|
||||
|
||||
const parseAgentSectionEntries = (sectionKey: "agents" | "custom_agents"): void => {
|
||||
const rawSection = rawConfig[sectionKey];
|
||||
if (!rawSection || typeof rawSection !== "object") return;
|
||||
|
||||
const parsedSection: Record<string, unknown> = {};
|
||||
const invalidEntries: string[] = [];
|
||||
|
||||
for (const [entryKey, entryValue] of Object.entries(rawSection)) {
|
||||
const singleEntryResult = OhMyOpenCodeConfigSchema.safeParse({
|
||||
[sectionKey]: { [entryKey]: entryValue },
|
||||
});
|
||||
|
||||
if (singleEntryResult.success) {
|
||||
const parsed = singleEntryResult.data as Record<string, unknown>;
|
||||
const parsedSectionValue = parsed[sectionKey];
|
||||
if (parsedSectionValue && typeof parsedSectionValue === "object") {
|
||||
const typedSection = parsedSectionValue as Record<string, unknown>;
|
||||
if (typedSection[entryKey] !== undefined) {
|
||||
parsedSection[entryKey] = typedSection[entryKey];
|
||||
}
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
const entryErrors = singleEntryResult.error.issues
|
||||
.map((issue) => `${entryKey}: ${issue.message}`)
|
||||
.join(", ");
|
||||
if (entryErrors) {
|
||||
invalidEntries.push(entryErrors);
|
||||
}
|
||||
}
|
||||
|
||||
if (Object.keys(parsedSection).length > 0) {
|
||||
partialConfig[sectionKey] = parsedSection;
|
||||
}
|
||||
if (invalidEntries.length > 0) {
|
||||
invalidSections.push(`${sectionKey}: ${invalidEntries.join(", ")}`);
|
||||
}
|
||||
};
|
||||
|
||||
for (const key of Object.keys(rawConfig)) {
|
||||
if (key === "agents" || key === "custom_agents") {
|
||||
parseAgentSectionEntries(key);
|
||||
continue;
|
||||
}
|
||||
|
||||
const sectionResult = OhMyOpenCodeConfigSchema.safeParse({ [key]: rawConfig[key] });
|
||||
if (sectionResult.success) {
|
||||
const parsed = sectionResult.data as Record<string, unknown>;
|
||||
@@ -58,6 +191,32 @@ export function loadConfigFromPath(
|
||||
|
||||
migrateConfigFile(configPath, rawConfig);
|
||||
|
||||
const typoWarnings = detectLikelyBuiltinAgentTypos(rawConfig);
|
||||
if (typoWarnings.length > 0) {
|
||||
const warningMsg = typoWarnings
|
||||
.map((warning) => `agents.${warning.key} (did you mean agents.${warning.suggestion}?)`)
|
||||
.join(", ");
|
||||
log(`Potential agent override typos in ${configPath}: ${warningMsg}`);
|
||||
addConfigLoadError({
|
||||
path: configPath,
|
||||
error: `Potential agent override typos detected: ${warningMsg}`,
|
||||
});
|
||||
}
|
||||
|
||||
const unknownAgentKeys = detectUnknownBuiltinAgentKeys(
|
||||
rawConfig,
|
||||
typoWarnings.map((warning) => warning.key),
|
||||
);
|
||||
if (unknownAgentKeys.length > 0) {
|
||||
const unknownKeysMsg = unknownAgentKeys.map((key) => `agents.${key}`).join(", ");
|
||||
const migrationHint = "Move custom entries from agents.* to custom_agents.*";
|
||||
log(`Unknown built-in agent override keys in ${configPath}: ${unknownKeysMsg}. ${migrationHint}`);
|
||||
addConfigLoadError({
|
||||
path: configPath,
|
||||
error: `Unknown built-in agent override keys: ${unknownKeysMsg}. ${migrationHint}`,
|
||||
});
|
||||
}
|
||||
|
||||
const result = OhMyOpenCodeConfigSchema.safeParse(rawConfig);
|
||||
|
||||
if (result.success) {
|
||||
@@ -98,6 +257,7 @@ export function mergeConfigs(
|
||||
...base,
|
||||
...override,
|
||||
agents: deepMerge(base.agents, override.agents),
|
||||
custom_agents: deepMerge(base.custom_agents, override.custom_agents),
|
||||
categories: deepMerge(base.categories, override.categories),
|
||||
disabled_agents: [
|
||||
...new Set([
|
||||
@@ -170,6 +330,7 @@ export function loadPluginConfig(
|
||||
|
||||
log("Final merged config", {
|
||||
agents: config.agents,
|
||||
custom_agents: config.custom_agents,
|
||||
disabled_agents: config.disabled_agents,
|
||||
disabled_mcps: config.disabled_mcps,
|
||||
disabled_hooks: config.disabled_hooks,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# src/plugin-handlers/ — 6-Phase Config Loading Pipeline
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ import type { OhMyOpenCodeConfig } from "../config";
|
||||
import { log, migrateAgentConfig } from "../shared";
|
||||
import { AGENT_NAME_MAP } from "../shared/migration";
|
||||
import { getAgentDisplayName } from "../shared/agent-display-names";
|
||||
import { mergeCategories } from "../shared/merge-categories";
|
||||
import {
|
||||
discoverConfigSourceSkills,
|
||||
discoverOpencodeGlobalSkills,
|
||||
@@ -17,6 +18,13 @@ import { reorderAgentsByPriority } from "./agent-priority-order";
|
||||
import { remapAgentKeysToDisplayNames } from "./agent-key-remapper";
|
||||
import { buildPrometheusAgentConfig } from "./prometheus-agent-config-builder";
|
||||
import { buildPlanDemoteConfig } from "./plan-model-inheritance";
|
||||
import {
|
||||
applyCustomAgentOverrides,
|
||||
collectCustomAgentSummariesFromRecord,
|
||||
mergeCustomAgentSummaries,
|
||||
collectKnownCustomAgentNames,
|
||||
filterSummariesByKnownNames,
|
||||
} from "./custom-agent-utils";
|
||||
|
||||
type AgentConfigRecord = Record<string, Record<string, unknown> | undefined> & {
|
||||
build?: Record<string, unknown>;
|
||||
@@ -74,26 +82,19 @@ export async function applyAgentConfig(params: {
|
||||
const browserProvider =
|
||||
params.pluginConfig.browser_automation_engine?.provider ?? "playwright";
|
||||
const currentModel = params.config.model as string | undefined;
|
||||
const disabledAgentNames = new Set(
|
||||
(migratedDisabledAgents ?? []).map((agent) => agent.toLowerCase()),
|
||||
);
|
||||
const filterDisabledAgents = (agents: Record<string, unknown>) =>
|
||||
Object.fromEntries(
|
||||
Object.entries(agents).filter(
|
||||
([name]) => !disabledAgentNames.has(name.toLowerCase()),
|
||||
),
|
||||
);
|
||||
const disabledSkills = new Set<string>(params.pluginConfig.disabled_skills ?? []);
|
||||
const useTaskSystem = params.pluginConfig.experimental?.task_system ?? false;
|
||||
const disableOmoEnv = params.pluginConfig.experimental?.disable_omo_env ?? false;
|
||||
|
||||
const builtinAgents = await createBuiltinAgents(
|
||||
migratedDisabledAgents,
|
||||
params.pluginConfig.agents,
|
||||
params.ctx.directory,
|
||||
currentModel,
|
||||
params.pluginConfig.categories,
|
||||
params.pluginConfig.git_master,
|
||||
allDiscoveredSkills,
|
||||
params.ctx.client,
|
||||
browserProvider,
|
||||
currentModel,
|
||||
disabledSkills,
|
||||
useTaskSystem,
|
||||
disableOmoEnv,
|
||||
);
|
||||
|
||||
const includeClaudeAgents = params.pluginConfig.claude_code?.agents ?? true;
|
||||
const userAgents = includeClaudeAgents ? loadUserAgents() : {};
|
||||
const projectAgents = includeClaudeAgents ? loadProjectAgents(params.ctx.directory) : {};
|
||||
@@ -106,15 +107,49 @@ export async function applyAgentConfig(params: {
|
||||
]),
|
||||
);
|
||||
|
||||
const disabledAgentNames = new Set(
|
||||
(migratedDisabledAgents ?? []).map(a => a.toLowerCase())
|
||||
const configAgent = params.config.agent as AgentConfigRecord | undefined;
|
||||
const filteredUserAgents = filterDisabledAgents(userAgents as Record<string, unknown>);
|
||||
const filteredProjectAgents = filterDisabledAgents(projectAgents as Record<string, unknown>);
|
||||
const filteredPluginAgents = filterDisabledAgents(pluginAgents as Record<string, unknown>);
|
||||
const filteredConfigAgentsForSummary = filterDisabledAgents(
|
||||
(configAgent as Record<string, unknown> | undefined) ?? {},
|
||||
);
|
||||
const mergedCategories = mergeCategories(params.pluginConfig.categories)
|
||||
const knownCustomAgentNames = collectKnownCustomAgentNames(
|
||||
filteredUserAgents,
|
||||
filteredProjectAgents,
|
||||
filteredPluginAgents,
|
||||
filteredConfigAgentsForSummary,
|
||||
)
|
||||
|
||||
const filterDisabledAgents = (agents: Record<string, unknown>) =>
|
||||
Object.fromEntries(
|
||||
Object.entries(agents).filter(([name]) => !disabledAgentNames.has(name.toLowerCase()))
|
||||
);
|
||||
const customAgentSummaries = mergeCustomAgentSummaries(
|
||||
collectCustomAgentSummariesFromRecord(filteredUserAgents),
|
||||
collectCustomAgentSummariesFromRecord(filteredProjectAgents),
|
||||
collectCustomAgentSummariesFromRecord(filteredPluginAgents),
|
||||
collectCustomAgentSummariesFromRecord(filteredConfigAgentsForSummary),
|
||||
filterSummariesByKnownNames(
|
||||
collectCustomAgentSummariesFromRecord(
|
||||
params.pluginConfig.custom_agents as Record<string, unknown> | undefined,
|
||||
),
|
||||
knownCustomAgentNames,
|
||||
),
|
||||
)
|
||||
|
||||
const builtinAgents = await createBuiltinAgents(
|
||||
migratedDisabledAgents,
|
||||
params.pluginConfig.agents,
|
||||
params.ctx.directory,
|
||||
currentModel,
|
||||
params.pluginConfig.categories,
|
||||
params.pluginConfig.git_master,
|
||||
allDiscoveredSkills,
|
||||
customAgentSummaries,
|
||||
browserProvider,
|
||||
currentModel,
|
||||
disabledSkills,
|
||||
useTaskSystem,
|
||||
disableOmoEnv,
|
||||
);
|
||||
const isSisyphusEnabled = params.pluginConfig.sisyphus_agent?.disabled !== true;
|
||||
const builderEnabled =
|
||||
params.pluginConfig.sisyphus_agent?.default_builder_enabled ?? false;
|
||||
@@ -123,8 +158,6 @@ export async function applyAgentConfig(params: {
|
||||
const shouldDemotePlan = plannerEnabled && replacePlan;
|
||||
const configuredDefaultAgent = getConfiguredDefaultAgent(params.config);
|
||||
|
||||
const configAgent = params.config.agent as AgentConfigRecord | undefined;
|
||||
|
||||
if (isSisyphusEnabled && builtinAgents.sisyphus) {
|
||||
if (configuredDefaultAgent) {
|
||||
(params.config as { default_agent?: string }).default_agent =
|
||||
@@ -168,6 +201,7 @@ export async function applyAgentConfig(params: {
|
||||
pluginPrometheusOverride: prometheusOverride,
|
||||
userCategories: params.pluginConfig.categories,
|
||||
currentModel,
|
||||
customAgentSummaries,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -203,9 +237,9 @@ export async function applyAgentConfig(params: {
|
||||
...Object.fromEntries(
|
||||
Object.entries(builtinAgents).filter(([key]) => key !== "sisyphus"),
|
||||
),
|
||||
...filterDisabledAgents(userAgents),
|
||||
...filterDisabledAgents(projectAgents),
|
||||
...filterDisabledAgents(pluginAgents),
|
||||
...filteredUserAgents,
|
||||
...filteredProjectAgents,
|
||||
...filteredPluginAgents,
|
||||
...filteredConfigAgents,
|
||||
build: { ...migratedBuild, mode: "subagent", hidden: true },
|
||||
...(planDemoteConfig ? { plan: planDemoteConfig } : {}),
|
||||
@@ -213,13 +247,31 @@ export async function applyAgentConfig(params: {
|
||||
} else {
|
||||
params.config.agent = {
|
||||
...builtinAgents,
|
||||
...filterDisabledAgents(userAgents),
|
||||
...filterDisabledAgents(projectAgents),
|
||||
...filterDisabledAgents(pluginAgents),
|
||||
...filteredUserAgents,
|
||||
...filteredProjectAgents,
|
||||
...filteredPluginAgents,
|
||||
...configAgent,
|
||||
};
|
||||
}
|
||||
|
||||
if (params.config.agent) {
|
||||
const builtinOverrideKeys = new Set([
|
||||
...Object.keys(builtinAgents).map((key) => key.toLowerCase()),
|
||||
"build",
|
||||
"plan",
|
||||
"sisyphus-junior",
|
||||
"opencode-builder",
|
||||
])
|
||||
|
||||
applyCustomAgentOverrides({
|
||||
mergedAgents: params.config.agent as Record<string, unknown>,
|
||||
userOverrides: params.pluginConfig.custom_agents,
|
||||
builtinOverrideKeys,
|
||||
mergedCategories,
|
||||
directory: params.ctx.directory,
|
||||
})
|
||||
}
|
||||
|
||||
if (params.config.agent) {
|
||||
params.config.agent = remapAgentKeysToDisplayNames(
|
||||
params.config.agent as Record<string, unknown>,
|
||||
|
||||
@@ -162,6 +162,347 @@ describe("Sisyphus-Junior model inheritance", () => {
|
||||
})
|
||||
})
|
||||
|
||||
describe("custom agent overrides", () => {
|
||||
test("passes custom agent summaries into builtin agent prompt builder", async () => {
|
||||
// #given
|
||||
;(agentLoader.loadUserAgents as any).mockReturnValue({
|
||||
translator: {
|
||||
name: "translator",
|
||||
mode: "subagent",
|
||||
description: "Translate and localize text",
|
||||
prompt: "Translate content",
|
||||
},
|
||||
})
|
||||
const createBuiltinAgentsMock = agents.createBuiltinAgents as unknown as {
|
||||
mock: { calls: unknown[][] }
|
||||
}
|
||||
|
||||
const pluginConfig: OhMyOpenCodeConfig = {
|
||||
sisyphus_agent: {
|
||||
planner_enabled: true,
|
||||
},
|
||||
}
|
||||
const config: Record<string, unknown> = {
|
||||
model: "anthropic/claude-opus-4-6",
|
||||
agent: {},
|
||||
}
|
||||
|
||||
const handler = createConfigHandler({
|
||||
ctx: { directory: "/tmp" },
|
||||
pluginConfig,
|
||||
modelCacheState: {
|
||||
anthropicContext1MEnabled: false,
|
||||
modelContextLimitsCache: new Map(),
|
||||
},
|
||||
})
|
||||
|
||||
// #when
|
||||
await handler(config)
|
||||
|
||||
// #then
|
||||
const firstCallArgs = createBuiltinAgentsMock.mock.calls[0]
|
||||
expect(firstCallArgs).toBeDefined()
|
||||
expect(Array.isArray(firstCallArgs[7])).toBe(true)
|
||||
expect(firstCallArgs[7]).toEqual(
|
||||
expect.arrayContaining([
|
||||
expect.objectContaining({
|
||||
name: "translator",
|
||||
description: "Translate and localize text",
|
||||
}),
|
||||
]),
|
||||
)
|
||||
})
|
||||
|
||||
test("applies oh-my-opencode agent overrides to custom Claude agents", async () => {
|
||||
// #given
|
||||
;(agentLoader.loadUserAgents as any).mockReturnValue({
|
||||
translator: {
|
||||
name: "translator",
|
||||
mode: "subagent",
|
||||
description: "(user) translator",
|
||||
prompt: "Base translator prompt",
|
||||
},
|
||||
})
|
||||
|
||||
const pluginConfig: OhMyOpenCodeConfig = {
|
||||
custom_agents: {
|
||||
translator: {
|
||||
model: "google/gemini-3-flash-preview",
|
||||
temperature: 0,
|
||||
prompt_append: "Always preserve placeholders exactly.",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
const config: Record<string, unknown> = {
|
||||
model: "anthropic/claude-opus-4-6",
|
||||
agent: {},
|
||||
}
|
||||
|
||||
const handler = createConfigHandler({
|
||||
ctx: { directory: "/tmp" },
|
||||
pluginConfig,
|
||||
modelCacheState: {
|
||||
anthropicContext1MEnabled: false,
|
||||
modelContextLimitsCache: new Map(),
|
||||
},
|
||||
})
|
||||
|
||||
// #when
|
||||
await handler(config)
|
||||
|
||||
// #then
|
||||
const agentConfig = config.agent as Record<string, { model?: string; temperature?: number; prompt?: string }>
|
||||
expect(agentConfig.translator).toBeDefined()
|
||||
expect(agentConfig.translator.model).toBe("google/gemini-3-flash-preview")
|
||||
expect(agentConfig.translator.temperature).toBe(0)
|
||||
expect(agentConfig.translator.prompt).toContain("Base translator prompt")
|
||||
expect(agentConfig.translator.prompt).toContain("Always preserve placeholders exactly.")
|
||||
})
|
||||
|
||||
test("prometheus prompt includes custom agent catalog for planning", async () => {
|
||||
// #given
|
||||
;(agentLoader.loadUserAgents as any).mockReturnValue({
|
||||
translator: {
|
||||
name: "translator",
|
||||
mode: "subagent",
|
||||
description: "Translate and localize locale files",
|
||||
prompt: "Translate content",
|
||||
},
|
||||
})
|
||||
|
||||
const pluginConfig: OhMyOpenCodeConfig = {
|
||||
sisyphus_agent: {
|
||||
planner_enabled: true,
|
||||
},
|
||||
}
|
||||
const config: Record<string, unknown> = {
|
||||
model: "anthropic/claude-opus-4-6",
|
||||
agent: {},
|
||||
}
|
||||
|
||||
const handler = createConfigHandler({
|
||||
ctx: { directory: "/tmp" },
|
||||
pluginConfig,
|
||||
modelCacheState: {
|
||||
anthropicContext1MEnabled: false,
|
||||
modelContextLimitsCache: new Map(),
|
||||
},
|
||||
})
|
||||
|
||||
// #when
|
||||
await handler(config)
|
||||
|
||||
// #then
|
||||
const agentsConfig = config.agent as Record<string, { prompt?: string }>
|
||||
const pKey = getAgentDisplayName("prometheus")
|
||||
expect(agentsConfig[pKey]).toBeDefined()
|
||||
expect(agentsConfig[pKey].prompt).toContain("<custom_agent_catalog>")
|
||||
expect(agentsConfig[pKey].prompt).toContain("translator")
|
||||
expect(agentsConfig[pKey].prompt).toContain("Translate and localize locale files")
|
||||
})
|
||||
|
||||
test("prometheus prompt excludes unknown custom_agents entries", async () => {
|
||||
// #given
|
||||
;(agentLoader.loadUserAgents as any).mockReturnValue({
|
||||
translator: {
|
||||
name: "translator",
|
||||
mode: "subagent",
|
||||
description: "Translate and localize locale files",
|
||||
prompt: "Translate content",
|
||||
},
|
||||
})
|
||||
|
||||
const pluginConfig: OhMyOpenCodeConfig = {
|
||||
custom_agents: {
|
||||
translator: {
|
||||
description: "Translate and localize locale files",
|
||||
},
|
||||
ghostwriter: {
|
||||
description: "This agent does not exist in runtime",
|
||||
},
|
||||
},
|
||||
sisyphus_agent: {
|
||||
planner_enabled: true,
|
||||
},
|
||||
}
|
||||
|
||||
const config: Record<string, unknown> = {
|
||||
model: "anthropic/claude-opus-4-6",
|
||||
agent: {},
|
||||
}
|
||||
|
||||
const handler = createConfigHandler({
|
||||
ctx: { directory: "/tmp" },
|
||||
pluginConfig,
|
||||
modelCacheState: {
|
||||
anthropicContext1MEnabled: false,
|
||||
modelContextLimitsCache: new Map(),
|
||||
},
|
||||
})
|
||||
|
||||
// #when
|
||||
await handler(config)
|
||||
|
||||
// #then
|
||||
const agentsConfig = config.agent as Record<string, { prompt?: string }>
|
||||
const pKey = getAgentDisplayName("prometheus")
|
||||
expect(agentsConfig[pKey]).toBeDefined()
|
||||
expect(agentsConfig[pKey].prompt).toContain("translator")
|
||||
expect(agentsConfig[pKey].prompt).not.toContain("ghostwriter")
|
||||
})
|
||||
|
||||
test("prometheus prompt excludes disabled custom agents from catalog", async () => {
|
||||
// #given
|
||||
;(agentLoader.loadUserAgents as any).mockReturnValue({
|
||||
translator: {
|
||||
name: "translator",
|
||||
mode: "subagent",
|
||||
description: "Translate and localize locale files",
|
||||
prompt: "Translate content",
|
||||
},
|
||||
})
|
||||
|
||||
const pluginConfig: OhMyOpenCodeConfig = {
|
||||
disabled_agents: ["translator"],
|
||||
sisyphus_agent: {
|
||||
planner_enabled: true,
|
||||
},
|
||||
}
|
||||
const config: Record<string, unknown> = {
|
||||
model: "anthropic/claude-opus-4-6",
|
||||
agent: {},
|
||||
}
|
||||
|
||||
const handler = createConfigHandler({
|
||||
ctx: { directory: "/tmp" },
|
||||
pluginConfig,
|
||||
modelCacheState: {
|
||||
anthropicContext1MEnabled: false,
|
||||
modelContextLimitsCache: new Map(),
|
||||
},
|
||||
})
|
||||
|
||||
// #when
|
||||
await handler(config)
|
||||
|
||||
// #then
|
||||
const agentsConfig = config.agent as Record<string, { prompt?: string }>
|
||||
const pKey = getAgentDisplayName("prometheus")
|
||||
expect(agentsConfig[pKey]).toBeDefined()
|
||||
expect(agentsConfig[pKey].prompt).not.toContain("translator")
|
||||
})
|
||||
|
||||
test("prometheus custom prompt override still includes custom agent catalog", async () => {
|
||||
// #given
|
||||
;(agentLoader.loadUserAgents as any).mockReturnValue({
|
||||
translator: {
|
||||
name: "translator",
|
||||
mode: "subagent",
|
||||
description: "Translate and localize locale files",
|
||||
prompt: "Translate content",
|
||||
},
|
||||
})
|
||||
|
||||
const pluginConfig: OhMyOpenCodeConfig = {
|
||||
agents: {
|
||||
prometheus: {
|
||||
prompt: "Custom planner prompt",
|
||||
},
|
||||
},
|
||||
sisyphus_agent: {
|
||||
planner_enabled: true,
|
||||
},
|
||||
}
|
||||
const config: Record<string, unknown> = {
|
||||
model: "anthropic/claude-opus-4-6",
|
||||
agent: {},
|
||||
}
|
||||
|
||||
const handler = createConfigHandler({
|
||||
ctx: { directory: "/tmp" },
|
||||
pluginConfig,
|
||||
modelCacheState: {
|
||||
anthropicContext1MEnabled: false,
|
||||
modelContextLimitsCache: new Map(),
|
||||
},
|
||||
})
|
||||
|
||||
// #when
|
||||
await handler(config)
|
||||
|
||||
// #then
|
||||
const agentsConfig = config.agent as Record<string, { prompt?: string }>
|
||||
const pKey = getAgentDisplayName("prometheus")
|
||||
expect(agentsConfig[pKey]).toBeDefined()
|
||||
expect(agentsConfig[pKey].prompt).toContain("Custom planner prompt")
|
||||
expect(agentsConfig[pKey].prompt).toContain("<custom_agent_catalog>")
|
||||
expect(agentsConfig[pKey].prompt).toContain("translator")
|
||||
})
|
||||
|
||||
test("custom agent summary merge preserves flags when custom_agents adds description", async () => {
|
||||
// #given
|
||||
;(agentLoader.loadUserAgents as any).mockReturnValue({
|
||||
translator: {
|
||||
name: "translator",
|
||||
mode: "subagent",
|
||||
description: "",
|
||||
hidden: true,
|
||||
disabled: true,
|
||||
enabled: false,
|
||||
prompt: "Translate content",
|
||||
},
|
||||
})
|
||||
const createBuiltinAgentsMock = agents.createBuiltinAgents as unknown as {
|
||||
mock: { calls: unknown[][] }
|
||||
}
|
||||
|
||||
const pluginConfig: OhMyOpenCodeConfig = {
|
||||
custom_agents: {
|
||||
translator: {
|
||||
description: "Translate and localize locale files",
|
||||
},
|
||||
},
|
||||
sisyphus_agent: {
|
||||
planner_enabled: true,
|
||||
},
|
||||
}
|
||||
const config: Record<string, unknown> = {
|
||||
model: "anthropic/claude-opus-4-6",
|
||||
agent: {},
|
||||
}
|
||||
|
||||
const handler = createConfigHandler({
|
||||
ctx: { directory: "/tmp" },
|
||||
pluginConfig,
|
||||
modelCacheState: {
|
||||
anthropicContext1MEnabled: false,
|
||||
modelContextLimitsCache: new Map(),
|
||||
},
|
||||
})
|
||||
|
||||
// #when
|
||||
await handler(config)
|
||||
|
||||
// #then
|
||||
const firstCallArgs = createBuiltinAgentsMock.mock.calls[0]
|
||||
const summaries = firstCallArgs[7] as Array<{
|
||||
name: string
|
||||
description: string
|
||||
hidden?: boolean
|
||||
disabled?: boolean
|
||||
enabled?: boolean
|
||||
}>
|
||||
const translatorSummary = summaries.find((summary) => summary.name === "translator")
|
||||
|
||||
expect(translatorSummary).toBeDefined()
|
||||
expect(translatorSummary?.description).toBe("Translate and localize locale files")
|
||||
expect(translatorSummary?.hidden).toBe(true)
|
||||
expect(translatorSummary?.disabled).toBe(true)
|
||||
expect(translatorSummary?.enabled).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
describe("Plan agent demote behavior", () => {
|
||||
test("orders core agents as sisyphus -> hephaestus -> prometheus -> atlas", async () => {
|
||||
// #given
|
||||
|
||||
@@ -0,0 +1,142 @@
|
||||
import type { AgentConfig } from "@opencode-ai/sdk";
|
||||
import { applyOverrides } from "../agents/builtin-agents/agent-overrides";
|
||||
import type { AgentOverrideConfig } from "../agents/types";
|
||||
import type { OhMyOpenCodeConfig } from "../config";
|
||||
import { getAgentConfigKey } from "../shared/agent-display-names";
|
||||
import { AGENT_NAME_MAP } from "../shared/migration";
|
||||
import { mergeCategories } from "../shared/merge-categories";
|
||||
|
||||
const RESERVED_AGENT_KEYS = new Set(
|
||||
[
|
||||
"build",
|
||||
"plan",
|
||||
"sisyphus-junior",
|
||||
"opencode-builder",
|
||||
...Object.keys(AGENT_NAME_MAP),
|
||||
...Object.values(AGENT_NAME_MAP),
|
||||
].map((key) => getAgentConfigKey(key).toLowerCase()),
|
||||
);
|
||||
|
||||
export type AgentSummary = {
|
||||
name: string;
|
||||
description: string;
|
||||
hidden?: boolean;
|
||||
disabled?: boolean;
|
||||
enabled?: boolean;
|
||||
};
|
||||
|
||||
export function applyCustomAgentOverrides(params: {
|
||||
mergedAgents: Record<string, unknown>;
|
||||
userOverrides: OhMyOpenCodeConfig["custom_agents"] | undefined;
|
||||
builtinOverrideKeys: Set<string>;
|
||||
mergedCategories: ReturnType<typeof mergeCategories>;
|
||||
directory: string;
|
||||
}): void {
|
||||
if (!params.userOverrides) return;
|
||||
|
||||
for (const [overrideKey, override] of Object.entries(params.userOverrides)) {
|
||||
if (!override) continue;
|
||||
|
||||
const normalizedOverrideKey = getAgentConfigKey(overrideKey).toLowerCase();
|
||||
if (params.builtinOverrideKeys.has(normalizedOverrideKey)) continue;
|
||||
|
||||
const existingKey = Object.keys(params.mergedAgents).find(
|
||||
(key) => key.toLowerCase() === overrideKey.toLowerCase() || key.toLowerCase() === normalizedOverrideKey,
|
||||
);
|
||||
if (!existingKey) continue;
|
||||
|
||||
const existingAgent = params.mergedAgents[existingKey];
|
||||
if (!existingAgent || typeof existingAgent !== "object") continue;
|
||||
|
||||
params.mergedAgents[existingKey] = applyOverrides(
|
||||
existingAgent as AgentConfig,
|
||||
override as AgentOverrideConfig,
|
||||
params.mergedCategories,
|
||||
params.directory,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export function collectCustomAgentSummariesFromRecord(
|
||||
agents: Record<string, unknown> | undefined,
|
||||
): AgentSummary[] {
|
||||
if (!agents) return [];
|
||||
|
||||
const summaries: AgentSummary[] = [];
|
||||
for (const [name, value] of Object.entries(agents)) {
|
||||
const normalizedName = getAgentConfigKey(name).toLowerCase();
|
||||
if (RESERVED_AGENT_KEYS.has(normalizedName)) continue;
|
||||
if (!value || typeof value !== "object") continue;
|
||||
|
||||
const agentValue = value as Record<string, unknown>;
|
||||
const description = typeof agentValue.description === "string" ? agentValue.description : "";
|
||||
|
||||
summaries.push({
|
||||
name,
|
||||
description,
|
||||
hidden: typeof agentValue.hidden === "boolean" ? agentValue.hidden : undefined,
|
||||
disabled: typeof agentValue.disabled === "boolean" ? agentValue.disabled : undefined,
|
||||
enabled: typeof agentValue.enabled === "boolean" ? agentValue.enabled : undefined,
|
||||
});
|
||||
}
|
||||
|
||||
return summaries;
|
||||
}
|
||||
|
||||
export function mergeCustomAgentSummaries(...summaryGroups: AgentSummary[][]): AgentSummary[] {
|
||||
const merged = new Map<string, AgentSummary>();
|
||||
|
||||
for (const group of summaryGroups) {
|
||||
for (const summary of group) {
|
||||
const key = summary.name.toLowerCase();
|
||||
if (!merged.has(key)) {
|
||||
merged.set(key, summary);
|
||||
continue;
|
||||
}
|
||||
|
||||
const existing = merged.get(key);
|
||||
if (!existing) continue;
|
||||
|
||||
const existingDescription = existing.description.trim();
|
||||
const incomingDescription = summary.description.trim();
|
||||
|
||||
merged.set(key, {
|
||||
...existing,
|
||||
...summary,
|
||||
hidden: summary.hidden ?? existing.hidden,
|
||||
disabled: summary.disabled ?? existing.disabled,
|
||||
enabled: summary.enabled ?? existing.enabled,
|
||||
description: incomingDescription || existingDescription,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
return Array.from(merged.values());
|
||||
}
|
||||
|
||||
export function collectKnownCustomAgentNames(
|
||||
...agentGroups: Array<Record<string, unknown> | undefined>
|
||||
): Set<string> {
|
||||
const knownNames = new Set<string>();
|
||||
|
||||
for (const group of agentGroups) {
|
||||
if (!group) continue;
|
||||
|
||||
for (const [name, value] of Object.entries(group)) {
|
||||
const normalizedName = getAgentConfigKey(name).toLowerCase();
|
||||
if (RESERVED_AGENT_KEYS.has(normalizedName)) continue;
|
||||
if (!value || typeof value !== "object") continue;
|
||||
|
||||
knownNames.add(normalizedName);
|
||||
}
|
||||
}
|
||||
|
||||
return knownNames;
|
||||
}
|
||||
|
||||
export function filterSummariesByKnownNames(
|
||||
summaries: AgentSummary[],
|
||||
knownNames: Set<string>,
|
||||
): AgentSummary[] {
|
||||
return summaries.filter((summary) => knownNames.has(summary.name.toLowerCase()));
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
import type { CategoryConfig } from "../config/schema";
|
||||
import { PROMETHEUS_PERMISSION, getPrometheusPrompt } from "../agents/prometheus";
|
||||
import { resolvePromptAppend } from "../agents/builtin-agents/resolve-file-uri";
|
||||
import { parseRegisteredAgentSummaries } from "../agents/custom-agent-summaries";
|
||||
import { AGENT_MODEL_REQUIREMENTS } from "../shared/model-requirements";
|
||||
import {
|
||||
fetchAvailableModels,
|
||||
@@ -27,6 +28,7 @@ export async function buildPrometheusAgentConfig(params: {
|
||||
pluginPrometheusOverride: PrometheusOverride | undefined;
|
||||
userCategories: Record<string, CategoryConfig> | undefined;
|
||||
currentModel: string | undefined;
|
||||
customAgentSummaries?: unknown;
|
||||
}): Promise<Record<string, unknown>> {
|
||||
const categoryConfig = params.pluginPrometheusOverride?.category
|
||||
? resolveCategoryConfig(params.pluginPrometheusOverride.category, params.userCategories)
|
||||
@@ -65,11 +67,18 @@ export async function buildPrometheusAgentConfig(params: {
|
||||
const maxTokensToUse =
|
||||
params.pluginPrometheusOverride?.maxTokens ?? categoryConfig?.maxTokens;
|
||||
|
||||
const customAgentCatalog = parseRegisteredAgentSummaries(params.customAgentSummaries)
|
||||
const customAgentBlock = customAgentCatalog.length > 0
|
||||
? `\n\n<custom_agent_catalog>\nAvailable custom agents for planning/delegation:\n${customAgentCatalog
|
||||
.map((agent) => `- ${agent.name}: ${agent.description || "No description provided"}`)
|
||||
.join("\n")}\n</custom_agent_catalog>`
|
||||
: ""
|
||||
|
||||
const base: Record<string, unknown> = {
|
||||
...(resolvedModel ? { model: resolvedModel } : {}),
|
||||
...(variantToUse ? { variant: variantToUse } : {}),
|
||||
mode: "all",
|
||||
prompt: getPrometheusPrompt(resolvedModel),
|
||||
prompt: getPrometheusPrompt(resolvedModel) + customAgentBlock,
|
||||
permission: PROMETHEUS_PERMISSION,
|
||||
description: `${(params.configAgentPlan?.description as string) ?? "Plan agent"} (Prometheus - OhMyOpenCode)`,
|
||||
color: (params.configAgentPlan?.color as string) ?? "#FF5722",
|
||||
@@ -94,5 +103,12 @@ export async function buildPrometheusAgentConfig(params: {
|
||||
if (prompt_append && typeof merged.prompt === "string") {
|
||||
merged.prompt = merged.prompt + "\n" + resolvePromptAppend(prompt_append);
|
||||
}
|
||||
if (
|
||||
customAgentBlock
|
||||
&& typeof merged.prompt === "string"
|
||||
&& !merged.prompt.includes("<custom_agent_catalog>")
|
||||
) {
|
||||
merged.prompt = merged.prompt + customAgentBlock;
|
||||
}
|
||||
return merged;
|
||||
}
|
||||
|
||||
@@ -99,9 +99,9 @@ export function applyToolConfig(params: {
|
||||
}
|
||||
|
||||
params.config.permission = {
|
||||
...(params.config.permission as Record<string, unknown>),
|
||||
webfetch: "allow",
|
||||
external_directory: "allow",
|
||||
...(params.config.permission as Record<string, unknown>),
|
||||
task: "deny",
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# src/plugin/ — 8 OpenCode Hook Handlers + Hook Composition
|
||||
|
||||
**Generated:** 2026-02-24
|
||||
**Generated:** 2026-03-02
|
||||
|
||||
## OVERVIEW
|
||||
|
||||
|
||||
@@ -106,4 +106,41 @@ describe("createChatHeadersHandler", () => {
|
||||
|
||||
expect(output.headers["x-initiator"]).toBeUndefined()
|
||||
})
|
||||
|
||||
test("skips x-initiator override when model uses @ai-sdk/github-copilot", async () => {
|
||||
const handler = createChatHeadersHandler({
|
||||
ctx: {
|
||||
client: {
|
||||
session: {
|
||||
message: async () => ({
|
||||
data: {
|
||||
parts: [
|
||||
{
|
||||
type: "text",
|
||||
text: `notification\n${OMO_INTERNAL_INITIATOR_MARKER}`,
|
||||
},
|
||||
],
|
||||
},
|
||||
}),
|
||||
},
|
||||
},
|
||||
} as never,
|
||||
})
|
||||
const output: { headers: Record<string, string> } = { headers: {} }
|
||||
|
||||
await handler(
|
||||
{
|
||||
sessionID: "ses_4",
|
||||
provider: { id: "github-copilot" },
|
||||
model: { api: { npm: "@ai-sdk/github-copilot" } },
|
||||
message: {
|
||||
id: "msg_4",
|
||||
role: "user",
|
||||
},
|
||||
},
|
||||
output,
|
||||
)
|
||||
|
||||
expect(output.headers["x-initiator"]).toBeUndefined()
|
||||
})
|
||||
})
|
||||
|
||||
@@ -123,6 +123,17 @@ export function createChatHeadersHandler(args: { ctx: PluginContext }): (input:
|
||||
if (!isChatHeadersOutput(output)) return
|
||||
|
||||
if (!isCopilotProvider(normalizedInput.provider.id)) return
|
||||
|
||||
// Do not override x-initiator when @ai-sdk/github-copilot is active.
|
||||
// OpenCode's copilot fetch wrapper already sets x-initiator based on
|
||||
// the actual request body content. Overriding it here causes a mismatch
|
||||
// that the Copilot API rejects with "invalid initiator".
|
||||
const model = isRecord(input) && isRecord((input as Record<string, unknown>).model)
|
||||
? (input as Record<string, unknown>).model as Record<string, unknown>
|
||||
: undefined
|
||||
const api = model && isRecord(model.api) ? model.api as Record<string, unknown> : undefined
|
||||
if (api?.npm === "@ai-sdk/github-copilot") return
|
||||
|
||||
if (!(await isOmoInternalMessage(normalizedInput, ctx.client))) return
|
||||
|
||||
output.headers["x-initiator"] = "agent"
|
||||
|
||||
@@ -111,6 +111,7 @@ export function createContinuationHooks(args: {
|
||||
isContinuationStopped: (sessionID: string) =>
|
||||
stopContinuationGuard?.isStopped(sessionID) ?? false,
|
||||
agentOverrides: pluginConfig.agents,
|
||||
autoCommit: pluginConfig.start_work?.auto_commit,
|
||||
}))
|
||||
: null
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import type { AvailableSkill } from "../../agents/dynamic-agent-prompt-builder"
|
||||
import type { HookName } from "../../config"
|
||||
import type { HookName, OhMyOpenCodeConfig } from "../../config"
|
||||
import type { LoadedSkill } from "../../features/opencode-skill-loader/types"
|
||||
import type { PluginContext } from "../types"
|
||||
|
||||
@@ -13,12 +13,20 @@ export type SkillHooks = {
|
||||
|
||||
export function createSkillHooks(args: {
|
||||
ctx: PluginContext
|
||||
pluginConfig: OhMyOpenCodeConfig
|
||||
isHookEnabled: (hookName: HookName) => boolean
|
||||
safeHookEnabled: boolean
|
||||
mergedSkills: LoadedSkill[]
|
||||
availableSkills: AvailableSkill[]
|
||||
}): SkillHooks {
|
||||
const { ctx, isHookEnabled, safeHookEnabled, mergedSkills, availableSkills } = args
|
||||
const {
|
||||
ctx,
|
||||
pluginConfig,
|
||||
isHookEnabled,
|
||||
safeHookEnabled,
|
||||
mergedSkills,
|
||||
availableSkills,
|
||||
} = args
|
||||
|
||||
const safeHook = <T>(hookName: HookName, factory: () => T): T | null =>
|
||||
safeCreateHook(hookName, factory, { enabled: safeHookEnabled })
|
||||
@@ -30,7 +38,11 @@ export function createSkillHooks(args: {
|
||||
|
||||
const autoSlashCommand = isHookEnabled("auto-slash-command")
|
||||
? safeHook("auto-slash-command", () =>
|
||||
createAutoSlashCommandHook({ skills: mergedSkills }))
|
||||
createAutoSlashCommandHook({
|
||||
skills: mergedSkills,
|
||||
pluginsEnabled: pluginConfig.claude_code?.plugins ?? true,
|
||||
enabledPluginsOverride: pluginConfig.claude_code?.plugins_override,
|
||||
}))
|
||||
: null
|
||||
|
||||
return { categorySkillReminder, autoSlashCommand }
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user