Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Add to your OpenCode config:
```jsonc
// opencode.jsonc
{
"plugin": ["@tarquinen/[email protected].25"]
"plugin": ["@tarquinen/[email protected].26"]
}
```

Expand Down
40 changes: 29 additions & 11 deletions lib/janitor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,13 @@ export class Janitor {
private workingDirectory?: string
) { }

private async sendIgnoredMessage(sessionID: string, text: string) {
private async sendIgnoredMessage(sessionID: string, text: string, agent?: string) {
try {
await this.client.session.prompt({
path: { id: sessionID },
body: {
noReply: true,
agent: agent,
parts: [{
type: 'text',
text: text,
Expand Down Expand Up @@ -96,6 +97,18 @@ export class Janitor {
return null
}

// Extract the current agent from the last user message to preserve agent context
// Following the same pattern as OpenCode's server.ts
let currentAgent: string | undefined = undefined
for (let i = messages.length - 1; i >= 0; i--) {
const msg = messages[i]
const info = msg.info
if (info?.role === 'user') {
currentAgent = info.agent || 'build'
break
}
}

const toolCallIds: string[] = []
const toolOutputs = new Map<string, string>()
const toolMetadata = new Map<string, { tool: string, parameters?: any }>()
Expand Down Expand Up @@ -299,15 +312,17 @@ export class Janitor {
expandedLlmPrunedIds,
toolMetadata,
tokensSaved,
sessionStats
sessionStats,
currentAgent
)
} else {
await this.sendAutoModeNotification(
sessionID,
deduplicatedIds,
deduplicationDetails,
tokensSaved,
sessionStats
sessionStats,
currentAgent
)
}

Expand Down Expand Up @@ -534,7 +549,8 @@ export class Janitor {
sessionID: string,
totalPruned: number,
tokensSaved: number,
sessionStats: SessionStats
sessionStats: SessionStats,
agent?: string
) {
if (totalPruned === 0) return

Expand All @@ -547,21 +563,22 @@ export class Janitor {
message += ` │ Session: ~${formatTokenCount(sessionStats.totalTokensSaved)} tokens, ${sessionStats.totalToolsPruned} tools`
}

await this.sendIgnoredMessage(sessionID, message)
await this.sendIgnoredMessage(sessionID, message, agent)
}

private async sendAutoModeNotification(
sessionID: string,
deduplicatedIds: string[],
deduplicationDetails: Map<string, any>,
tokensSaved: number,
sessionStats: SessionStats
sessionStats: SessionStats,
agent?: string
) {
if (deduplicatedIds.length === 0) return
if (this.pruningSummary === 'off') return

if (this.pruningSummary === 'minimal') {
await this.sendMinimalNotification(sessionID, deduplicatedIds.length, tokensSaved, sessionStats)
await this.sendMinimalNotification(sessionID, deduplicatedIds.length, tokensSaved, sessionStats, agent)
return
}

Expand Down Expand Up @@ -590,7 +607,7 @@ export class Janitor {
}
}

await this.sendIgnoredMessage(sessionID, message.trim())
await this.sendIgnoredMessage(sessionID, message.trim(), agent)
}

formatPruningResultForTool(result: PruningResult): string {
Expand Down Expand Up @@ -621,14 +638,15 @@ export class Janitor {
llmPrunedIds: string[],
toolMetadata: Map<string, any>,
tokensSaved: number,
sessionStats: SessionStats
sessionStats: SessionStats,
agent?: string
) {
const totalPruned = deduplicatedIds.length + llmPrunedIds.length
if (totalPruned === 0) return
if (this.pruningSummary === 'off') return

if (this.pruningSummary === 'minimal') {
await this.sendMinimalNotification(sessionID, totalPruned, tokensSaved, sessionStats)
await this.sendMinimalNotification(sessionID, totalPruned, tokensSaved, sessionStats, agent)
return
}

Expand Down Expand Up @@ -680,6 +698,6 @@ export class Janitor {
}
}

await this.sendIgnoredMessage(sessionID, message.trim())
await this.sendIgnoredMessage(sessionID, message.trim(), agent)
}
}
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://json.schemastore.org/package.json",
"name": "@tarquinen/opencode-dcp",
"version": "0.3.25",
"version": "0.3.26",
"type": "module",
"description": "OpenCode plugin that optimizes token usage by pruning obsolete tool outputs from conversation context",
"main": "./dist/index.js",
Expand Down