Merge pull request #862 from corbitsdev/cl-7423-corbits-code-switch-the-grok-and-opencode-go-responses

Switch Grok and OpenCode Go Responses to the shared packages

Author: TheGreatAxios

bun.lock

@@ -80,21 +80,23 @@
     "tar": "^7.5.1"
   },
   "dependencies": {
+    "@corbits/openai-responses": "github:corbitsdev/corbits-openai-responses",
+    "@corbits/xai-provider": "github:corbitsdev/corbits-xai-provider",
     "@intx/agent": "workspace:*",
     "@intx/authz": "workspace:*",
     "@intx/crypto": "0.3.0",
+    "@intx/harness": "workspace:*",
+    "@intx/hub-sessions": "0.3.0",
     "@intx/inference": "workspace:*",
     "@intx/log": "workspace:*",
+    "@intx/mail-memory": "0.3.0",
+    "@intx/mailbox": "workspace:*",
+    "@intx/mime": "workspace:*",
     "@intx/storage-isogit": "workspace:*",
     "@intx/tools-lsp": "0.3.0",
     "@intx/tools-posix": "workspace:*",
-    "@intx/mailbox": "workspace:*",
-    "@intx/harness": "workspace:*",
-    "@intx/mime": "workspace:*",
-    "@intx/mail-memory": "0.3.0",
-    "@intx/hub-sessions": "0.3.0",
-    "@intx/workflow-host": "0.3.0",
     "@intx/types": "workspace:*",
+    "@intx/workflow-host": "0.3.0",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "@opentui/core": "0.5.10",
     "arktype": "catalog:",

package.json

@@ -46,15 +46,15 @@ import {
   GROK_RESPONSES_PROVIDER,
   GROK_SESSION_ID_OPTION,
   GROK_USER_ID_OPTION,
-} from "../provider/grok-responses-adapter.js";
+} from "../provider/grok-responses.js";
 import { BIFROST_PROVIDER } from "../provider/bifrost-adapter.js";
 import { isOllamaProviderId, ollamaOpenAIBaseURL } from "../provider/ollama.js";
 import { selectableGoModelIds } from "../provider/opencode-go-models.js";
 import {
   OPENAI_RESPONSES_PROVIDER,
   OPENAI_SESSION_ID_OPTION,
-  OPENCODE_SESSION_ID_OPTION,
-} from "../provider/openai-responses-adapter.js";
+} from "../provider/openai-responses.js";
+import { OPENCODE_SESSION_ID_OPTION } from "../provider/opencode-session.js";
 import { OPENCODE_GO_MESSAGES_PROVIDER } from "../provider/opencode-go-anthropic-adapter.js";
 import { xaiUserIdFromAccessToken } from "../auth/xai/session.js";
 import {

src/config/index.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test";
 import type { ConversationTurn, LastCycleSource } from "@intx/types/runtime";
-import { createGrokResponsesAdapter } from "./grok-responses-adapter.js";
+import { createGrokResponsesAdapter } from "./grok-responses.js";
 
 const source: LastCycleSource = {
   sourceId: "xai/test",
@@ -196,4 +196,30 @@ describe("createGrokResponsesAdapter", () => {
     ).toBe(1_500);
     expect(adapter.extractRetryAfterMs?.(new Headers({}))).toBeUndefined();
   });
+
+  test("treats Responses completed, incomplete, and done events as stream-terminal", () => {
+    const adapter = createGrokResponsesAdapter(source);
+    const isStreamTerminal = adapter.isStreamTerminal;
+    expect(typeof isStreamTerminal).toBe("function");
+    if (typeof isStreamTerminal !== "function") {
+      throw new Error("expected isStreamTerminal to be a function");
+    }
+    for (const type of [
+      "response.completed",
+      "response.incomplete",
+      "response.done",
+    ]) {
+      expect(isStreamTerminal(JSON.stringify({ type }))).toBe(true);
+    }
+    for (const type of [
+      "response.output_text.delta",
+      "response.created",
+      "response.in_progress",
+    ]) {
+      expect(isStreamTerminal(JSON.stringify({ type }))).toBe(false);
+    }
+    expect(isStreamTerminal("{not json")).toBe(false);
+    expect(isStreamTerminal("null")).toBe(false);
+    expect(isStreamTerminal('"just a string"')).toBe(false);
+  });
 });