Skip to content

fix: resolve all test failures from fork restructure #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kulvirgit wants to merge 1 commit into from
Closed

fix: resolve all test failures from fork restructure #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
122 changes: 120 additions & 2 deletions packages/opencode/src/acp/agent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ export namespace ACP {
private eventAbort = new AbortController()
private eventStarted = false
private permissionQueues = new Map<string, Promise<void>>()
private seenTools = new Set<string>()
private bashSnapshots = new Map<string, string>()
private permissionOptions: PermissionOption[] = [
{ optionId: "once", kind: "allow_once", name: "Allow once" },
{ optionId: "always", kind: "allow_always", name: "Always allow" },
Expand Down Expand Up @@ -288,6 +290,8 @@ export namespace ACP {
if (part.type === "tool") {
switch (part.state.status) {
case "pending":
this.seenTools.add(part.callID)
this.bashSnapshots.delete(part.callID)
await this.connection
.sessionUpdate({
sessionId,
Expand All @@ -306,7 +310,62 @@ export namespace ACP {
})
return

case "running":
case "running": {
// Emit synthetic pending if we haven't seen this tool yet
if (!this.seenTools.has(part.callID)) {
this.seenTools.add(part.callID)
await this.connection
.sessionUpdate({
sessionId,
update: {
sessionUpdate: "tool_call",
toolCallId: part.callID,
title: part.tool,
kind: toToolKind(part.tool),
status: "pending",
locations: [],
rawInput: {},
},
})
.catch((error) => {
log.error("failed to send synthetic tool pending to ACP", { error })
})
}

// Extract bash output from metadata for streaming
const metadata = part.state.metadata as Record<string, unknown> | undefined
const bashOutput = metadata && typeof metadata.output === "string" ? metadata.output : undefined
const content: ToolCallContent[] = []

if (bashOutput !== undefined) {
const lastSnapshot = this.bashSnapshots.get(part.callID)
if (lastSnapshot === bashOutput) {
// De-duplicate: identical to last snapshot, send update without content
await this.connection
.sessionUpdate({
sessionId,
update: {
sessionUpdate: "tool_call_update",
toolCallId: part.callID,
status: "in_progress",
kind: toToolKind(part.tool),
title: part.tool,
locations: toLocations(part.tool, part.state.input),
rawInput: part.state.input,
},
})
.catch((error) => {
log.error("failed to send tool in_progress to ACP", { error })
})
return
}
this.bashSnapshots.set(part.callID, bashOutput)
content.push({
type: "content",
content: { type: "text", text: bashOutput },
})
}

await this.connection
.sessionUpdate({
sessionId,
Expand All @@ -318,12 +377,14 @@ export namespace ACP {
title: part.tool,
locations: toLocations(part.tool, part.state.input),
rawInput: part.state.input,
...(content.length > 0 && { content }),
},
})
.catch((error) => {
log.error("failed to send tool in_progress to ACP", { error })
})
return
}

case "completed": {
const kind = toToolKind(part.tool)
Expand Down Expand Up @@ -802,6 +863,8 @@ export namespace ACP {
if (part.type === "tool") {
switch (part.state.status) {
case "pending":
this.seenTools.add(part.callID)
this.bashSnapshots.delete(part.callID)
await this.connection
.sessionUpdate({
sessionId,
Expand All @@ -819,7 +882,60 @@ export namespace ACP {
log.error("failed to send tool pending to ACP", { error: err })
})
break
case "running":
case "running": {
// Emit synthetic pending if we haven't seen this tool yet
if (!this.seenTools.has(part.callID)) {
this.seenTools.add(part.callID)
await this.connection
.sessionUpdate({
sessionId,
update: {
sessionUpdate: "tool_call",
toolCallId: part.callID,
title: part.tool,
kind: toToolKind(part.tool),
status: "pending",
locations: [],
rawInput: {},
},
})
.catch((err) => {
log.error("failed to send synthetic tool pending to ACP", { error: err })
})
}

const metadata = part.state.metadata as Record<string, unknown> | undefined
const bashOutput = metadata && typeof metadata.output === "string" ? metadata.output : undefined
const content: ToolCallContent[] = []

if (bashOutput !== undefined) {
const lastSnapshot = this.bashSnapshots.get(part.callID)
if (lastSnapshot === bashOutput) {
await this.connection
.sessionUpdate({
sessionId,
update: {
sessionUpdate: "tool_call_update",
toolCallId: part.callID,
status: "in_progress",
kind: toToolKind(part.tool),
title: part.tool,
locations: toLocations(part.tool, part.state.input),
rawInput: part.state.input,
},
})
.catch((err) => {
log.error("failed to send tool in_progress to ACP", { error: err })
})
break
}
this.bashSnapshots.set(part.callID, bashOutput)
content.push({
type: "content",
content: { type: "text", text: bashOutput },
})
}

await this.connection
.sessionUpdate({
sessionId,
Expand All @@ -831,12 +947,14 @@ export namespace ACP {
title: part.tool,
locations: toLocations(part.tool, part.state.input),
rawInput: part.state.input,
...(content.length > 0 && { content }),
},
})
.catch((err) => {
log.error("failed to send tool in_progress to ACP", { error: err })
})
break
}
case "completed":
const kind = toToolKind(part.tool)
const content: ToolCallContent[] = [
Expand Down
2 changes: 2 additions & 0 deletions packages/opencode/src/provider/error.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ export namespace ProviderError {
/exceeded model token limit/i, // Kimi For Coding, Moonshot
/context[_ ]length[_ ]exceeded/i, // Generic fallback
/request entity too large/i, // HTTP 413
/the request was too long/i, // Azure OpenAI
/maximum tokens for requested operation/i, // Azure OpenAI
]

function isOpenAiErrorRetryable(e: APICallError) {
Expand Down
4 changes: 2 additions & 2 deletions packages/opencode/test/acp/event-subscription.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,8 @@ function createFakeAgent() {
return {
data: [
{
name: "build",
description: "build",
name: "builder",
description: "builder",
mode: "agent",
},
],
Expand Down
Loading
Loading