soraacode 0.1.7 → 0.2.1

package/src/acp/event.ts

@@ -1,421 +0,0 @@
-import type { AgentSideConnection } from "@agentclientprotocol/sdk"
-import type {
-  Event,
-  EventMessagePartDelta,
-  EventMessagePartUpdated,
-  OpencodeClient,
-  Part,
-  SessionMessageResponse,
-  ToolPart,
-} from "@soraacode/sdk/v2"
-import { Effect } from "effect"
-import { ACPSession } from "./session"
-import { ACPPermission } from "./permission"
-import { partsToContentChunks, type ReplayPart } from "./content"
-import {
-  duplicateRunningToolUpdate,
-  errorToolUpdate,
-  pendingToolCall,
-  runningToolUpdate,
-  shellOutputSnapshot,
-  completedToolUpdate,
-} from "./tool"
-
-type Connection = Pick<AgentSideConnection, "sessionUpdate"> &
-  Partial<Pick<AgentSideConnection, "requestPermission" | "writeTextFile">>
-type GlobalEventEnvelope = {
-  payload?: Event
-}
-type GlobalEventStream = {
-  stream: AsyncIterable<GlobalEventEnvelope>
-}
-
-export function start(input: { sdk: OpencodeClient; connection: Connection; session: ACPSession.Interface }) {
-  const subscription = new Subscription(input)
-  subscription.start()
-  return subscription
-}
-
-export class Subscription {
-  private readonly abort = new AbortController()
-  private readonly shellSnapshots = new Map<string, string>()
-  private readonly toolStarts = new Set<string>()
-  private readonly connectionWaiters = new Set<() => void>()
-  private readonly idleWaiters = new Map<string, Set<ReturnType<typeof signal>>>()
-  private readonly permission: ACPPermission.Handler
-  private connected = false
-  private started = false
-
-  constructor(
-    private readonly input: {
-      sdk: OpencodeClient
-      connection: Connection
-      session: ACPSession.Interface
-    },
-  ) {
-    this.permission = new ACPPermission.Handler(input)
-  }
-
-  start() {
-    if (this.started) return
-    this.started = true
-    this.run().catch(() => {
-      if (this.abort.signal.aborted) return
-    })
-  }
-
-  stop() {
-    this.abort.abort()
-    this.disconnected()
-    for (const resolve of this.connectionWaiters) resolve()
-    this.connectionWaiters.clear()
-  }
-
-  async runUntilIdle<A>(sessionId: string, request: () => Promise<A>) {
-    await this.waitUntilConnected()
-    const waiter = signal()
-    const waiters = this.idleWaiters.get(sessionId) ?? new Set()
-    waiters.add(waiter)
-    this.idleWaiters.set(sessionId, waiters)
-
-    try {
-      // Idle is queued after the turn's events, and this subscription awaits each update in order.
-      void waiter.promise.catch(() => {})
-      const response = await request()
-      await waiter.promise
-      return response
-    } finally {
-      waiters.delete(waiter)
-      if (waiters.size === 0) this.idleWaiters.delete(sessionId)
-    }
-  }
-
-  async handle(event: Event) {
-    switch (event.type) {
-      case "session.status":
-        if (event.properties.status.type === "idle") this.idle(event.properties.sessionID)
-        return
-      case "permission.asked":
-        this.permission.handle(event)
-        return
-      case "message.part.updated":
-        return this.handlePartUpdated(event)
-      case "message.part.delta":
-        return this.handlePartDelta(event)
-    }
-  }
-
-  async replayMessage(message: SessionMessageResponse) {
-    if (message.info.role !== "assistant" && message.info.role !== "user") return
-
-    const cwd = message.info.role === "assistant" ? message.info.path?.cwd : undefined
-    for (const part of message.parts) {
-      await this.recordFetchedPart(message.info.sessionID, message, part)
-      if (part.type === "tool") {
-        await this.handleToolPart(message.info.sessionID, part, cwd ?? process.cwd())
-        continue
-      }
-      await this.replayContentPart(message, part)
-    }
-  }
-
-  private async replayContentPart(message: SessionMessageResponse, part: Part) {
-    if (part.type !== "text" && part.type !== "file" && part.type !== "reasoning") return
-
-    const sessionUpdate =
-      part.type === "reasoning"
-        ? "agent_thought_chunk"
-        : message.info.role === "user"
-          ? "user_message_chunk"
-          : "agent_message_chunk"
-
-    for (const chunk of partsToContentChunks([part as ReplayPart])) {
-      await this.input.connection.sessionUpdate({
-        sessionId: message.info.sessionID,
-        update: {
-          sessionUpdate,
-          messageId: part.type === "reasoning" ? part.id : message.info.id,
-          ...chunk,
-        },
-      })
-    }
-  }
-
-  private async run() {
-    while (!this.abort.signal.aborted) {
-      await this.consume().catch(() => {})
-      this.disconnected()
-      if (!this.abort.signal.aborted) await new Promise((resolve) => setTimeout(resolve, 1000))
-    }
-  }
-
-  private async consume() {
-    const events = (await this.input.sdk.global.event({
-      signal: this.abort.signal,
-    })) as GlobalEventStream
-    this.connected = true
-    for (const resolve of this.connectionWaiters) resolve()
-    this.connectionWaiters.clear()
-
-    for await (const event of events.stream) {
-      if (this.abort.signal.aborted) return
-      if (!event.payload) continue
-      await this.handle(event.payload).catch(() => {})
-    }
-  }
-
-  private async waitUntilConnected() {
-    while (!this.connected) {
-      if (this.abort.signal.aborted) throw new Error("ACP event subscription stopped")
-      await new Promise<void>((resolve) => this.connectionWaiters.add(resolve))
-    }
-  }
-
-  private disconnected() {
-    if (!this.connected) return
-    this.connected = false
-    const error = new Error("ACP event stream disconnected")
-    for (const waiters of this.idleWaiters.values()) {
-      for (const waiter of waiters) waiter.reject(error)
-    }
-    this.idleWaiters.clear()
-  }
-
-  private idle(sessionId: string) {
-    const waiters = this.idleWaiters.get(sessionId)
-    if (!waiters) return
-    this.idleWaiters.delete(sessionId)
-    for (const waiter of waiters) waiter.resolve()
-  }
-
-  private async handlePartUpdated(event: EventMessagePartUpdated) {
-    const part = event.properties.part
-    const sessionId = part.sessionID || event.properties.sessionID
-    const session = await Effect.runPromise(this.input.session.tryGet(sessionId))
-    if (!session) return
-
-    await Effect.runPromise(
-      this.input.session.recordPartMetadata({
-        sessionId: session.id,
-        messageId: part.messageID,
-        partId: part.id,
-        partType: part.type,
-        role: part.type === "reasoning" ? "assistant" : undefined,
-        ignored: part.type === "text" ? part.ignored : undefined,
-        toolCallId: part.type === "tool" ? part.callID : undefined,
-        metadata: "metadata" in part ? part.metadata : undefined,
-      }),
-    )
-    if (part.type === "tool") {
-      await this.handleToolPart(session.id, part, session.cwd)
-    }
-  }
-
-  private async handlePartDelta(event: EventMessagePartDelta) {
-    const props = event.properties
-    const session = await Effect.runPromise(this.input.session.tryGet(props.sessionID))
-    if (!session) return
-
-    const known = await Effect.runPromise(
-      this.input.session.tryGetPartMetadata({
-        sessionId: session.id,
-        messageId: props.messageID,
-        partId: props.partID,
-      }),
-    )
-    const metadata =
-      known?.role && known.partType
-        ? known
-        : await this.fetchPartMetadata(session.id, session.cwd, props.messageID, props.partID)
-    if (metadata?.role !== "assistant") return
-    if (metadata.partType === "text" && props.field === "text" && metadata.ignored !== true) {
-      await this.input.connection.sessionUpdate({
-        sessionId: session.id,
-        update: {
-          sessionUpdate: "agent_message_chunk",
-          messageId: props.messageID,
-          content: {
-            type: "text",
-            text: props.delta,
-          },
-        },
-      })
-      return
-    }
-
-    if (metadata.partType === "reasoning" && props.field === "text") {
-      await this.input.connection.sessionUpdate({
-        sessionId: session.id,
-        update: {
-          sessionUpdate: "agent_thought_chunk",
-          messageId: props.partID,
-          content: {
-            type: "text",
-            text: props.delta,
-          },
-        },
-      })
-    }
-  }
-
-  private async fetchPartMetadata(sessionId: string, cwd: string, messageId: string, partId: string) {
-    const message = await this.input.sdk.session
-      .message(
-        {
-          sessionID: sessionId,
-          messageID: messageId,
-          directory: cwd,
-        },
-        { throwOnError: true },
-      )
-      .then((response) => response.data)
-      .catch(() => undefined)
-    if (!message) return
-
-    const part = message.parts.find((item) => item.id === partId)
-    if (!part) return
-    return await this.recordFetchedPart(sessionId, message, part)
-  }
-
-  private async recordFetchedPart(sessionId: string, message: SessionMessageResponse, part: Part) {
-    return await Effect.runPromise(
-      this.input.session.recordPartMetadata({
-        sessionId,
-        messageId: part.messageID,
-        partId: part.id,
-        partType: part.type,
-        role: message.info.role,
-        ignored: part.type === "text" ? part.ignored : undefined,
-        toolCallId: part.type === "tool" ? part.callID : undefined,
-        metadata: "metadata" in part ? part.metadata : undefined,
-      }),
-    )
-  }
-
-  private async handleToolPart(sessionId: string, part: ToolPart, cwd: string) {
-    await this.toolStart(sessionId, part, cwd)
-
-    switch (part.state.status) {
-      case "pending":
-        this.shellSnapshots.delete(part.callID)
-        return
-
-      case "running":
-        await this.runningTool(sessionId, part, cwd)
-        return
-
-      case "completed":
-        this.clearTool(part.callID)
-        await this.input.connection.sessionUpdate({
-          sessionId,
-          update: {
-            sessionUpdate: "tool_call_update",
-            ...completedToolUpdate({
-              toolCallId: part.callID,
-              toolName: part.tool,
-              state: part.state,
-              cwd,
-            }),
-          },
-        })
-        return
-
-      case "error":
-        this.clearTool(part.callID)
-        await this.input.connection.sessionUpdate({
-          sessionId,
-          update: {
-            sessionUpdate: "tool_call_update",
-            ...errorToolUpdate({
-              toolCallId: part.callID,
-              toolName: part.tool,
-              state: part.state,
-              cwd,
-            }),
-          },
-        })
-        return
-    }
-  }
-
-  private async runningTool(sessionId: string, part: ToolPart, cwd: string) {
-    if (part.state.status !== "running") return
-
-    const output = part.tool === "bash" ? shellOutputSnapshot(part.state) : undefined
-    if (output !== undefined) {
-      if (this.shellSnapshots.get(part.callID) === output) {
-        await this.input.connection.sessionUpdate({
-          sessionId,
-          update: {
-            sessionUpdate: "tool_call_update",
-            ...duplicateRunningToolUpdate({
-              toolCallId: part.callID,
-              toolName: part.tool,
-              state: part.state,
-              cwd,
-            }),
-          },
-        })
-        return
-      }
-      this.shellSnapshots.set(part.callID, output)
-    }
-
-    await this.input.connection.sessionUpdate({
-      sessionId,
-      update: {
-        sessionUpdate: "tool_call_update",
-        ...runningToolUpdate({
-          toolCallId: part.callID,
-          toolName: part.tool,
-          state: part.state,
-          output,
-          cwd,
-        }),
-      },
-    })
-  }
-
-  private async toolStart(sessionId: string, part: ToolPart, cwd: string) {
-    if (this.toolStarts.has(part.callID)) return
-    this.toolStarts.add(part.callID)
-    await this.input.connection.sessionUpdate({
-      sessionId,
-      update: {
-        sessionUpdate: "tool_call",
-        ...pendingToolCall({
-          toolCallId: part.callID,
-          toolName: part.tool,
-          state: part.state,
-          cwd,
-        }),
-      },
-    })
-  }
-
-  private clearTool(toolCallId: string) {
-    this.toolStarts.delete(toolCallId)
-    this.shellSnapshots.delete(toolCallId)
-  }
-}
-
-function signal() {
-  const state: {
-    resolve: () => void
-    reject: (reason?: unknown) => void
-  } = {
-    resolve: () => {},
-    reject: () => {},
-  }
-  const promise = new Promise<void>((resolve, reject) => {
-    state.resolve = resolve
-    state.reject = reject
-  })
-  return {
-    promise,
-    resolve: () => state.resolve(),
-    reject: (reason?: unknown) => state.reject(reason),
-  }
-}
-
-export * as ACPEvent from "./event"

package/src/acp/permission.ts

@@ -1,254 +0,0 @@
-import type {
-  AgentSideConnection,
-  PermissionOption,
-  RequestPermissionResponse,
-  ToolCallContent,
-  ToolCallLocation,
-  ToolCallUpdate,
-} from "@agentclientprotocol/sdk"
-import type { Event, OpencodeClient } from "@soraacode/sdk/v2"
-import { applyPatch } from "diff"
-import { exists, readText } from "@/util/filesystem"
-import type { ACPSession } from "./session"
-import { pendingToolCall, toLocations, type ToolInput } from "./tool"
-import { Effect } from "effect"
-
-type PermissionEvent = Extract<Event, { type: "permission.asked" }>
-type Reply = "once" | "always" | "reject"
-type Connection = Partial<Pick<AgentSideConnection, "requestPermission" | "writeTextFile">>
-
-const permissionOptions: PermissionOption[] = [
-  { optionId: "once", kind: "allow_once", name: "Allow once" },
-  { optionId: "always", kind: "allow_always", name: "Always allow" },
-  { optionId: "reject", kind: "reject_once", name: "Reject" },
-]
-
-export class Handler {
-  private readonly queues = new Map<string, Promise<void>>()
-
-  constructor(
-    private readonly input: {
-      sdk: OpencodeClient
-      connection: Connection
-      session: ACPSession.Interface
-    },
-  ) {}
-
-  handle(event: PermissionEvent) {
-    const permission = event.properties
-    const previous = this.queues.get(permission.sessionID) ?? Promise.resolve()
-    const next = previous
-      .then(() => this.process(event))
-      .catch(() => {})
-      .finally(() => {
-        if (this.queues.get(permission.sessionID) === next) {
-          this.queues.delete(permission.sessionID)
-        }
-      })
-    this.queues.set(permission.sessionID, next)
-  }
-
-  private async process(event: PermissionEvent) {
-    const permission = event.properties
-    const session = await Effect.runPromise(this.input.session.tryGet(permission.sessionID))
-    if (!session) return
-
-    if (!this.input.connection.requestPermission) {
-      await this.reply(permission.id, "reject", session.cwd)
-      return
-    }
-
-    const result = await this.input.connection
-      .requestPermission({
-        sessionId: permission.sessionID,
-        toolCall: await permissionToolCall({
-          toolCallId: permission.tool?.callID ?? permission.id,
-          toolName: permission.permission,
-          input: permission.metadata,
-        }),
-        options: permissionOptions,
-      })
-      .catch(async () => {
-        await this.reply(permission.id, "reject", session.cwd)
-        return undefined
-      })
-
-    if (!result) return
-
-    const reply = selectedReply(result)
-    if (reply !== "once" && reply !== "always") {
-      await this.reply(permission.id, "reject", session.cwd)
-      return
-    }
-
-    if (permission.permission === "edit") {
-      await this.writeProposedEdit(session.id, permission.metadata).catch(() => {})
-    }
-
-    await this.reply(permission.id, reply, session.cwd)
-  }
-
-  private async reply(requestID: string, reply: Reply, directory: string) {
-    await this.input.sdk.permission.reply({
-      requestID,
-      reply,
-      directory,
-    })
-  }
-
-  private async writeProposedEdit(sessionId: string, metadata: ToolInput) {
-    const filepath = stringValue(metadata.filepath)
-    const diff = stringValue(metadata.diff)
-    if (!filepath || !diff || !this.input.connection.writeTextFile) return
-
-    const content = (await exists(filepath)) ? await readText(filepath) : ""
-    const next = applyPatch(content, diff)
-    if (next === false) {
-      return
-    }
-
-    void this.input.connection.writeTextFile({
-      sessionId,
-      path: filepath,
-      content: next,
-    })
-  }
-}
-
-async function permissionToolCall(input: {
-  readonly toolCallId: string
-  readonly toolName: string
-  readonly input: ToolInput
-}): Promise<ToolCallUpdate> {
-  const toolCall = pendingToolCall({
-    toolCallId: input.toolCallId,
-    toolName: input.toolName,
-    state: {
-      input: input.input,
-      title: permissionTitle(input.toolName, input.input),
-    },
-  })
-  const content = await permissionContent(input.toolName, input.input)
-  return {
-    ...toolCall,
-    locations: permissionLocations(input.toolName, input.input),
-    ...(content.length ? { content } : {}),
-  }
-}
-
-function permissionTitle(toolName: string, input: ToolInput) {
-  const tool = toolName.toLocaleLowerCase()
-  switch (tool) {
-    case "external_directory":
-      return stringValue(input.description) ?? stringValue(input.command) ?? stringValue(input.parentDir)
-
-    case "webfetch":
-      return stringValue(input.url)
-
-    case "websearch":
-      return stringValue(input.query)
-
-    case "grep":
-    case "glob":
-      return stringValue(input.pattern)
-
-    case "read":
-    case "edit":
-    case "write":
-      return editTitle(input)
-
-    default:
-      return undefined
-  }
-}
-
-function editTitle(input: ToolInput) {
-  const files = fileMetadata(input)
-  if (files.length === 1) return files[0]?.relativePath ?? files[0]?.filePath
-  if (files.length > 1) return `${files.length} files`
-  return stringValue(input.filePath) ?? stringValue(input.filepath) ?? stringValue(input.path)
-}
-
-function permissionLocations(toolName: string, input: ToolInput): ToolCallLocation[] {
-  const files = fileMetadata(input)
-  if (files.length) {
-    return Array.from(
-      new Set(files.flatMap((file) => [file.filePath, file.movePath].filter((path): path is string => !!path))),
-      (path) => ({ path }),
-    )
-  }
-  return toLocations(toolName, input)
-}
-
-async function permissionContent(toolName: string, input: ToolInput): Promise<ToolCallContent[]> {
-  if (toolName.toLocaleLowerCase() !== "edit") return []
-
-  const files = fileMetadata(input)
-  if (files.length) return diffContentForFiles(files)
-
-  const filepath = stringValue(input.filepath) ?? stringValue(input.filePath)
-  const diff = stringValue(input.diff)
-  if (!filepath || !diff) return []
-  const content = await diffContentForPatch(filepath, diff)
-  return content ? [content] : []
-}
-
-async function diffContentForFiles(files: PermissionFileMetadata[]) {
-  const content = await Promise.all(
-    files.map(async (file) => {
-      if (!file.patch) return []
-      const content = await diffContentForPatch(file.filePath, file.patch, file.movePath)
-      return content ? [content] : []
-    }),
-  )
-  return content.flat()
-}
-
-async function diffContentForPatch(filepath: string, diff: string, displayPath = filepath) {
-  const content = (await exists(filepath)) ? await readText(filepath) : ""
-  const next = applyPatch(content, diff)
-  if (next === false) return undefined
-  return {
-    type: "diff" as const,
-    path: displayPath,
-    oldText: content,
-    newText: next,
-  }
-}
-
-function selectedReply(result: RequestPermissionResponse): Reply {
-  if (result.outcome.outcome !== "selected") return "reject"
-  if (result.outcome.optionId === "once" || result.outcome.optionId === "always") return result.outcome.optionId
-  return "reject"
-}
-
-function stringValue(value: unknown) {
-  return typeof value === "string" ? value : undefined
-}
-
-type PermissionFileMetadata = {
-  readonly filePath: string
-  readonly relativePath?: string
-  readonly movePath?: string
-  readonly patch?: string
-}
-
-function fileMetadata(input: ToolInput): PermissionFileMetadata[] {
-  if (!Array.isArray(input.files)) return []
-  return input.files.flatMap((file): PermissionFileMetadata[] => {
-    if (!file || typeof file !== "object") return []
-    const info = file as Record<string, unknown>
-    const filePath = stringValue(info.filePath)
-    if (!filePath) return []
-    return [
-      {
-        filePath,
-        relativePath: stringValue(info.relativePath),
-        movePath: stringValue(info.movePath),
-        patch: stringValue(info.patch),
-      },
-    ]
-  })
-}
-
-export * as ACPPermission from "./permission"

package/src/acp/profile.ts

@@ -1,42 +0,0 @@
-const enabled = process.env.OPENCODE_ACP_PROFILE === "1"
-const started = performance.now()
-
-export function mark(name: string, fields?: Record<string, string | number | boolean | undefined>) {
-  if (!enabled) return
-  write(`${name}.mark`, performance.now() - started, fields)
-}
-
-export function duration(
-  name: string,
-  startedAt: number,
-  fields?: Record<string, string | number | boolean | undefined>,
-) {
-  if (!enabled) return
-  write(name, performance.now() - startedAt, fields)
-}
-
-export async function measure<T>(
-  name: string,
-  fn: () => Promise<T>,
-  fields?: Record<string, string | number | boolean | undefined>,
-) {
-  if (!enabled) return fn()
-  const start = performance.now()
-  try {
-    return await fn()
-  } finally {
-    write(name, performance.now() - start, fields)
-  }
-}
-
-function write(name: string, durationMs: number, fields?: Record<string, string | number | boolean | undefined>) {
-  const extra = fields
-    ? Object.entries(fields)
-        .filter((entry): entry is [string, string | number | boolean] => entry[1] !== undefined)
-        .map(([key, value]) => `${key}=${value}`)
-        .join(" ")
-    : ""
-  console.error(`[acp-profile] ${name} ${Math.round(durationMs)}ms${extra ? ` ${extra}` : ""}`)
-}
-
-export * as ACPProfile from "./profile"