@get-bb/plugin-sdk 0.4.16 → 0.4.17

package/bundled-types/bb-plugin-sdk-provider-bridge-acp.d.ts

@@ -467,6 +467,12 @@ interface AcpClassifiedToolCall {
     item: DeltaItemShape;
     presentation: DeltaPresentation;
 }
+interface AcpCommandResult {
+    /** The process exit code the agent reported; absent when it reported none. */
+    exitCode?: number;
+    /** The command's output text; absent when the agent reported none. */
+    output?: string;
+}
 
 /**
  * Per-agent dialects: the vendor side channels of an ACP agent.
@@ -525,6 +531,17 @@ interface AcpDialect {
      * the shared classifier in charge — which is the normal answer.
      */
     classifyToolCall?(event: AcpToolCallUpdateEvent): AcpClassifiedToolCall | undefined;
+    /**
+     * A command result carried in the agent's non-standard rawOutput shape.
+     * Returning `undefined` leaves the shared ACP result parser in charge.
+     */
+    commandResult?(event: AcpToolCallUpdateEvent): AcpCommandResult | undefined;
+    /**
+     * A command event with the agent's non-standard result fields normalized
+     * into the shared ACP result shapes. The hook runs only after the call has
+     * classified as a command; existing shared result fields must win.
+     */
+    normalizeCommandEvent?(event: AcpToolCallUpdateEvent): AcpToolCallUpdateEvent;
     /**
      * A vendor JSON-RPC request the agent sends to the client. A dialect that
      * answers one returns the JSON-RPC result to reply with (`{}` is a valid

package/bundled-types/bb-plugin-sdk.d.ts

@@ -10233,6 +10233,15 @@ declare const sendMessageRequestSchema: z$1.ZodObject<{
     }>>;
 }, z$1.core.$strip>;
 type SendMessageRequest = z$1.infer<typeof sendMessageRequestSchema>;
+declare const sendMessageResponseSchema: z$1.ZodObject<{
+    delivery: z$1.ZodEnum<{
+        deferred: "deferred";
+        queued: "queued";
+        sent: "sent";
+    }>;
+    ok: z$1.ZodLiteral<true>;
+}, z$1.core.$strip>;
+type SendMessageResponse = z$1.infer<typeof sendMessageResponseSchema>;
 declare const editMessageRequestSchema: z$1.ZodObject<{
     executionInputSources: z$1.ZodOptional<z$1.ZodObject<{
         model: z$1.ZodOptional<z$1.ZodEnum<{
@@ -15194,9 +15203,7 @@ type ThreadPaneActionResult = ThreadPaneActionResponse;
 type ThreadDeleteResult = {
     ok: true;
 };
-type ThreadSendResult = {
-    ok: true;
-};
+type ThreadSendResult = SendMessageResponse;
 type ThreadEditMessageResult = EditMessageResponse;
 type ThreadStopResult = {
     ok: true;

package/dist/provider-bridge-acp.js

@@ -3116,7 +3116,7 @@ var deltaItemShapeSchema = z24.discriminatedUnion("type", [
   }),
   z24.object({
     type: z24.literal("fileChange"),
-    /** Empty only on bare close-without-open fallbacks (path unknown). */
+    /** Empty while a path is not yet known, including bare close fallbacks. */
     changes: z24.array(deltaFileChangeSchema)
   }),
   /**
@@ -5235,13 +5235,126 @@ var CURSOR_ACP_DIALECT = {
   handleClientRequest: cursorHandleClientRequest,
   maintenance: CURSOR_ACP_MAINTENANCE
 };
+var ompBashRawInputSchema = z35.object({
+  command: z35.string(),
+  async: z35.boolean().optional()
+}).passthrough();
+var ompBashRawOutputSchema = z35.object({
+  content: z35.array(
+    z35.object({
+      type: z35.literal("text"),
+      text: z35.string()
+    }).passthrough()
+  ),
+  details: z35.object({
+    exitCode: z35.number().int().optional(),
+    wallTimeMs: z35.number().nonnegative().optional(),
+    timedOut: z35.boolean().optional(),
+    signal: z35.unknown().optional(),
+    async: z35.unknown().optional()
+  }).passthrough(),
+  // If an OMP version emits generic ACP result fields, the shared parser
+  // owns those exit/output/timeout/signal semantics.
+  exitCode: z35.number().int().nullable().optional(),
+  exit_code: z35.number().int().nullable().optional(),
+  stdout: z35.string().optional(),
+  stderr: z35.string().optional(),
+  output_for_prompt: z35.string().optional(),
+  signal: z35.string().nullable().optional(),
+  timed_out: z35.boolean().optional()
+}).passthrough();
+function stripOmpTrailingNotice(text, notice) {
+  const suffix = `
+
+${notice}`;
+  return text.endsWith(suffix) ? text.slice(0, -suffix.length) : text;
+}
+function ompCommandResult(event) {
+  if (event.kind !== "execute") {
+    return void 0;
+  }
+  const parsedInput = ompBashRawInputSchema.safeParse(event.rawInput);
+  const parsedOutput = ompBashRawOutputSchema.safeParse(event.rawOutput);
+  if (!parsedInput.success || parsedInput.data.command.trim().length === 0 || !parsedOutput.success) {
+    return void 0;
+  }
+  const rawOutput = parsedOutput.data;
+  const details = rawOutput.details;
+  const hasGenericCommandResult = rawOutput.exitCode !== void 0 || rawOutput.exit_code !== void 0 || rawOutput.stdout !== void 0 || rawOutput.stderr !== void 0 || rawOutput.output_for_prompt !== void 0 || rawOutput.signal !== void 0 && rawOutput.signal !== null || rawOutput.timed_out === true;
+  if (parsedInput.data.async === true || details.async !== void 0 || hasGenericCommandResult) {
+    return void 0;
+  }
+  if (details.exitCode === void 0 && details.wallTimeMs === void 0) {
+    return void 0;
+  }
+  let output = rawOutput.content.map((block) => block.text).join("\n");
+  if (details.exitCode !== void 0) {
+    output = stripOmpTrailingNotice(
+      output,
+      `Command exited with code ${String(details.exitCode)}`
+    );
+  }
+  if (details.wallTimeMs !== void 0) {
+    output = stripOmpTrailingNotice(
+      output,
+      `Wall time: ${(details.wallTimeMs / 1e3).toFixed(2)} seconds`
+    );
+  }
+  const isCompletedForegroundBash = event.status === "completed" && details.timedOut !== true && (details.signal === void 0 || details.signal === null);
+  const exitCode = details.exitCode ?? (isCompletedForegroundBash ? 0 : void 0);
+  return {
+    ...exitCode === void 0 ? {} : { exitCode },
+    ...output.length === 0 ? {} : { output }
+  };
+}
+var OMP_ACP_DIALECT = {
+  id: "omp",
+  commandResult: ompCommandResult
+};
+var openCodeCommandRawOutputSchema = z35.object({
+  output: z35.unknown().optional(),
+  metadata: z35.object({
+    exit: z35.number().int().nullable().optional(),
+    output: z35.string().optional()
+  }).passthrough().optional()
+}).passthrough();
+function normalizeOpenCodeCommandEvent(event) {
+  const parsed = openCodeCommandRawOutputSchema.safeParse(event.rawOutput);
+  if (!parsed.success) {
+    return event;
+  }
+  const rawOutput = parsed.data;
+  const output = typeof rawOutput.output === "string" ? rawOutput.output : rawOutput.metadata?.output;
+  const hasSharedOutput = rawOutput["stdout"] !== void 0 || rawOutput["stderr"] !== void 0 || rawOutput["output_for_prompt"] !== void 0;
+  const hasSharedExitCode = rawOutput["exitCode"] !== void 0 || rawOutput["exit_code"] !== void 0;
+  const exitCode = rawOutput.metadata?.exit ?? void 0;
+  if ((output === void 0 || hasSharedOutput) && (exitCode === void 0 || hasSharedExitCode)) {
+    return event;
+  }
+  return {
+    ...event,
+    rawOutput: {
+      ...rawOutput,
+      ...output === void 0 || hasSharedOutput ? {} : { stdout: output },
+      ...exitCode === void 0 || hasSharedExitCode ? {} : { exitCode }
+    }
+  };
+}
+var OPENCODE_ACP_DIALECT = {
+  id: "opencode",
+  normalizeCommandEvent: normalizeOpenCodeCommandEvent
+};
 var DIALECTS_BY_ID = /* @__PURE__ */ new Map([
   [CURSOR_ACP_DIALECT.id, CURSOR_ACP_DIALECT],
-  [GROK_ACP_DIALECT.id, GROK_ACP_DIALECT]
+  [GROK_ACP_DIALECT.id, GROK_ACP_DIALECT],
+  [OMP_ACP_DIALECT.id, OMP_ACP_DIALECT],
+  [OPENCODE_ACP_DIALECT.id, OPENCODE_ACP_DIALECT]
 ]);
 var DIALECT_IDS_BY_COMMAND = {
   "cursor-agent": CURSOR_ACP_DIALECT.id,
-  grok: GROK_ACP_DIALECT.id
+  grok: GROK_ACP_DIALECT.id,
+  omp: OMP_ACP_DIALECT.id,
+  opencode: OPENCODE_ACP_DIALECT.id
 };
 function resolveAcpDialect(launch) {
   if (launch.dialectId !== void 0) {
@@ -5317,9 +5430,6 @@ function classifyAcpToolCall(event, options) {
     }
   }
   const paths = extractAcpToolCallPaths(event, options);
-  if (paths.length === 0) {
-    return { kind: "generic" };
-  }
   const hasDiff = (event.content ?? []).some((entry) => entry.type === "diff");
   if (hasDiff || event.kind === "edit") {
     return { kind: "file_change", changeKind: "update", paths };
@@ -5553,7 +5663,10 @@ function urlFromTitle(title) {
 function looksLikePath(token) {
   return token.startsWith("/") || token.startsWith("~") || token.startsWith(".");
 }
-function fileChangeVerb(changes) {
+function fileChangeVerb(changes, fallback) {
+  if (changes.length === 0) {
+    return fallback;
+  }
   if (changes.every((change) => change.kind === "add")) {
     return "add";
   }
@@ -5582,11 +5695,11 @@ function buildAcpFileChanges(event, operation, options) {
   const [path5] = operation.paths;
   return path5 === void 0 ? [] : [{ path: path5, kind: operation.changeKind }];
 }
-function fileChangeItem(changes) {
+function fileChangeItem(changes, fallbackVerb) {
   return {
     item: { type: "fileChange", changes },
     presentation: fileChangePresentation({
-      verb: fileChangeVerb(changes),
+      verb: fileChangeVerb(changes, fallbackVerb),
       paths: changes.map((change) => change.path)
     })
   };
@@ -5697,9 +5810,7 @@ function classifyAcpToolCall2(event, injected, options) {
   }
   if (operation.kind === "file_change") {
     const changes = buildAcpFileChanges(event, operation, options);
-    if (changes.length > 0) {
-      return fileChangeItem(changes);
-    }
+    return fileChangeItem(changes, operation.changeKind);
   }
   const title = toOptionalString(event.title);
   switch (event.kind) {
@@ -5920,6 +6031,73 @@ function createAcpDeltaTranslator(options = {}) {
     }
     return classifyAcpToolCall2(event, injected, pathOptions);
   }
+  function withClientFileWrites(event, writes) {
+    if (writes.length === 0) {
+      return event;
+    }
+    const paths = new Set(
+      writes.map((write) => resolveAcpToolCallPath(write.path, pathOptions))
+    );
+    return {
+      ...event,
+      content: [
+        ...(event.content ?? []).filter(
+          (entry) => entry.type !== "diff" || !paths.has(resolveAcpToolCallPath(entry.path, pathOptions))
+        ),
+        ...writes
+      ]
+    };
+  }
+  function mergeFsWriteIntoOpenToolCall(context, write) {
+    const writePath = resolveAcpToolCallPath(write.path, pathOptions);
+    const fileChangeCalls = threadCallEntries(context).flatMap(
+      ([key, open]) => {
+        if (open.openedType !== "fileChange") {
+          return [];
+        }
+        const classified = classifyCall(context, open.event);
+        return classified.item.type === "fileChange" ? [
+          {
+            key,
+            open,
+            paths: classified.item.changes.map((change) => change.path)
+          }
+        ] : [];
+      }
+    );
+    const exactMatches = fileChangeCalls.filter(
+      ({ paths }) => paths.includes(writePath)
+    );
+    const pathPendingMatches = fileChangeCalls.filter(
+      ({ paths }) => paths.length === 0
+    );
+    const matching = exactMatches.length === 1 ? exactMatches[0] : exactMatches.length === 0 && pathPendingMatches.length === 1 ? pathPendingMatches[0] : void 0;
+    if (matching === void 0) {
+      return false;
+    }
+    const previous = matching.open.clientFileWrites?.find(
+      (entry) => resolveAcpToolCallPath(entry.path, pathOptions) === writePath
+    );
+    const oldText = previous === void 0 ? write.oldText : previous.oldText;
+    const diff = {
+      type: "diff",
+      path: write.path,
+      ...oldText === void 0 ? {} : { oldText },
+      newText: write.content
+    };
+    const clientFileWrites = [
+      ...(matching.open.clientFileWrites ?? []).filter(
+        (entry) => resolveAcpToolCallPath(entry.path, pathOptions) !== writePath
+      ),
+      diff
+    ];
+    mergedToolCalls.set(matching.key, {
+      ...matching.open,
+      clientFileWrites,
+      event: withClientFileWrites(matching.open.event, clientFileWrites)
+    });
+    return true;
+  }
   function toRawEvent(rawEvent) {
     const parsed = providerRawEventSchema.safeParse(rawEvent);
     if (parsed.success) {
@@ -6036,7 +6214,8 @@ function createAcpDeltaTranslator(options = {}) {
     };
   }
   function commandCloseFields(event, status) {
-    const result = extractAcpCommandResult(event);
+    const normalizedEvent = dialect.normalizeCommandEvent?.(event) ?? event;
+    const result = dialect.commandResult?.(normalizedEvent) ?? extractAcpCommandResult(normalizedEvent);
     const exitCode = result.exitCode ?? (status === "failed" ? 1 : void 0);
     return {
       ...result.output === void 0 ? {} : { aggregatedOutput: result.output, resultText: result.output },
@@ -6155,7 +6334,10 @@ function createAcpDeltaTranslator(options = {}) {
         const event = withDialectIdentity(parsed.data);
         const key = callKey(context, event.toolCallId);
         const open = mergedToolCalls.get(key);
-        const merged = mergeAcpToolCallEvents(open?.event, event);
+        const merged = withClientFileWrites(
+          mergeAcpToolCallEvents(open?.event, event),
+          open?.clientFileWrites ?? []
+        );
         if (isTerminalAcpStatus(merged.status)) {
           mergedToolCalls.delete(key);
           return [
@@ -6174,10 +6356,12 @@ function createAcpDeltaTranslator(options = {}) {
           event: merged,
           openedType: open?.openedType ?? mergedType,
           ...open?.permissionTitle === void 0 ? {} : { permissionTitle: open.permissionTitle },
-          ...open?.delegation === void 0 ? {} : { delegation: open.delegation }
+          ...open?.delegation === void 0 ? {} : { delegation: open.delegation },
+          ...open?.clientFileWrites === void 0 ? {} : { clientFileWrites: open.clientFileWrites }
         });
         if (event.status === "in_progress" && mergedType === "command" && open?.openedType === "command") {
-          const streamed = extractAcpStreamedCommandOutput(event);
+          const normalizedEvent = dialect.normalizeCommandEvent?.(event) ?? event;
+          const streamed = extractAcpStreamedCommandOutput(normalizedEvent);
           return streamed === void 0 ? suppressedUnhandled(rawEvent) : [
             {
               kind: "command.outputSnapshot",
@@ -6354,6 +6538,9 @@ function createAcpDeltaTranslator(options = {}) {
         if (!params.success) {
           return [];
         }
+        if (mergeFsWriteIntoOpenToolCall(context, params.data)) {
+          return [];
+        }
         const rawEvent = {
           jsonrpc: "2.0",
           method: ACP_FS_WRITE_METHOD,

package/dist/provider-bridge-testing.js

@@ -2246,7 +2246,7 @@ var deltaItemShapeSchema = z14.discriminatedUnion("type", [
   }),
   z14.object({
     type: z14.literal("fileChange"),
-    /** Empty only on bare close-without-open fallbacks (path unknown). */
+    /** Empty while a path is not yet known, including bare close fallbacks. */
     changes: z14.array(deltaFileChangeSchema)
   }),
   /**

package/dist/provider-bridge.js

@@ -4693,7 +4693,7 @@ var deltaItemShapeSchema = z30.discriminatedUnion("type", [
   }),
   z30.object({
     type: z30.literal("fileChange"),
-    /** Empty only on bare close-without-open fallbacks (path unknown). */
+    /** Empty while a path is not yet known, including bare close fallbacks. */
     changes: z30.array(deltaFileChangeSchema)
   }),
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@get-bb/plugin-sdk",
-  "version": "0.4.16",
+  "version": "0.4.17",
   "homepage": "https://github.com/get-bb/bb#readme",
   "bugs": {
     "url": "https://github.com/get-bb/bb/issues"