Skip to content

πŸ™Œ OpenHands: AI-Driven Development

Remove obsolete V1 terminology (#71)

Graham Neubig7d954a9f0fe5
diff --git a/AGENTS.md b/AGENTS.md
index 794531e4ea..127219350e 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -4,7 +4,7 @@
- Frontend API adaptation lives mainly in `src/api/`:
- `option-service` fabricates an OSS web-client config and reads models/providers from `agent_server` LLM endpoints.
- `settings-service` uses agent server `/api/settings` endpoints for persistence; reads schemas from `/api/settings/agent-schema` and `/api/settings/conversation-schema`, fetches settings with optional `X-Expose-Secrets: encrypted` header for conversation start payloads, and saves settings via PATCH with diffs.
- - `v1-conversation-service`, `event-service`, `git-service`, and `skills-service` are mapped directly to `agent_server` REST endpoints.
+ - `agent-server-conversation-service`, `event-service`, `agent-server-git-service`, and `skills-service` are mapped directly to `agent_server` REST endpoints.
- `open-hands-axios` injects the optional `X-Session-API-Key` from env/local config for all requests.
- Supported env vars for deployment:
- `VITE_BACKEND_BASE_URL` for the agent server base URL.
@@ -128,12 +128,12 @@
- Regression coverage for the CSS isolation work lives in `__tests__/agent-server-ui-providers.test.tsx`, `__tests__/agent-server-ui-style-scope.test.ts`, and the browser-level `tests/css-isolation.spec.ts` Playwright test.
- Action grouping in the chat stream:
- - `src/components/v1/chat/group-events.ts` folds runs of consecutive groupable events (regular `ActionEvent`/`ObservationEvent` cards, but not `FinishAction`, `ThinkAction`, `PlanningFileEditorObservation`, `TaskTrackerObservation`, hooks, errors, or message events) into single `RenderedItem` groups. The threshold lives in `EVENT_GROUP_MIN_SIZE` (currently 2, so even pairs of back-to-back actions get folded).
- - `EventGroup` (`src/components/v1/chat/event-message-components/event-group.tsx`) is the collapsible header that wraps each run. Default state is collapsed; the header shows `EVENT_GROUP$ACTIONS_COMPLETED` (with a success check) when the group is done, or `EVENT_GROUP$ACTIONS_PROGRESS` plus the currently-running action's title (from `getEventContent`) while a member `ActionEvent` has not yet been replaced by its observation in the UI events array. Expanding renders the original `EventMessage`s verbatim so each card still expands the way it did before.
+ - `src/components/conversation-events/chat/group-events.ts` folds runs of consecutive groupable events (regular `ActionEvent`/`ObservationEvent` cards, but not `FinishAction`, `ThinkAction`, `PlanningFileEditorObservation`, `TaskTrackerObservation`, hooks, errors, or message events) into single `RenderedItem` groups. The threshold lives in `EVENT_GROUP_MIN_SIZE` (currently 2, so even pairs of back-to-back actions get folded).
+ - `EventGroup` (`src/components/conversation-events/chat/event-message-components/event-group.tsx`) is the collapsible header that wraps each run. Default state is collapsed; the header shows `EVENT_GROUP$ACTIONS_COMPLETED` (with a success check) when the group is done, or `EVENT_GROUP$ACTIONS_PROGRESS` plus the currently-running action's title (from `getEventContent`) while a member `ActionEvent` has not yet been replaced by its observation in the UI events array. Expanding renders the original `EventMessage`s verbatim so each card still expands the way it did before.
- Agent thoughts attached to an `ActionEvent` (`event.thought`) are hoisted out of groups: `groupEvents` emits a third `RenderedItem` kind `"thought"` whenever a groupable event carries (or, for an observation, originates from) a non-empty thought, flushing the current run and starting a new one. `messages.tsx` renders that item via `ThoughtEventMessage` and passes `suppressThought` to `EventMessage` so the inline thought isn't duplicated inside the group's expanded content. `ThinkAction` is excluded from this hoisting because the thought IS its action body and is rendered through its own codepath.
- `groupEvents` now de-duplicates hoisted thoughts by action ID so mixed UI arrays that temporarily contain both an action and its replacement observation do not emit the same thought twice; `minSize` is treated as a validated internal invariant (`>= 1`).
- `EventGroup` should return `null` for an empty `events` array and wire the toggle button to the expanded body with `aria-controls` / `role="region"` / `aria-labelledby`.
- - `src/components/v1/chat/messages.tsx` is the only consumer; the grouping is transparent to upstream code. Coverage lives in `__tests__/components/v1/chat/group-events.test.ts` (pure logic, including thought hoisting) and `__tests__/components/v1/chat/event-message-components/event-group.test.tsx` (rendering/interaction).
+ - `src/components/conversation-events/chat/messages.tsx` is the only consumer; the grouping is transparent to upstream code. Coverage lives in `__tests__/components/conversation-events/chat/group-events.test.ts` (pure logic, including thought hoisting) and `__tests__/components/conversation-events/chat/event-message-components/event-group.test.tsx` (rendering/interaction).
- Home page workspace UX (agent-server backend):
- `RepoConnector` no longer renders tab UI, but it still must branch on the active backend: local/bundled backends render `WorkspaceSelectionForm`, while cloud backends render the repo path (`RepositorySelectionForm` when git providers exist, otherwise `ConnectToProviderMessage`). Keep `src/routes/home.tsx` passing through the selected repo state so `TaskSuggestions` can still filter on cloud repo picks.
diff --git a/__tests__/api/agent-server-adapter.test.ts b/__tests__/api/agent-server-adapter.test.ts
index 04bda80701..ef8a66ad6e 100644
--- a/__tests__/api/agent-server-adapter.test.ts
+++ b/__tests__/api/agent-server-adapter.test.ts
@@ -3,7 +3,7 @@ import { describe, expect, it, vi } from "vitest";
import {
buildStartConversationRequest,
getDefaultConversationTitle,
- toV1AppConversation,
+ toAppConversation,
type DirectConversationInfo,
} from "#/api/agent-server-adapter";
import { DEFAULT_SETTINGS } from "#/services/settings";
@@ -184,7 +184,7 @@ describe("getDefaultConversationTitle", () => {
});
});
-describe("toV1AppConversation", () => {
+describe("toAppConversation", () => {
const baseInfo: DirectConversationInfo = {
id: "372eb-1234-5678-9abc",
created_at: "2026-01-01T00:00:00Z",
@@ -192,27 +192,27 @@ describe("toV1AppConversation", () => {
};
it("falls back to the default title when the backend returns null", () => {
- const result = toV1AppConversation({ ...baseInfo, title: null });
+ const result = toAppConversation({ ...baseInfo, title: null });
expect(result.title).toBe("Conversation 372eb");
});
it("falls back to the default title when the backend returns undefined", () => {
- const result = toV1AppConversation({ ...baseInfo });
+ const result = toAppConversation({ ...baseInfo });
expect(result.title).toBe("Conversation 372eb");
});
it("falls back to the default title when the backend returns an empty string", () => {
- const result = toV1AppConversation({ ...baseInfo, title: "" });
+ const result = toAppConversation({ ...baseInfo, title: "" });
expect(result.title).toBe("Conversation 372eb");
});
it("falls back to the default title when the backend returns whitespace only", () => {
- const result = toV1AppConversation({ ...baseInfo, title: " " });
+ const result = toAppConversation({ ...baseInfo, title: " " });
expect(result.title).toBe("Conversation 372eb");
});
it("preserves a backend-provided title when one is set", () => {
- const result = toV1AppConversation({
+ const result = toAppConversation({
...baseInfo,
title: "My real title",
});
diff --git a/__tests__/api/v1-conversation-service.test.ts b/__tests__/api/agent-server-conversation-service.test.ts
similarity index 92%
rename from __tests__/api/v1-conversation-service.test.ts
rename to __tests__/api/agent-server-conversation-service.test.ts
index a2ede61fa2..4903f1e798 100644
--- a/__tests__/api/v1-conversation-service.test.ts
+++ b/__tests__/api/agent-server-conversation-service.test.ts
@@ -6,7 +6,7 @@ import {
setRegisteredBackends,
} from "#/api/backend-registry/active-store";
import type { Backend } from "#/api/backend-registry/types";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
vi.mock("axios");
@@ -54,7 +54,7 @@ vi.mock("#/api/settings-service/settings-service.api", () => ({
},
}));
-describe("V1ConversationService", () => {
+describe("AgentServerConversationService", () => {
beforeEach(() => {
vi.clearAllMocks();
mockHttpGet.mockReset();
@@ -95,7 +95,7 @@ describe("V1ConversationService", () => {
});
const content =
- await V1ConversationService.readConversationFile("conv-123");
+ await AgentServerConversationService.readConversationFile("conv-123");
expect(content).toBe("# PLAN content");
expect(mockHttpGet).toHaveBeenCalledWith(
@@ -129,8 +129,8 @@ describe("V1ConversationService", () => {
},
});
- await V1ConversationService.createConversation();
- await V1ConversationService.createConversation();
+ await AgentServerConversationService.createConversation();
+ await AgentServerConversationService.createConversation();
expect(mockHttpPost).toHaveBeenCalledTimes(2);
const [firstCall, secondCall] = mockHttpPost.mock.calls;
@@ -175,7 +175,7 @@ describe("V1ConversationService", () => {
mockHttpGet.mockResolvedValue({ data: zipBlob });
const result =
- await V1ConversationService.downloadConversation("conv-abc");
+ await AgentServerConversationService.downloadConversation("conv-abc");
expect(mockHttpGet).toHaveBeenCalledWith(
"/api/file/download-trajectory/conv-abc",
@@ -199,7 +199,7 @@ describe("V1ConversationService", () => {
it("hits the local /api/conversations/{id} endpoint when active backend is local", async () => {
mockHttpDelete.mockResolvedValue({ data: undefined });
- await V1ConversationService.deleteConversation("conv-abc");
+ await AgentServerConversationService.deleteConversation("conv-abc");
expect(mockHttpDelete).toHaveBeenCalledWith(
"/api/conversations/conv-abc",
@@ -244,7 +244,7 @@ describe("V1ConversationService", () => {
});
// Act
- await V1ConversationService.createConversation(
+ await AgentServerConversationService.createConversation(
undefined,
undefined,
undefined,
@@ -275,7 +275,7 @@ describe("V1ConversationService", () => {
// Act
const content =
- await V1ConversationService.readConversationFile("conv-cloud-1");
+ await AgentServerConversationService.readConversationFile("conv-cloud-1");
// Assert
expect(content).toBe("# PLAN content");
@@ -295,7 +295,7 @@ describe("V1ConversationService", () => {
});
const uploadPath = "/workspace/custom/path.txt";
- await V1ConversationService.uploadFile(
+ await AgentServerConversationService.uploadFile(
"http://localhost:54928/api/conversations/conv-123",
"test-api-key",
file,
@@ -313,7 +313,7 @@ describe("V1ConversationService", () => {
type: "text/plain",
});
- await V1ConversationService.uploadFile(
+ await AgentServerConversationService.uploadFile(
"http://localhost:54928/api/conversations/conv-123",
"test-api-key",
file,
@@ -330,7 +330,7 @@ describe("V1ConversationService", () => {
type: "text/plain",
});
- await V1ConversationService.uploadFile(
+ await AgentServerConversationService.uploadFile(
"http://localhost:54928/api/conversations/conv-123",
"my-session-key",
file,
diff --git a/__tests__/api/v1-git-service.test.ts b/__tests__/api/agent-server-git-service.test.ts
similarity index 89%
rename from __tests__/api/v1-git-service.test.ts
rename to __tests__/api/agent-server-git-service.test.ts
index 80ea76c0a6..847814e9b3 100644
--- a/__tests__/api/v1-git-service.test.ts
+++ b/__tests__/api/agent-server-git-service.test.ts
@@ -1,5 +1,5 @@
import { describe, test, expect, vi, beforeEach } from "vitest";
-import V1GitService from "../../src/api/git-service/v1-git-service.api";
+import AgentServerGitService from "../../src/api/git-service/agent-server-git-service.api";
const { mockGitChanges, mockGitDiff, mockCreateRemoteWorkspace } = vi.hoisted(() => ({
mockGitChanges: vi.fn(),
@@ -11,7 +11,7 @@ vi.mock("../../src/api/typescript-client", () => ({
createRemoteWorkspace: mockCreateRemoteWorkspace,
}));
-describe("V1GitService", () => {
+describe("AgentServerGitService", () => {
beforeEach(() => {
vi.clearAllMocks();
mockGitChanges.mockReset();
@@ -27,7 +27,7 @@ describe("V1GitService", () => {
mockGitChanges.mockResolvedValue("<!DOCTYPE html><html>...</html>");
await expect(
- V1GitService.getGitChanges(
+ AgentServerGitService.getGitChanges(
"http://localhost:3000/api/conversations/123",
"test-api-key",
"/workspace",
@@ -38,7 +38,7 @@ describe("V1GitService", () => {
test("passes conversation URL and session key to the runtime workspace", async () => {
mockGitChanges.mockResolvedValue([]);
- await V1GitService.getGitChanges(
+ await AgentServerGitService.getGitChanges(
"http://localhost:3000/api/conversations/123",
"my-session-key",
"/workspace/project",
@@ -55,7 +55,7 @@ describe("V1GitService", () => {
mockGitChanges.mockResolvedValue([]);
const pathWithSlashes = "/workspace/project/src/components";
- await V1GitService.getGitChanges(
+ await AgentServerGitService.getGitChanges(
"http://localhost:3000/api/conversations/123",
"test-api-key",
pathWithSlashes,
@@ -72,7 +72,7 @@ describe("V1GitService", () => {
{ status: "MOVED", path: "renamed-file.ts" },
]);
- const result = await V1GitService.getGitChanges(
+ const result = await AgentServerGitService.getGitChanges(
"http://localhost:3000/api/conversations/123",
"test-api-key",
"/workspace",
@@ -91,7 +91,7 @@ describe("V1GitService", () => {
test("passes conversation URL and path to runtime workspace diff helper", async () => {
mockGitDiff.mockResolvedValue({ diff: "--- a/file.ts\n+++ b/file.ts\n..." });
- await V1GitService.getGitChangeDiff(
+ await AgentServerGitService.getGitChangeDiff(
"http://localhost:3000/api/conversations/123",
"test-api-key",
"/workspace/project/file.ts",
@@ -108,7 +108,7 @@ describe("V1GitService", () => {
mockGitDiff.mockResolvedValue({ diff: "diff content" });
const filePath = "/workspace/project/src/components/Button.tsx";
- await V1GitService.getGitChangeDiff(
+ await AgentServerGitService.getGitChangeDiff(
"http://localhost:3000/api/conversations/123",
"test-api-key",
filePath,
@@ -123,7 +123,7 @@ describe("V1GitService", () => {
};
mockGitDiff.mockResolvedValue(expectedDiff);
- const result = await V1GitService.getGitChangeDiff(
+ const result = await AgentServerGitService.getGitChangeDiff(
"http://localhost:3000/api/conversations/123",
"test-api-key",
"/workspace/file.ts",
diff --git a/__tests__/api/cloud/conversation-create.test.ts b/__tests__/api/cloud/conversation-create.test.ts
index 78635cf83d..4549f50ae0 100644
--- a/__tests__/api/cloud/conversation-create.test.ts
+++ b/__tests__/api/cloud/conversation-create.test.ts
@@ -6,7 +6,7 @@ import {
setRegisteredBackends,
} from "#/api/backend-registry/active-store";
import type { Backend } from "#/api/backend-registry/types";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
vi.mock("axios");
@@ -31,7 +31,7 @@ afterEach(() => {
__resetActiveStoreForTests();
});
-describe("V1ConversationService cloud branch", () => {
+describe("AgentServerConversationService cloud branch", () => {
it("createConversation POSTs the SaaS payload through the proxy and returns a WORKING task", async () => {
vi.mocked(axios.post).mockResolvedValue({
data: {
@@ -47,7 +47,7 @@ describe("V1ConversationService cloud branch", () => {
},
});
- const result = await V1ConversationService.createConversation(
+ const result = await AgentServerConversationService.createConversation(
"fix the bug",
"Optional title",
undefined,
@@ -108,7 +108,7 @@ describe("V1ConversationService cloud branch", () => {
],
});
- const result = await V1ConversationService.getStartTask("task-123");
+ const result = await AgentServerConversationService.getStartTask("task-123");
const [url, body] = vi.mocked(axios.post).mock.calls[0]!;
expect(url).toMatch(/\/api\/cloud-proxy$/);
diff --git a/__tests__/api/cloud/conversation-delete.test.ts b/__tests__/api/cloud/conversation-delete.test.ts
index 8d999015f6..41d761fa50 100644
--- a/__tests__/api/cloud/conversation-delete.test.ts
+++ b/__tests__/api/cloud/conversation-delete.test.ts
@@ -6,7 +6,7 @@ import {
setRegisteredBackends,
} from "#/api/backend-registry/active-store";
import type { Backend } from "#/api/backend-registry/types";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
vi.mock("axios");
@@ -31,11 +31,11 @@ afterEach(() => {
__resetActiveStoreForTests();
});
-describe("V1ConversationService.deleteConversation cloud branch", () => {
+describe("AgentServerConversationService.deleteConversation cloud branch", () => {
it("routes through /api/cloud-proxy to the SaaS DELETE app-conversations endpoint", async () => {
vi.mocked(axios.post).mockResolvedValue({ data: { success: true } });
- await V1ConversationService.deleteConversation("conv-abc");
+ await AgentServerConversationService.deleteConversation("conv-abc");
expect(axios.post).toHaveBeenCalledOnce();
const [url, body] = vi.mocked(axios.post).mock.calls[0]!;
diff --git a/__tests__/api/cloud/conversation-download.test.ts b/__tests__/api/cloud/conversation-download.test.ts
index 0af6dda5a6..a85c83e1b4 100644
--- a/__tests__/api/cloud/conversation-download.test.ts
+++ b/__tests__/api/cloud/conversation-download.test.ts
@@ -6,7 +6,7 @@ import {
setRegisteredBackends,
} from "#/api/backend-registry/active-store";
import type { Backend } from "#/api/backend-registry/types";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
vi.mock("axios");
@@ -31,12 +31,12 @@ afterEach(() => {
__resetActiveStoreForTests();
});
-describe("V1ConversationService.downloadConversation cloud branch", () => {
+describe("AgentServerConversationService.downloadConversation cloud branch", () => {
it("routes through /api/cloud-proxy to the SaaS download endpoint with responseType blob and returns the Blob", async () => {
const zipBlob = new Blob(["zip-bytes"], { type: "application/zip" });
vi.mocked(axios.post).mockResolvedValue({ data: zipBlob });
- const result = await V1ConversationService.downloadConversation("conv-abc");
+ const result = await AgentServerConversationService.downloadConversation("conv-abc");
expect(axios.post).toHaveBeenCalledOnce();
const [url, body, config] = vi.mocked(axios.post).mock.calls[0]!;
diff --git a/__tests__/api/cloud/conversation-pause.test.ts b/__tests__/api/cloud/conversation-pause.test.ts
index 6ec631f6ff..6958bd7e1c 100644
--- a/__tests__/api/cloud/conversation-pause.test.ts
+++ b/__tests__/api/cloud/conversation-pause.test.ts
@@ -6,10 +6,10 @@ import {
setRegisteredBackends,
} from "#/api/backend-registry/active-store";
import type { Backend } from "#/api/backend-registry/types";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
-import type { V1AppConversation } from "#/api/conversation-service/v1-conversation-service.types";
-import { pauseV1Conversation } from "#/hooks/mutation/conversation-mutation-utils";
-import { V1ExecutionStatus } from "#/types/v1/core/base/common";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
+import type { AppConversation } from "#/api/conversation-service/agent-server-conversation-service.types";
+import { pauseConversation } from "#/hooks/mutation/conversation-mutation-utils";
+import { ExecutionStatus } from "#/types/agent-server/core/base/common";
vi.mock("axios");
@@ -22,8 +22,8 @@ const cloudBackend: Backend = {
};
const buildConversation = (
- overrides: Partial<V1AppConversation> = {},
-): V1AppConversation => ({
+ overrides: Partial<AppConversation> = {},
+): AppConversation => ({
id: "conv-abc",
created_by_user_id: null,
selected_repository: null,
@@ -36,7 +36,7 @@ const buildConversation = (
metrics: null,
created_at: "2026-04-16T00:00:00Z",
updated_at: "2026-04-16T00:00:00Z",
- execution_status: V1ExecutionStatus.RUNNING,
+ execution_status: ExecutionStatus.RUNNING,
conversation_url: null,
session_api_key: null,
sandbox_id: "sandbox-xyz",
@@ -58,15 +58,15 @@ afterEach(() => {
vi.restoreAllMocks();
});
-describe("pauseV1Conversation cloud branch", () => {
+describe("pauseConversation cloud branch", () => {
it("routes through /api/cloud-proxy to POST the SaaS sandbox pause endpoint", async () => {
vi.spyOn(
- V1ConversationService,
+ AgentServerConversationService,
"batchGetAppConversations",
).mockResolvedValue([buildConversation({ sandbox_id: "sandbox-xyz" })]);
vi.mocked(axios.post).mockResolvedValue({ data: { success: true } });
- await pauseV1Conversation("conv-abc");
+ await pauseConversation("conv-abc");
expect(axios.post).toHaveBeenCalledOnce();
const [url, body] = vi.mocked(axios.post).mock.calls[0]!;
@@ -80,11 +80,11 @@ describe("pauseV1Conversation cloud branch", () => {
it("throws and does not call cloud-proxy when the cloud conversation has no sandbox_id", async () => {
vi.spyOn(
- V1ConversationService,
+ AgentServerConversationService,
"batchGetAppConversations",
).mockResolvedValue([buildConversation({ sandbox_id: null })]);
- await expect(pauseV1Conversation("conv-abc")).rejects.toThrow(/sandbox_id/);
+ await expect(pauseConversation("conv-abc")).rejects.toThrow(/sandbox_id/);
expect(axios.post).not.toHaveBeenCalled();
});
});
diff --git a/__tests__/api/cloud/conversation-public-flag.test.ts b/__tests__/api/cloud/conversation-public-flag.test.ts
index 742fb10d97..8ec42cc677 100644
--- a/__tests__/api/cloud/conversation-public-flag.test.ts
+++ b/__tests__/api/cloud/conversation-public-flag.test.ts
@@ -6,7 +6,7 @@ import {
setRegisteredBackends,
} from "#/api/backend-registry/active-store";
import type { Backend } from "#/api/backend-registry/types";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
vi.mock("axios");
@@ -29,7 +29,7 @@ afterEach(() => {
__resetActiveStoreForTests();
});
-describe("V1ConversationService.updateConversationPublicFlag", () => {
+describe("AgentServerConversationService.updateConversationPublicFlag", () => {
it("PATCHes /api/v1/app-conversations/{id} via cloud-proxy on a cloud backend", async () => {
setRegisteredBackends([cloudBackend]);
setActiveSelection({ backendId: cloudBackend.id });
@@ -37,7 +37,7 @@ describe("V1ConversationService.updateConversationPublicFlag", () => {
data: { id: "conv-abc", public: true },
});
- await V1ConversationService.updateConversationPublicFlag("conv-abc", true);
+ await AgentServerConversationService.updateConversationPublicFlag("conv-abc", true);
expect(axios.post).toHaveBeenCalledOnce();
const [url, body] = vi.mocked(axios.post).mock.calls[0]!;
@@ -53,7 +53,7 @@ describe("V1ConversationService.updateConversationPublicFlag", () => {
it("rejects without calling the proxy when the active backend is local", async () => {
// Default state after reset is the bundled local backend.
await expect(
- V1ConversationService.updateConversationPublicFlag("conv-abc", true),
+ AgentServerConversationService.updateConversationPublicFlag("conv-abc", true),
).rejects.toThrow(/cloud backend/);
expect(axios.post).not.toHaveBeenCalled();
});
diff --git a/__tests__/api/cloud/conversation-runtime-info.test.ts b/__tests__/api/cloud/conversation-runtime-info.test.ts
index e324adde24..12349a6127 100644
--- a/__tests__/api/cloud/conversation-runtime-info.test.ts
+++ b/__tests__/api/cloud/conversation-runtime-info.test.ts
@@ -6,7 +6,7 @@ import {
setRegisteredBackends,
} from "#/api/backend-registry/active-store";
import type { Backend } from "#/api/backend-registry/types";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
vi.mock("axios");
@@ -55,7 +55,7 @@ afterEach(() => {
vi.restoreAllMocks();
});
-describe("V1ConversationService.getRuntimeConversation", () => {
+describe("AgentServerConversationService.getRuntimeConversation", () => {
describe("cloud mode", () => {
beforeEach(() => {
__resetActiveStoreForTests();
@@ -71,7 +71,7 @@ describe("V1ConversationService.getRuntimeConversation", () => {
"http://abc123.runtime.all-hands.dev/api/conversations/conv-abc";
// Act
- const result = await V1ConversationService.getRuntimeConversation(
+ const result = await AgentServerConversationService.getRuntimeConversation(
"conv-abc",
conversationUrl,
"session-xyz",
@@ -114,7 +114,7 @@ describe("V1ConversationService.getRuntimeConversation", () => {
"http://192.168.1.42:8888/api/conversations/conv-abc";
// Act
- const result = await V1ConversationService.getRuntimeConversation(
+ const result = await AgentServerConversationService.getRuntimeConversation(
"conv-abc",
conversationUrl,
"session-xyz",
diff --git a/__tests__/api/conversation-metadata-store.test.ts b/__tests__/api/conversation-metadata-store.test.ts
index 0ea25cffad..5b3d067a39 100644
--- a/__tests__/api/conversation-metadata-store.test.ts
+++ b/__tests__/api/conversation-metadata-store.test.ts
@@ -1,5 +1,5 @@
import { afterEach, beforeEach, describe, expect, it } from "vitest";
-import { toV1AppConversation } from "#/api/agent-server-adapter";
+import { toAppConversation } from "#/api/agent-server-adapter";
import {
getStoredConversationMetadata,
removeStoredConversationMetadata,
@@ -20,14 +20,14 @@ describe("conversation-metadata-store", () => {
window.localStorage.clear();
});
- it("toV1AppConversation hydrates repo/branch/git_provider from the store", () => {
+ it("toAppConversation hydrates repo/branch/git_provider from the store", () => {
setStoredConversationMetadata("conv-1", {
selected_repository: "octocat/hello-world",
selected_branch: "main",
git_provider: "github",
});
- const conversation = toV1AppConversation(directInfo("conv-1"));
+ const conversation = toAppConversation(directInfo("conv-1"));
expect(conversation).toMatchObject({
selected_repository: "octocat/hello-world",
@@ -36,8 +36,8 @@ describe("conversation-metadata-store", () => {
});
});
- it("toV1AppConversation falls back to nulls when no metadata is stored", () => {
- const conversation = toV1AppConversation(directInfo("conv-2"));
+ it("toAppConversation falls back to nulls when no metadata is stored", () => {
+ const conversation = toAppConversation(directInfo("conv-2"));
expect(conversation.selected_repository).toBeNull();
expect(conversation.selected_branch).toBeNull();
@@ -54,6 +54,6 @@ describe("conversation-metadata-store", () => {
removeStoredConversationMetadata("conv-3");
expect(getStoredConversationMetadata("conv-3")).toBeNull();
- expect(toV1AppConversation(directInfo("conv-3")).selected_repository).toBeNull();
+ expect(toAppConversation(directInfo("conv-3")).selected_repository).toBeNull();
});
});
diff --git a/__tests__/api/mock-conversation-handlers.test.ts b/__tests__/api/mock-conversation-handlers.test.ts
index ae29355a2a..29c526d270 100644
--- a/__tests__/api/mock-conversation-handlers.test.ts
+++ b/__tests__/api/mock-conversation-handlers.test.ts
@@ -1,10 +1,10 @@
import { describe, expect, it } from "vitest";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
-import V1GitService from "#/api/git-service/v1-git-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
+import AgentServerGitService from "#/api/git-service/agent-server-git-service.api";
describe("mock conversation handlers", () => {
it("returns adapted conversations for batch lookups", async () => {
- const [conversation] = await V1ConversationService.batchGetAppConversations([
+ const [conversation] = await AgentServerConversationService.batchGetAppConversations([
"1",
]);
@@ -15,7 +15,7 @@ describe("mock conversation handlers", () => {
});
it("returns adapted conversation pages for search", async () => {
- const page = await V1ConversationService.searchConversations(10);
+ const page = await AgentServerConversationService.searchConversations(10);
expect(page.items.length).toBeGreaterThan(0);
expect(page.next_page_id).toBeNull();
@@ -23,7 +23,7 @@ describe("mock conversation handlers", () => {
});
it("returns empty git changes for mock conversations", async () => {
- const changes = await V1GitService.getGitChanges(
+ const changes = await AgentServerGitService.getGitChanges(
"http://localhost:3000/api/conversations/1",
null,
"workspace/project",
diff --git a/__tests__/components/chat/chat-interface.test.tsx b/__tests__/components/chat/chat-interface.test.tsx
index 21919a1394..d8a3e90e9b 100644
--- a/__tests__/components/chat/chat-interface.test.tsx
+++ b/__tests__/components/chat/chat-interface.test.tsx
@@ -1,6 +1,5 @@
import {
afterEach,
- beforeAll,
beforeEach,
describe,
expect,
@@ -8,12 +7,10 @@ import {
test,
vi,
} from "vitest";
-import { render, screen, waitFor, within } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
+import { render, screen, within } from "@testing-library/react";
import { MemoryRouter, Route, Routes } from "react-router";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { renderWithProviders, useParamsMock } from "test-utils";
-import type { Message } from "#/message";
import { SUGGESTIONS } from "#/utils/suggestions";
import { ChatInterface } from "#/components/features/chat/chat-interface";
import {
@@ -25,12 +22,11 @@ import { useOptimisticUserMessageStore } from "#/stores/optimistic-user-message-
import { useConfig } from "#/hooks/query/use-config";
import { useGetTrajectory } from "#/hooks/mutation/use-get-trajectory";
import { useUnifiedUploadFiles } from "#/hooks/mutation/use-unified-upload-files";
-import { OpenHandsAction } from "#/types/core/actions";
+import type { MessageEvent } from "#/types/agent-server/core";
import { useEventStore } from "#/stores/use-event-store";
import { useAgentState } from "#/hooks/use-agent-state";
import { AgentState } from "#/types/agent-state";
-vi.mock("#/context/ws-client-provider");
vi.mock("#/hooks/query/use-config");
vi.mock("#/hooks/mutation/use-get-trajectory");
vi.mock("#/hooks/mutation/use-unified-upload-files");
@@ -70,14 +66,6 @@ const renderChatInterfaceWithRouter = () =>
</MemoryRouter>,
);
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const renderChatInterface = (messages: Message[]) =>
- renderWithProviders(
- <MemoryRouter>
- <ChatInterface />
- </MemoryRouter>,
- );
-
// Helper function to render with QueryClientProvider and Router (for newer tests)
const renderWithQueryClient = (
ui: React.ReactElement,
@@ -145,24 +133,22 @@ describe("ChatInterface - Chat Suggestions", () => {
});
test("should hide chat suggestions when there is a user message", () => {
- const mockUserEvent: OpenHandsAction = {
- id: 1,
+ const mockUserEvent: MessageEvent = {
+ id: "msg-1",
+ timestamp: "2025-07-01T00:00:00Z",
source: "user",
- action: "message",
- args: {
- content: "Hello",
- image_urls: [],
- file_urls: [],
+ llm_message: {
+ role: "user",
+ content: [{ type: "text", text: "Hello" }],
},
- message: "Hello",
- timestamp: "2025-07-01T00:00:00Z",
+ activated_microagents: [],
+ extended_content: [],
};
useEventStore.setState({
events: [mockUserEvent],
- uiEvents: [],
- addEvent: vi.fn(),
- clearEvents: vi.fn(),
+ eventIds: new Set(["msg-1"]),
+ uiEvents: [mockUserEvent],
});
renderWithQueryClient(<ChatInterface />, queryClient);
@@ -184,23 +170,6 @@ describe("ChatInterface - Chat Suggestions", () => {
});
describe("ChatInterface - Empty state", () => {
- const { send: sendMock } = vi.hoisted(() => ({
- send: vi.fn(),
- }));
-
- const { useWsClient: useWsClientMock } = vi.hoisted(() => ({
- useWsClient: vi.fn(() => ({
- send: sendMock,
- status: "CONNECTED",
- isLoadingMessages: false,
- parsedEvents: [],
- })),
- }));
-
- afterEach(() => {
- vi.clearAllMocks();
- });
-
it.todo("should render suggestions if empty");
it("should render the default suggestions", () => {
@@ -219,66 +188,6 @@ describe("ChatInterface - Empty state", () => {
});
});
- it.fails(
- "should load the a user message to the input when selecting",
- async () => {
- // this is to test that the message is in the UI before the socket is called
- useWsClientMock.mockImplementation(() => ({
- send: sendMock,
- status: "CONNECTED",
- isLoadingMessages: false,
- parsedEvents: [],
- }));
- const user = userEvent.setup();
- renderChatInterfaceWithRouter();
-
- const suggestions = screen.getByTestId("chat-suggestions");
- const displayedSuggestions = within(suggestions).getAllByRole("button");
- const input = screen.getByTestId("chat-input");
-
- await user.click(displayedSuggestions[0]);
-
- // user message loaded to input
- expect(screen.queryByTestId("chat-suggestions")).toBeInTheDocument();
- expect(input).toHaveValue(displayedSuggestions[0].textContent);
- },
- );
-
- it.fails(
- "should send the message to the socket only if the runtime is active",
- async () => {
- useWsClientMock.mockImplementation(() => ({
- send: sendMock,
- status: "CONNECTED",
- isLoadingMessages: false,
- parsedEvents: [],
- }));
- const user = userEvent.setup();
- const { rerender } = renderChatInterfaceWithRouter();
-
- const suggestions = screen.getByTestId("chat-suggestions");
- const displayedSuggestions = within(suggestions).getAllByRole("button");
-
- await user.click(displayedSuggestions[0]);
- expect(sendMock).not.toHaveBeenCalled();
-
- useWsClientMock.mockImplementation(() => ({
- send: sendMock,
- status: "CONNECTED",
- isLoadingMessages: false,
- parsedEvents: [],
- }));
- rerender(
- <MemoryRouter>
- <ChatInterface />
- </MemoryRouter>,
- );
-
- await waitFor(() =>
- expect(sendMock).toHaveBeenCalledWith(expect.any(String)),
- );
- },
- );
});
describe('ChatInterface - Status Indicator', () => {
@@ -302,265 +211,3 @@ describe('ChatInterface - Status Indicator', () => {
expect(screen.queryByTestId("chat-status-indicator")).not.toBeInTheDocument();
});
});
-
-describe.skip("ChatInterface - General functionality", () => {
- beforeAll(() => {
- // mock useScrollToBottom hook
- vi.mock("#/hooks/useScrollToBottom", () => ({
- useScrollToBottom: vi.fn(() => ({
- scrollDomToBottom: vi.fn(),
- onChatBodyScroll: vi.fn(),
- hitBottom: vi.fn(),
- })),
- }));
- });
-
- afterEach(() => {
- vi.clearAllMocks();
- });
-
- it("should render messages", () => {
- const messages: Message[] = [
- {
- sender: "user",
- content: "Hello",
- imageUrls: [],
- timestamp: new Date().toISOString(),
- pending: true,
- },
- {
- sender: "assistant",
- content: "Hi",
- imageUrls: [],
- timestamp: new Date().toISOString(),
- pending: true,
- },
- ];
- renderChatInterface(messages);
-
- expect(screen.getAllByTestId(/-message/)).toHaveLength(2);
- });
-
- it("should render a chat input", () => {
- const messages: Message[] = [];
- renderChatInterface(messages);
-
- expect(screen.getByTestId("chat-input")).toBeInTheDocument();
- });
-
- it("should call socket send when submitting a message", async () => {
- const user = userEvent.setup();
- const messages: Message[] = [];
- renderChatInterface(messages);
-
- const input = screen.getByTestId("chat-input");
- await user.type(input, "Hello");
- await user.keyboard("{Enter}");
-
- // spy on send and expect to have been called
- });
-
- it("should render an image carousel with a message", () => {
- let messages: Message[] = [
- {
- sender: "assistant",
- content: "Here are some images",
- imageUrls: [],
- timestamp: new Date().toISOString(),
- pending: true,
- },
- ];
- const { rerender } = renderChatInterface(messages);
-
- expect(screen.queryByTestId("image-carousel")).not.toBeInTheDocument();
-
- messages = [
- {
- sender: "assistant",
- content: "Here are some images",
- imageUrls: ["image1", "image2"],
- timestamp: new Date().toISOString(),
- pending: true,
- },
- ];
-
- rerender(
- <MemoryRouter>
- <ChatInterface />
- </MemoryRouter>,
- );
-
- const imageCarousel = screen.getByTestId("image-carousel");
- expect(imageCarousel).toBeInTheDocument();
- expect(within(imageCarousel).getAllByTestId("image-preview")).toHaveLength(
- 2,
- );
- });
-
- it("should render a 'continue' action when there are more than 2 messages and awaiting user input", () => {
- const messages: Message[] = [
- {
- sender: "assistant",
- content: "Hello",
- imageUrls: [],
- timestamp: new Date().toISOString(),
- pending: true,
- },
- {
- sender: "user",
- content: "Hi",
- imageUrls: [],
- timestamp: new Date().toISOString(),
- pending: true,
- },
- ];
- const { rerender } = renderChatInterface(messages);
- expect(
- screen.queryByTestId("continue-action-button"),
- ).not.toBeInTheDocument();
-
- messages.push({
- sender: "assistant",
- content: "How can I help you?",
- imageUrls: [],
- timestamp: new Date().toISOString(),
- pending: true,
- });
-
- rerender(
- <MemoryRouter>
- <ChatInterface />
- </MemoryRouter>,
- );
-
- expect(screen.getByTestId("continue-action-button")).toBeInTheDocument();
- });
-
- it("should render inline errors", () => {
- const messages: Message[] = [
- {
- sender: "assistant",
- content: "Hello",
- imageUrls: [],
- timestamp: new Date().toISOString(),
- pending: true,
- },
- {
- type: "error",
- content: "Something went wrong",
- sender: "assistant",
- timestamp: new Date().toISOString(),
- },
- ];
- renderChatInterface(messages);
-
- const error = screen.getByTestId("error-message");
- expect(within(error).getByText("Something went wrong")).toBeInTheDocument();
- });
-
- it("should render both GitHub buttons initially when ghToken is available", () => {
- // Note: This test may need adjustment since useRouteLoaderData is now globally mocked
-
- const messages: Message[] = [
- {
- sender: "assistant",
- content: "Hello",
- imageUrls: [],
- timestamp: new Date().toISOString(),
- pending: true,
- },
- ];
- renderChatInterface(messages);
-
- const pushButton = screen.getByRole("button", { name: "Push to Branch" });
- const prButton = screen.getByRole("button", { name: "Push & Create PR" });
-
- expect(pushButton).toBeInTheDocument();
- expect(prButton).toBeInTheDocument();
- expect(pushButton).toHaveTextContent("Push to Branch");
- expect(prButton).toHaveTextContent("Push & Create PR");
- });
-
- it("should render only 'Push changes to PR' button after PR is created", async () => {
- // Note: This test may need adjustment since useRouteLoaderData is now globally mocked
-
- const messages: Message[] = [
- {
- sender: "assistant",
- content: "Hello",
- imageUrls: [],
- timestamp: new Date().toISOString(),
- pending: true,
- },
- ];
- const { rerender } = renderChatInterface(messages);
- const user = userEvent.setup();
-
- // Click the "Push & Create PR" button
- const prButton = screen.getByRole("button", { name: "Push & Create PR" });
- await user.click(prButton);
-
- // Re-render to trigger state update
- rerender(
- <MemoryRouter>
- <ChatInterface />
- </MemoryRouter>,
- );
-
- // Verify only one button is shown
- const pushToPrButton = screen.getByRole("button", {
- name: "Push changes to PR",
- });
- expect(pushToPrButton).toBeInTheDocument();
- expect(
- screen.queryByRole("button", { name: "Push to Branch" }),
- ).not.toBeInTheDocument();
- expect(
- screen.queryByRole("button", { name: "Push & Create PR" }),
- ).not.toBeInTheDocument();
- });
-
- it("should render feedback actions if there are more than 3 messages", () => {
- const messages: Message[] = [
- {
- sender: "assistant",
- content: "Hello",
- imageUrls: [],
- timestamp: new Date().toISOString(),
- pending: true,
- },
- {
- sender: "user",
- content: "Hi",
- imageUrls: [],
- timestamp: new Date().toISOString(),
- pending: true,
- },
- {
- sender: "assistant",
- content: "How can I help you?",
- imageUrls: [],
- timestamp: new Date().toISOString(),
- pending: true,
- },
- ];
- const { rerender } = renderChatInterface(messages);
- expect(screen.queryByTestId("feedback-actions")).not.toBeInTheDocument();
-
- messages.push({
- sender: "user",
- content: "I need help",
- imageUrls: [],
- timestamp: new Date().toISOString(),
- pending: true,
- });
-
- rerender(
- <MemoryRouter>
- <ChatInterface />
- </MemoryRouter>,
- );
-
- expect(screen.getByTestId("feedback-actions")).toBeInTheDocument();
- });
-});
diff --git a/__tests__/components/chat/expandable-message.test.tsx b/__tests__/components/chat/expandable-message.test.tsx
deleted file mode 100644
index b058cc56ab..0000000000
--- a/__tests__/components/chat/expandable-message.test.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-import { screen } from "@testing-library/react";
-import { renderWithProviders } from "test-utils";
-import { ExpandableMessage } from "#/components/features/chat/expandable-message";
-
-vi.mock("react-i18next", async () => {
- const actual = await vi.importActual("react-i18next");
- return {
- ...actual,
- useTranslation: () => ({
- t: (key: string) => key,
- i18n: {
- changeLanguage: () => new Promise(() => {}),
- language: "en",
- exists: () => true,
- },
- }),
- };
-});
-
-describe("ExpandableMessage", () => {
- it("should render with neutral border for non-action messages", () => {
- renderWithProviders(<ExpandableMessage message="Hello" type="thought" />);
- const element = screen.getAllByText("Hello")[0];
- const container = element.closest(
- "div.flex.gap-2.items-center.justify-start",
- );
- expect(container).toHaveClass("border-neutral-300");
- expect(screen.queryByTestId("status-icon")).not.toBeInTheDocument();
- });
-
- it("should render with neutral border for error messages", () => {
- renderWithProviders(
- <ExpandableMessage message="Error occurred" type="error" />,
- );
- const element = screen.getAllByText("Error occurred")[0];
- const container = element.closest(
- "div.flex.gap-2.items-center.justify-start",
- );
- expect(container).toHaveClass("border-danger");
- expect(screen.queryByTestId("status-icon")).not.toBeInTheDocument();
- });
-
- it("should render with success icon for successful action messages", () => {
- renderWithProviders(
- <ExpandableMessage
- id="OBSERVATION_MESSAGE$RUN"
- message="Command executed successfully"
- type="action"
- success
- />,
- );
- const element = screen.getByText("OBSERVATION_MESSAGE$RUN");
- const container = element.closest(
- "div.flex.gap-2.items-center.justify-start",
- );
- expect(container).toHaveClass("border-neutral-300");
- const icon = screen.getByTestId("status-icon");
- expect(icon).toHaveClass("fill-success");
- });
-
- it("should render with no icon for failed action messages", () => {
- renderWithProviders(
- <ExpandableMessage
- id="OBSERVATION_MESSAGE$RUN"
- message="Command failed"
- type="action"
- success={false}
- />,
- );
- const element = screen.getByText("OBSERVATION_MESSAGE$RUN");
- const container = element.closest(
- "div.flex.gap-2.items-center.justify-start",
- );
- expect(container).toHaveClass("border-neutral-300");
- expect(screen.queryByTestId("status-icon")).not.toBeInTheDocument();
- });
-
- it("should render with neutral border and no icon for action messages without success prop", () => {
- renderWithProviders(
- <ExpandableMessage
- id="OBSERVATION_MESSAGE$RUN"
- message="Running command"
- type="action"
- />,
- );
- const element = screen.getByText("OBSERVATION_MESSAGE$RUN");
- const container = element.closest(
- "div.flex.gap-2.items-center.justify-start",
- );
- expect(container).toHaveClass("border-neutral-300");
- expect(screen.queryByTestId("status-icon")).not.toBeInTheDocument();
- });
-
- it("should render with neutral border and no icon for action messages with undefined success (timeout case)", () => {
- renderWithProviders(
- <ExpandableMessage
- id="OBSERVATION_MESSAGE$RUN"
- message="Command timed out"
- type="action"
- success={undefined}
- />,
- );
- const element = screen.getByText("OBSERVATION_MESSAGE$RUN");
- const container = element.closest(
- "div.flex.gap-2.items-center.justify-start",
- );
- expect(container).toHaveClass("border-neutral-300");
- expect(screen.queryByTestId("status-icon")).not.toBeInTheDocument();
- });
-
-});
diff --git a/__tests__/components/chat/message-display-continuity.test.tsx b/__tests__/components/chat/message-display-continuity.test.tsx
index 9e35e5e045..ca4208ac1f 100644
--- a/__tests__/components/chat/message-display-continuity.test.tsx
+++ b/__tests__/components/chat/message-display-continuity.test.tsx
@@ -18,10 +18,8 @@ import { useUnifiedUploadFiles } from "#/hooks/mutation/use-unified-upload-files
import { useEventStore } from "#/stores/use-event-store";
import { useAgentState } from "#/hooks/use-agent-state";
import { AgentState } from "#/types/agent-state";
-import { OpenHandsAction } from "#/types/core/actions";
// Module-level mocks
-vi.mock("#/context/ws-client-provider");
vi.mock("#/hooks/query/use-config");
vi.mock("#/hooks/mutation/use-get-trajectory");
vi.mock("#/hooks/mutation/use-unified-upload-files");
@@ -71,9 +69,11 @@ vi.mock("#/components/shared/buttons/scroll-to-bottom-button", () => ({
ScrollToBottomButton: () => <button type="button">Scroll to bottom</button>,
}));
-vi.mock("#/components/v1/chat", async (importOriginal) => ({
- ...(await importOriginal<typeof import("#/components/v1/chat")>()),
- Messages: () => <div data-testid="v1-messages" />,
+vi.mock("#/components/conversation-events/chat", async (importOriginal) => ({
+ ...(await importOriginal<
+ typeof import("#/components/conversation-events/chat")
+ >()),
+ Messages: () => <div data-testid="conversation-messages" />,
}));
// Helper to render with QueryClient and route params
@@ -93,20 +93,6 @@ const renderWithQueryClient = (
</QueryClientProvider>,
);
-// V0 user event (numeric id, action property)
-const createV0UserEvent = (): OpenHandsAction => ({
- id: 1,
- source: "user",
- action: "message",
- args: {
- content: "Hello from V0",
- image_urls: [],
- file_urls: [],
- },
- message: "Hello from V0",
- timestamp: "2025-07-01T00:00:00Z",
-});
-
describe("ChatInterface – message display continuity (spec 3.1)", () => {
let queryClient: QueryClient;
@@ -124,7 +110,7 @@ describe("ChatInterface – message display continuity (spec 3.1)", () => {
});
(useConfig as unknown as ReturnType<typeof vi.fn>).mockReturnValue({
- data: {},
+ data: { app_mode: "local" },
});
(useGetTrajectory as unknown as ReturnType<typeof vi.fn>).mockReturnValue({
mutate: vi.fn(),
@@ -140,7 +126,7 @@ describe("ChatInterface – message display continuity (spec 3.1)", () => {
isLoading: false,
});
- // Default: no conversation (V0 behavior)
+ // Default: no active conversation
vi.mocked(useActiveConversation).mockReturnValue({
data: undefined,
} as ReturnType<typeof useActiveConversation>);
@@ -149,15 +135,15 @@ describe("ChatInterface – message display continuity (spec 3.1)", () => {
vi.mocked(useConversationWebSocket).mockReturnValue(null);
});
- describe("V1 conversations", () => {
+ describe("conversations", () => {
beforeEach(() => {
- // Set up V1 conversation
+ // Set up conversation
vi.mocked(useActiveConversation).mockReturnValue({
data: {},
} as ReturnType<typeof useActiveConversation>);
});
- it("shows messages immediately when V1 events exist in store, even while loading", () => {
+ it("shows messages immediately when agent-server events exist in store, even while loading", () => {
// Simulate: history is loading but events already exist in store (e.g., remount)
vi.mocked(useConversationWebSocket).mockReturnValue({
isLoadingHistory: true,
@@ -165,11 +151,12 @@ describe("ChatInterface – message display continuity (spec 3.1)", () => {
sendMessage: vi.fn(),
});
- // Put V1 user events in the store
- const v1UserEvent = createUserMessageEvent("evt-1");
+ // Put agent-server user events in the store
+ const userEvent = createUserMessageEvent("evt-1");
useEventStore.setState({
- events: [v1UserEvent],
- uiEvents: [v1UserEvent],
+ events: [userEvent],
+ eventIds: new Set(["evt-1"]),
+ uiEvents: [userEvent],
});
renderWithQueryClient(<ChatInterface />, queryClient);
@@ -192,6 +179,7 @@ describe("ChatInterface – message display continuity (spec 3.1)", () => {
// Store is empty
useEventStore.setState({
events: [],
+ eventIds: new Set(),
uiEvents: [],
});
@@ -209,11 +197,12 @@ describe("ChatInterface – message display continuity (spec 3.1)", () => {
sendMessage: vi.fn(),
});
- // V1 events in store
- const v1UserEvent = createUserMessageEvent("evt-2");
+ // agent-server events in store
+ const userEvent = createUserMessageEvent("evt-2");
useEventStore.setState({
- events: [v1UserEvent],
- uiEvents: [v1UserEvent],
+ events: [userEvent],
+ eventIds: new Set(["evt-1"]),
+ uiEvents: [userEvent],
});
renderWithQueryClient(<ChatInterface />, queryClient);
diff --git a/__tests__/components/v1/chat/event-content-helpers/create-skill-ready-event.test.ts b/__tests__/components/conversation-events/chat/event-content-helpers/create-skill-ready-event.test.ts
similarity index 93%
rename from __tests__/components/v1/chat/event-content-helpers/create-skill-ready-event.test.ts
rename to __tests__/components/conversation-events/chat/event-content-helpers/create-skill-ready-event.test.ts
index e2d7d7d2e1..61bc6cb08d 100644
--- a/__tests__/components/v1/chat/event-content-helpers/create-skill-ready-event.test.ts
+++ b/__tests__/components/conversation-events/chat/event-content-helpers/create-skill-ready-event.test.ts
@@ -2,8 +2,8 @@ import { describe, expect, it } from "vitest";
import {
createSkillReadyEvent,
isSkillReadyEvent,
-} from "#/components/v1/chat/event-content-helpers/create-skill-ready-event";
-import { MessageEvent } from "#/types/v1/core";
+} from "#/components/conversation-events/chat/event-content-helpers/create-skill-ready-event";
+import { MessageEvent } from "#/types/agent-server/core";
const makeMessageEvent = (
overrides: Partial<MessageEvent> = {},
diff --git a/__tests__/components/v1/chat/event-content-helpers/get-acp-tool-call-content.test.ts b/__tests__/components/conversation-events/chat/event-content-helpers/get-acp-tool-call-content.test.ts
similarity index 93%
rename from __tests__/components/v1/chat/event-content-helpers/get-acp-tool-call-content.test.ts
rename to __tests__/components/conversation-events/chat/event-content-helpers/get-acp-tool-call-content.test.ts
index 1ba5ef1550..291b646951 100644
--- a/__tests__/components/v1/chat/event-content-helpers/get-acp-tool-call-content.test.ts
+++ b/__tests__/components/conversation-events/chat/event-content-helpers/get-acp-tool-call-content.test.ts
@@ -2,9 +2,9 @@ import { describe, it, expect } from "vitest";
import {
getACPToolCallContent,
getACPToolCallTitleKey,
-} from "#/components/v1/chat/event-content-helpers/get-acp-tool-call-content";
-import { getACPToolCallResult } from "#/components/v1/chat/event-content-helpers/get-observation-result";
-import { ACPToolCallEvent } from "#/types/v1/core/events/acp-tool-call-event";
+} from "#/components/conversation-events/chat/event-content-helpers/get-acp-tool-call-content";
+import { getACPToolCallResult } from "#/components/conversation-events/chat/event-content-helpers/get-observation-result";
+import { ACPToolCallEvent } from "#/types/agent-server/core/events/acp-tool-call-event";
const baseEvent: ACPToolCallEvent = {
kind: "ACPToolCallEvent",
diff --git a/__tests__/components/v1/chat/event-content-helpers/get-observation-content.test.ts b/__tests__/components/conversation-events/chat/event-content-helpers/get-observation-content.test.ts
similarity index 97%
rename from __tests__/components/v1/chat/event-content-helpers/get-observation-content.test.ts
rename to __tests__/components/conversation-events/chat/event-content-helpers/get-observation-content.test.ts
index cebdbdab0c..110c134af7 100644
--- a/__tests__/components/v1/chat/event-content-helpers/get-observation-content.test.ts
+++ b/__tests__/components/conversation-events/chat/event-content-helpers/get-observation-content.test.ts
@@ -1,11 +1,11 @@
import { describe, it, expect } from "vitest";
-import { getObservationContent } from "#/components/v1/chat/event-content-helpers/get-observation-content";
-import { ObservationEvent } from "#/types/v1/core";
+import { getObservationContent } from "#/components/conversation-events/chat/event-content-helpers/get-observation-content";
+import { ObservationEvent } from "#/types/agent-server/core";
import {
BrowserObservation,
GlobObservation,
GrepObservation,
-} from "#/types/v1/core/base/observation";
+} from "#/types/agent-server/core/base/observation";
describe("getObservationContent - BrowserObservation", () => {
it("should return output content when available", () => {
diff --git a/__tests__/components/v1/chat/event-content-helpers/get-skill-ready-items.test.ts b/__tests__/components/conversation-events/chat/event-content-helpers/get-skill-ready-items.test.ts
similarity index 92%
rename from __tests__/components/v1/chat/event-content-helpers/get-skill-ready-items.test.ts
rename to __tests__/components/conversation-events/chat/event-content-helpers/get-skill-ready-items.test.ts
index a19c3e3755..b322a13d5f 100644
--- a/__tests__/components/v1/chat/event-content-helpers/get-skill-ready-items.test.ts
+++ b/__tests__/components/conversation-events/chat/event-content-helpers/get-skill-ready-items.test.ts
@@ -1,6 +1,6 @@
import { describe, expect, it } from "vitest";
-import { getSkillReadyItems } from "#/components/v1/chat/event-content-helpers/get-skill-ready-content";
-import { TextContent } from "#/types/v1/core/base/common";
+import { getSkillReadyItems } from "#/components/conversation-events/chat/event-content-helpers/get-skill-ready-content";
+import { TextContent } from "#/types/agent-server/core/base/common";
const makeTextContent = (text: string): TextContent[] => [
{ type: "text", text },
diff --git a/__tests__/components/v1/chat/event-content-helpers/should-render-event.test.ts b/__tests__/components/conversation-events/chat/event-content-helpers/should-render-event.test.ts
similarity index 91%
rename from __tests__/components/v1/chat/event-content-helpers/should-render-event.test.ts
rename to __tests__/components/conversation-events/chat/event-content-helpers/should-render-event.test.ts
index 1df8d8d128..72091f6ebf 100644
--- a/__tests__/components/v1/chat/event-content-helpers/should-render-event.test.ts
+++ b/__tests__/components/conversation-events/chat/event-content-helpers/should-render-event.test.ts
@@ -1,12 +1,12 @@
import { describe, expect, it } from "vitest";
-import { shouldRenderEvent } from "#/components/v1/chat/event-content-helpers/should-render-event";
+import { shouldRenderEvent } from "#/components/conversation-events/chat/event-content-helpers/should-render-event";
import {
createPlanningFileEditorActionEvent,
createOtherActionEvent,
createPlanningObservationEvent,
createUserMessageEvent,
} from "test-utils";
-import { ACPToolCallEvent } from "#/types/v1/core/events/acp-tool-call-event";
+import { ACPToolCallEvent } from "#/types/agent-server/core/events/acp-tool-call-event";
const makeACPEvent = (
overrides: Partial<ACPToolCallEvent> = {},
diff --git a/__tests__/components/v1/chat/event-message-acp-tool-call.test.tsx b/__tests__/components/conversation-events/chat/event-message-acp-tool-call.test.tsx
similarity index 95%
rename from __tests__/components/v1/chat/event-message-acp-tool-call.test.tsx
rename to __tests__/components/conversation-events/chat/event-message-acp-tool-call.test.tsx
index 84e465e19c..e1e70615bf 100644
--- a/__tests__/components/v1/chat/event-message-acp-tool-call.test.tsx
+++ b/__tests__/components/conversation-events/chat/event-message-acp-tool-call.test.tsx
@@ -2,10 +2,10 @@ import { describe, expect, it, vi, beforeEach } from "vitest";
import { screen } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import { renderWithProviders } from "test-utils";
-import { EventMessage } from "#/components/v1/chat/event-message";
+import { EventMessage } from "#/components/conversation-events/chat/event-message";
import { useAgentState } from "#/hooks/use-agent-state";
import { AgentState } from "#/types/agent-state";
-import { ACPToolCallEvent } from "#/types/v1/core/events/acp-tool-call-event";
+import { ACPToolCallEvent } from "#/types/agent-server/core/events/acp-tool-call-event";
vi.mock("#/hooks/query/use-config", () => ({
useConfig: () => ({ data: { APP_MODE: "saas" } }),
diff --git a/__tests__/components/v1/chat/event-message-components/event-group.test.tsx b/__tests__/components/conversation-events/chat/event-message-components/event-group.test.tsx
similarity index 94%
rename from __tests__/components/v1/chat/event-message-components/event-group.test.tsx
rename to __tests__/components/conversation-events/chat/event-message-components/event-group.test.tsx
index 1313eb9898..045d9f5a4a 100644
--- a/__tests__/components/v1/chat/event-message-components/event-group.test.tsx
+++ b/__tests__/components/conversation-events/chat/event-message-components/event-group.test.tsx
@@ -2,14 +2,14 @@ import { describe, it, expect } from "vitest";
import { screen } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import { renderWithProviders } from "test-utils";
-import { EventGroup } from "#/components/v1/chat/event-message-components/event-group";
+import { EventGroup } from "#/components/conversation-events/chat/event-message-components/event-group";
import {
ActionEvent,
ObservationEvent,
SecurityRisk,
-} from "#/types/v1/core";
-import { ExecuteBashAction } from "#/types/v1/core/base/action";
-import { ExecuteBashObservation } from "#/types/v1/core/base/observation";
+} from "#/types/agent-server/core";
+import { ExecuteBashAction } from "#/types/agent-server/core/base/action";
+import { ExecuteBashObservation } from "#/types/agent-server/core/base/observation";
const makeBashAction = (
id: string,
diff --git a/__tests__/components/v1/chat/event-message-components/skill-item-expanded.test.ts b/__tests__/components/conversation-events/chat/event-message-components/skill-item-expanded.test.ts
similarity index 97%
rename from __tests__/components/v1/chat/event-message-components/skill-item-expanded.test.ts
rename to __tests__/components/conversation-events/chat/event-message-components/skill-item-expanded.test.ts
index c32207c7ba..4e3f4fed99 100644
--- a/__tests__/components/v1/chat/event-message-components/skill-item-expanded.test.ts
+++ b/__tests__/components/conversation-events/chat/event-message-components/skill-item-expanded.test.ts
@@ -2,7 +2,7 @@ import { describe, expect, it } from "vitest";
import {
parseSkillContent,
styleImportantTags,
-} from "#/components/v1/chat/event-message-components/skill-item-expanded";
+} from "#/components/conversation-events/chat/event-message-components/skill-item-expanded";
describe("parseSkillContent", () => {
it("should extract matchInfo from content", () => {
diff --git a/__tests__/components/v1/chat/event-message-components/skill-ready-content-list.test.tsx b/__tests__/components/conversation-events/chat/event-message-components/skill-ready-content-list.test.tsx
similarity index 94%
rename from __tests__/components/v1/chat/event-message-components/skill-ready-content-list.test.tsx
rename to __tests__/components/conversation-events/chat/event-message-components/skill-ready-content-list.test.tsx
index 13dfc727b8..e7c18518cf 100644
--- a/__tests__/components/v1/chat/event-message-components/skill-ready-content-list.test.tsx
+++ b/__tests__/components/conversation-events/chat/event-message-components/skill-ready-content-list.test.tsx
@@ -2,8 +2,8 @@ import { screen } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import { describe, it, expect } from "vitest";
import { renderWithProviders } from "test-utils";
-import { SkillReadyContentList } from "#/components/v1/chat/event-message-components/skill-ready-content-list";
-import { SkillReadyItem } from "#/components/v1/chat/event-content-helpers/create-skill-ready-event";
+import { SkillReadyContentList } from "#/components/conversation-events/chat/event-message-components/skill-ready-content-list";
+import { SkillReadyItem } from "#/components/conversation-events/chat/event-content-helpers/create-skill-ready-event";
const makeItems = (
...entries: [string, string][]
diff --git a/__tests__/components/v1/chat/event-message-plan-preview.test.tsx b/__tests__/components/conversation-events/chat/event-message-plan-preview.test.tsx
similarity index 99%
rename from __tests__/components/v1/chat/event-message-plan-preview.test.tsx
rename to __tests__/components/conversation-events/chat/event-message-plan-preview.test.tsx
index dac093f88c..d15dd99d44 100644
--- a/__tests__/components/v1/chat/event-message-plan-preview.test.tsx
+++ b/__tests__/components/conversation-events/chat/event-message-plan-preview.test.tsx
@@ -1,6 +1,6 @@
import { describe, expect, it, vi, beforeEach, afterEach } from "vitest";
import { screen } from "@testing-library/react";
-import { EventMessage } from "#/components/v1/chat/event-message";
+import { EventMessage } from "#/components/conversation-events/chat/event-message";
import { useConversationStore } from "#/stores/conversation-store";
import { useAgentState } from "#/hooks/use-agent-state";
import { AgentState } from "#/types/agent-state";
diff --git a/__tests__/components/v1/chat/event-message-think-action.test.tsx b/__tests__/components/conversation-events/chat/event-message-think-action.test.tsx
similarity index 94%
rename from __tests__/components/v1/chat/event-message-think-action.test.tsx
rename to __tests__/components/conversation-events/chat/event-message-think-action.test.tsx
index 4d4fce038b..5cdacd53e1 100644
--- a/__tests__/components/v1/chat/event-message-think-action.test.tsx
+++ b/__tests__/components/conversation-events/chat/event-message-think-action.test.tsx
@@ -1,10 +1,10 @@
import { describe, expect, it, vi, beforeEach, afterEach } from "vitest";
import { screen } from "@testing-library/react";
-import { EventMessage } from "#/components/v1/chat/event-message";
+import { EventMessage } from "#/components/conversation-events/chat/event-message";
import { useAgentState } from "#/hooks/use-agent-state";
import { AgentState } from "#/types/agent-state";
-import { ActionEvent, SecurityRisk } from "#/types/v1/core";
-import { ThinkAction, ExecuteBashAction } from "#/types/v1/core/base/action";
+import { ActionEvent, SecurityRisk } from "#/types/agent-server/core";
+import { ThinkAction, ExecuteBashAction } from "#/types/agent-server/core/base/action";
import { renderWithProviders } from "test-utils";
// Mock useConfig
diff --git a/__tests__/components/v1/chat/group-events.test.ts b/__tests__/components/conversation-events/chat/group-events.test.ts
similarity index 97%
rename from __tests__/components/v1/chat/group-events.test.ts
rename to __tests__/components/conversation-events/chat/group-events.test.ts
index 351d6c1d9c..94900dccb5 100644
--- a/__tests__/components/v1/chat/group-events.test.ts
+++ b/__tests__/components/conversation-events/chat/group-events.test.ts
@@ -3,7 +3,7 @@ import {
groupEvents,
isGroupableEvent,
EVENT_GROUP_MIN_SIZE,
-} from "#/components/v1/chat/group-events";
+} from "#/components/conversation-events/chat/group-events";
import {
ActionEvent,
AgentErrorEvent,
@@ -11,18 +11,18 @@ import {
MessageEvent,
ObservationEvent,
SecurityRisk,
-} from "#/types/v1/core";
-import { TextContent } from "#/types/v1/core/base/common";
+} from "#/types/agent-server/core";
+import { TextContent } from "#/types/agent-server/core/base/common";
import {
ExecuteBashAction,
FinishAction,
ThinkAction,
-} from "#/types/v1/core/base/action";
+} from "#/types/agent-server/core/base/action";
import {
ExecuteBashObservation,
PlanningFileEditorObservation,
TaskTrackerObservation,
-} from "#/types/v1/core/base/observation";
+} from "#/types/agent-server/core/base/observation";
const makeBashAction = (
id: string,
diff --git a/__tests__/components/v1/chat/hooks/use-plan-preview-events.test.ts b/__tests__/components/conversation-events/chat/hooks/use-plan-preview-events.test.ts
similarity index 98%
rename from __tests__/components/v1/chat/hooks/use-plan-preview-events.test.ts
rename to __tests__/components/conversation-events/chat/hooks/use-plan-preview-events.test.ts
index 438140fdb5..9a55ba70f7 100644
--- a/__tests__/components/v1/chat/hooks/use-plan-preview-events.test.ts
+++ b/__tests__/components/conversation-events/chat/hooks/use-plan-preview-events.test.ts
@@ -3,13 +3,13 @@ import { describe, expect, it } from "vitest";
import {
usePlanPreviewEvents,
shouldShowPlanPreview,
-} from "#/components/v1/chat/hooks/use-plan-preview-events";
+} from "#/components/conversation-events/chat/hooks/use-plan-preview-events";
import {
OpenHandsEvent,
MessageEvent,
ObservationEvent,
PlanningFileEditorObservation,
-} from "#/types/v1/core";
+} from "#/types/agent-server/core";
// Helper to create a user message event
const createUserMessageEvent = (id: string): MessageEvent => ({
diff --git a/__tests__/components/v1/get-event-content.test.tsx b/__tests__/components/conversation-events/get-event-content.test.tsx
similarity index 98%
rename from __tests__/components/v1/get-event-content.test.tsx
rename to __tests__/components/conversation-events/get-event-content.test.tsx
index e26da2a770..d600efcb54 100644
--- a/__tests__/components/v1/get-event-content.test.tsx
+++ b/__tests__/components/conversation-events/get-event-content.test.tsx
@@ -1,7 +1,7 @@
import { render, screen } from "@testing-library/react";
import { describe, expect, it } from "vitest";
-import { getEventContent } from "#/components/v1/chat";
-import { ActionEvent, ObservationEvent, SecurityRisk } from "#/types/v1/core";
+import { getEventContent } from "#/components/conversation-events/chat";
+import { ActionEvent, ObservationEvent, SecurityRisk } from "#/types/agent-server/core";
const terminalActionEvent: ActionEvent = {
id: "action-1",
diff --git a/__tests__/components/features/chat/components/chat-input-actions.test.tsx b/__tests__/components/features/chat/components/chat-input-actions.test.tsx
index ecc671137b..8ccbcf0738 100644
--- a/__tests__/components/features/chat/components/chat-input-actions.test.tsx
+++ b/__tests__/components/features/chat/components/chat-input-actions.test.tsx
@@ -24,9 +24,9 @@ vi.mock("#/components/features/chat/change-agent-button", () => ({
// Mock the underlying mutation service module that the pause/resume hooks call.
vi.mock("#/hooks/mutation/conversation-mutation-utils", () => ({
- pauseV1Conversation: vi.fn(),
- resumeV1Conversation: vi.fn(),
- askV1Agent: vi.fn(),
+ pauseConversation: vi.fn(),
+ resumeConversation: vi.fn(),
+ askAgent: vi.fn(),
updateConversationExecutionStatusInCache: vi.fn(),
invalidateConversationQueries: vi.fn(),
}));
diff --git a/__tests__/components/features/chat/task-tracking-observation-content.test.tsx b/__tests__/components/features/chat/task-tracking-observation-content.test.tsx
deleted file mode 100644
index 399179b1a6..0000000000
--- a/__tests__/components/features/chat/task-tracking-observation-content.test.tsx
+++ /dev/null
@@ -1,136 +0,0 @@
-import { render, screen } from "@testing-library/react";
-import { describe, it, expect, vi } from "vitest";
-import { TaskTrackingObservationContent } from "#/components/features/chat/task-tracking-observation-content";
-import { TaskTrackingObservation } from "#/types/core/observations";
-
-// Mock the translation hook
-vi.mock("react-i18next", () => ({
- useTranslation: () => ({
- t: (key: string) => {
- const translations: Record<string, string> = {
- TASK_TRACKING_OBSERVATION$TASK_LIST: "Task List",
- TASK_TRACKING_OBSERVATION$TASK_ID: "ID",
- TASK_TRACKING_OBSERVATION$TASK_NOTES: "Notes",
- TASK_TRACKING_OBSERVATION$RESULT: "Result",
- COMMON$TASKS: "Tasks",
- };
- return translations[key] || key;
- },
- }),
-}));
-
-describe("TaskTrackingObservationContent", () => {
- const mockEvent: TaskTrackingObservation = {
- id: 123,
- timestamp: "2024-01-01T00:00:00Z",
- source: "agent",
- observation: "task_tracking",
- content: "Task tracking operation completed successfully",
- cause: 122,
- message: "Task tracking operation completed successfully",
- extras: {
- command: "plan",
- task_list: [
- {
- id: "task-1",
- title: "Implement feature A",
- status: "todo",
- notes: "This is a test task",
- },
- {
- id: "task-2",
- title: "Fix bug B",
- status: "in_progress",
- },
- {
- id: "task-3",
- title: "Deploy to production",
- status: "done",
- notes: "Completed successfully",
- },
- ],
- },
- };
-
- it("does not render command section", () => {
- render(<TaskTrackingObservationContent event={mockEvent} />);
-
- expect(screen.queryByText("Command")).not.toBeInTheDocument();
- expect(screen.queryByText("plan")).not.toBeInTheDocument();
- });
-
- it("renders task list when command is 'plan' and tasks exist", () => {
- render(<TaskTrackingObservationContent event={mockEvent} />);
-
- expect(screen.getByText("Tasks")).toBeInTheDocument();
- expect(screen.getByText("Implement feature A")).toBeInTheDocument();
- expect(screen.getByText("Fix bug B")).toBeInTheDocument();
- expect(screen.getByText("Deploy to production")).toBeInTheDocument();
- });
-
- it("displays correct status icons and badges", () => {
- const { container } = render(
- <TaskTrackingObservationContent event={mockEvent} />,
- );
-
- // Status is represented by icons, not text. Verify task items are rendered with their titles
- // which indicates the status icons are present (status affects icon rendering)
- expect(screen.getByText("Implement feature A")).toBeInTheDocument();
- expect(screen.getByText("Fix bug B")).toBeInTheDocument();
- expect(screen.getByText("Deploy to production")).toBeInTheDocument();
-
- // Verify task items are present (they contain the status icons)
- const taskItems = container.querySelectorAll('[data-name="item"]');
- expect(taskItems).toHaveLength(3);
- });
-
- it("does not display task IDs but displays notes", () => {
- render(<TaskTrackingObservationContent event={mockEvent} />);
-
- expect(screen.queryByText("ID: task-1")).not.toBeInTheDocument();
- expect(screen.queryByText("ID: task-2")).not.toBeInTheDocument();
- expect(screen.queryByText("ID: task-3")).not.toBeInTheDocument();
-
- expect(screen.getByText("Notes: This is a test task")).toBeInTheDocument();
- expect(
- screen.getByText("Notes: Completed successfully"),
- ).toBeInTheDocument();
- });
-
- it("does not display Notes when notes are empty", () => {
- render(<TaskTrackingObservationContent event={mockEvent} />);
-
- // task-2 has no notes, so "Notes:" should not appear for it
- // We have 2 tasks with notes, so there should be exactly 2 "Notes:" elements
- const notesElements = screen.getAllByText(/^Notes:/);
- expect(notesElements).toHaveLength(2);
- });
-
- it("does not render task list when command is not 'plan'", () => {
- const eventWithoutPlan = {
- ...mockEvent,
- extras: {
- ...mockEvent.extras,
- command: "view",
- },
- };
-
- render(<TaskTrackingObservationContent event={eventWithoutPlan} />);
-
- expect(screen.queryByText("Tasks")).not.toBeInTheDocument();
- });
-
- it("does not render task list when task list is empty", () => {
- const eventWithEmptyTasks = {
- ...mockEvent,
- extras: {
- ...mockEvent.extras,
- task_list: [],
- },
- };
-
- render(<TaskTrackingObservationContent event={eventWithEmptyTasks} />);
-
- expect(screen.queryByText("Tasks")).not.toBeInTheDocument();
- });
-});
diff --git a/__tests__/components/features/conversation-panel/conversation-card.test.tsx b/__tests__/components/features/conversation-panel/conversation-card.test.tsx
index 587d6a19a8..141c765ff0 100644
--- a/__tests__/components/features/conversation-panel/conversation-card.test.tsx
+++ b/__tests__/components/features/conversation-panel/conversation-card.test.tsx
@@ -15,7 +15,7 @@ import { formatTimeDelta } from "#/utils/format-time-delta";
import { ConversationCard } from "#/components/features/conversation-panel/conversation-card/conversation-card";
import { clickOnEditButton } from "./utils";
import { ConversationCardActions } from "#/components/features/conversation-panel/conversation-card/conversation-card-actions";
-import { V1ExecutionStatus } from "#/types/v1/core/base/common";
+import { ExecutionStatus } from "#/types/agent-server/core/base/common";
import {
__resetActiveStoreForTests,
setActiveSelection,
@@ -482,14 +482,14 @@ describe("ConversationCard", () => {
).not.toBeInTheDocument();
});
- const statusTable: [V1ExecutionStatus, boolean][] = [
- [V1ExecutionStatus.RUNNING, true],
- [V1ExecutionStatus.IDLE, true],
- [V1ExecutionStatus.FINISHED, true],
- [V1ExecutionStatus.WAITING_FOR_CONFIRMATION, true],
- [V1ExecutionStatus.ERROR, false],
- [V1ExecutionStatus.STUCK, false],
- [V1ExecutionStatus.PAUSED, false],
+ const statusTable: [ExecutionStatus, boolean][] = [
+ [ExecutionStatus.RUNNING, true],
+ [ExecutionStatus.IDLE, true],
+ [ExecutionStatus.FINISHED, true],
+ [ExecutionStatus.WAITING_FOR_CONFIRMATION, true],
+ [ExecutionStatus.ERROR, false],
+ [ExecutionStatus.STUCK, false],
+ [ExecutionStatus.PAUSED, false],
];
it.each(statusTable)(
@@ -535,7 +535,7 @@ describe("ConversationCard", () => {
contextMenuOpen={true}
onContextMenuToggle={vi.fn()}
onStop={vi.fn()}
- executionStatus={V1ExecutionStatus.RUNNING}
+ executionStatus={ExecutionStatus.RUNNING}
/>,
);
@@ -554,7 +554,7 @@ describe("ConversationCard", () => {
contextMenuOpen={true}
onContextMenuToggle={vi.fn()}
onStop={vi.fn()}
- executionStatus={V1ExecutionStatus.RUNNING}
+ executionStatus={ExecutionStatus.RUNNING}
/>
</ActiveBackendProvider>,
);
diff --git a/__tests__/components/features/conversation-panel/conversation-panel.test.tsx b/__tests__/components/features/conversation-panel/conversation-panel.test.tsx
index 692c566235..97f5bca69c 100644
--- a/__tests__/components/features/conversation-panel/conversation-panel.test.tsx
+++ b/__tests__/components/features/conversation-panel/conversation-panel.test.tsx
@@ -5,9 +5,9 @@ import { createRoutesStub } from "react-router";
import React from "react";
import { renderWithProviders } from "test-utils";
import { ConversationPanel } from "#/components/features/conversation-panel/conversation-panel";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
-import { V1AppConversation } from "#/api/conversation-service/v1-conversation-service.types";
-import { V1ExecutionStatus } from "#/types/v1/core";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
+import { AppConversation } from "#/api/conversation-service/agent-server-conversation-service.types";
+import { ExecutionStatus } from "#/types/agent-server/core";
// Mock the unified stop conversation hook
const mockStopConversationMutate = vi.fn();
@@ -18,8 +18,8 @@ vi.mock("#/hooks/mutation/use-unified-stop-conversation", () => ({
}));
-// Helper to create complete V1AppConversation mock data
-const createMockConversation = (overrides: Partial<V1AppConversation> = {}): V1AppConversation => ({
+// Helper to create complete AppConversation mock data
+const createMockConversation = (overrides: Partial<AppConversation> = {}): AppConversation => ({
id: "test-id",
title: "Test Conversation",
selected_repository: null,
@@ -27,7 +27,7 @@ const createMockConversation = (overrides: Partial<V1AppConversation> = {}): V1A
selected_branch: null,
updated_at: "2021-10-01T12:00:00Z",
created_at: "2021-10-01T12:00:00Z",
- execution_status: V1ExecutionStatus.FINISHED,
+ execution_status: ExecutionStatus.FINISHED,
conversation_url: null,
created_by_user_id: "user1",
metrics: null,
@@ -73,7 +73,7 @@ describe("ConversationPanel", () => {
}));
});
- const mockConversations: V1AppConversation[] = [
+ const mockConversations: AppConversation[] = [
createMockConversation({ id: "1", title: "Conversation 1", updated_at: "2021-10-01T12:00:00Z" }),
createMockConversation({ id: "2", title: "Conversation 2", updated_at: "2021-10-02T12:00:00Z" }),
createMockConversation({ id: "3", title: "Conversation 3", updated_at: "2021-10-03T12:00:00Z" }),
@@ -83,7 +83,7 @@ describe("ConversationPanel", () => {
vi.clearAllMocks();
mockStopConversationMutate.mockClear();
// Setup default mock for V1 searchConversations
- vi.spyOn(V1ConversationService, "searchConversations").mockResolvedValue({
+ vi.spyOn(AgentServerConversationService, "searchConversations").mockResolvedValue({
items: [...mockConversations],
next_page_id: null,
});
@@ -100,7 +100,7 @@ describe("ConversationPanel", () => {
it("should display an empty state when there are no conversations", async () => {
const searchConversationsSpy = vi.spyOn(
- V1ConversationService,
+ AgentServerConversationService,
"searchConversations",
);
searchConversationsSpy.mockResolvedValue({
@@ -116,7 +116,7 @@ describe("ConversationPanel", () => {
it("should handle an error when fetching conversations", async () => {
const searchConversationsSpy = vi.spyOn(
- V1ConversationService,
+ AgentServerConversationService,
"searchConversations",
);
searchConversationsSpy.mockRejectedValue(
@@ -165,14 +165,14 @@ describe("ConversationPanel", () => {
it("should delete a conversation", async () => {
const user = userEvent.setup();
- const mockData: V1AppConversation[] = [
+ const mockData: AppConversation[] = [
createMockConversation({ id: "1", title: "Conversation 1", updated_at: "2021-10-01T12:00:00Z" }),
createMockConversation({ id: "2", title: "Conversation 2", updated_at: "2021-10-02T12:00:00Z" }),
createMockConversation({ id: "3", title: "Conversation 3", updated_at: "2021-10-03T12:00:00Z" }),
];
const searchConversationsSpy = vi.spyOn(
- V1ConversationService,
+ AgentServerConversationService,
"searchConversations",
);
searchConversationsSpy.mockImplementation(async () => ({
@@ -181,7 +181,7 @@ describe("ConversationPanel", () => {
}));
const deleteConversationSpy = vi.spyOn(
- V1ConversationService,
+ AgentServerConversationService,
"deleteConversation",
);
deleteConversationSpy.mockImplementation(async (id: string) => {
@@ -228,7 +228,7 @@ describe("ConversationPanel", () => {
it("should refetch data on rerenders", async () => {
const user = userEvent.setup();
const searchConversationsSpy = vi.spyOn(
- V1ConversationService,
+ AgentServerConversationService,
"searchConversations",
);
searchConversationsSpy.mockResolvedValue({
@@ -277,14 +277,14 @@ describe("ConversationPanel", () => {
const user = userEvent.setup();
// Create mock data with a RUNNING conversation
- const mockRunningConversations: V1AppConversation[] = [
- createMockConversation({ id: "1", title: "Running Conversation", execution_status: V1ExecutionStatus.RUNNING }),
- createMockConversation({ id: "2", title: "Starting Conversation", execution_status: V1ExecutionStatus.RUNNING }),
- createMockConversation({ id: "3", title: "Stopped Conversation", execution_status: V1ExecutionStatus.PAUSED }),
+ const mockRunningConversations: AppConversation[] = [
+ createMockConversation({ id: "1", title: "Running Conversation", execution_status: ExecutionStatus.RUNNING }),
+ createMockConversation({ id: "2", title: "Starting Conversation", execution_status: ExecutionStatus.RUNNING }),
+ createMockConversation({ id: "3", title: "Stopped Conversation", execution_status: ExecutionStatus.PAUSED }),
];
const searchConversationsSpy = vi.spyOn(
- V1ConversationService,
+ AgentServerConversationService,
"searchConversations",
);
searchConversationsSpy.mockResolvedValue({
@@ -324,14 +324,14 @@ describe("ConversationPanel", () => {
it("should stop a conversation", async () => {
const user = userEvent.setup();
- const mockData: V1AppConversation[] = [
- createMockConversation({ id: "1", title: "Conversation 1", execution_status: V1ExecutionStatus.RUNNING }),
- createMockConversation({ id: "2", title: "Conversation 2", execution_status: V1ExecutionStatus.FINISHED }),
- createMockConversation({ id: "3", title: "Conversation 3", execution_status: V1ExecutionStatus.FINISHED }),
+ const mockData: AppConversation[] = [
+ createMockConversation({ id: "1", title: "Conversation 1", execution_status: ExecutionStatus.RUNNING }),
+ createMockConversation({ id: "2", title: "Conversation 2", execution_status: ExecutionStatus.FINISHED }),
+ createMockConversation({ id: "3", title: "Conversation 3", execution_status: ExecutionStatus.FINISHED }),
];
const searchConversationsSpy = vi.spyOn(
- V1ConversationService,
+ AgentServerConversationService,
"searchConversations",
);
searchConversationsSpy.mockImplementation(async () => ({
@@ -372,14 +372,14 @@ describe("ConversationPanel", () => {
it("should only show stop button for STARTING or RUNNING conversations", async () => {
const user = userEvent.setup();
- const mockMixedStatusConversations: V1AppConversation[] = [
- createMockConversation({ id: "1", title: "Running Conversation", execution_status: V1ExecutionStatus.RUNNING }),
- createMockConversation({ id: "2", title: "Starting Conversation", execution_status: V1ExecutionStatus.RUNNING }),
- createMockConversation({ id: "3", title: "Stopped Conversation", execution_status: V1ExecutionStatus.PAUSED }),
+ const mockMixedStatusConversations: AppConversation[] = [
+ createMockConversation({ id: "1", title: "Running Conversation", execution_status: ExecutionStatus.RUNNING }),
+ createMockConversation({ id: "2", title: "Starting Conversation", execution_status: ExecutionStatus.RUNNING }),
+ createMockConversation({ id: "3", title: "Stopped Conversation", execution_status: ExecutionStatus.PAUSED }),
];
const searchConversationsSpy = vi.spyOn(
- V1ConversationService,
+ AgentServerConversationService,
"searchConversations",
);
searchConversationsSpy.mockResolvedValue({
@@ -489,7 +489,7 @@ describe("ConversationPanel", () => {
// Mock the updateConversationTitle API call
const updateConversationTitleSpy = vi.spyOn(
- V1ConversationService,
+ AgentServerConversationService,
"updateConversationTitle",
);
updateConversationTitleSpy.mockResolvedValue(createMockConversation({ id: "1", title: "Updated Title" }));
@@ -521,7 +521,7 @@ describe("ConversationPanel", () => {
const user = userEvent.setup();
const updateConversationTitleSpy = vi.spyOn(
- V1ConversationService,
+ AgentServerConversationService,
"updateConversationTitle",
);
updateConversationTitleSpy.mockResolvedValue(createMockConversation({ id: "1", title: "Updated Title" }));
@@ -551,7 +551,7 @@ describe("ConversationPanel", () => {
const user = userEvent.setup();
const updateConversationTitleSpy = vi.spyOn(
- V1ConversationService,
+ AgentServerConversationService,
"updateConversationTitle",
);
updateConversationTitleSpy.mockResolvedValue(createMockConversation({ id: "1", title: "Updated Title" }));
@@ -581,7 +581,7 @@ describe("ConversationPanel", () => {
const user = userEvent.setup();
const updateConversationTitleSpy = vi.spyOn(
- V1ConversationService,
+ AgentServerConversationService,
"updateConversationTitle",
);
updateConversationTitleSpy.mockResolvedValue(createMockConversation({ id: "1", title: "Updated Title" }));
@@ -610,7 +610,7 @@ describe("ConversationPanel", () => {
const user = userEvent.setup();
const updateConversationTitleSpy = vi.spyOn(
- V1ConversationService,
+ AgentServerConversationService,
"updateConversationTitle",
);
updateConversationTitleSpy.mockRejectedValue(new Error("API Error"));
@@ -675,7 +675,7 @@ describe("ConversationPanel", () => {
const user = userEvent.setup();
const updateConversationTitleSpy = vi.spyOn(
- V1ConversationService,
+ AgentServerConversationService,
"updateConversationTitle",
);
updateConversationTitleSpy.mockResolvedValue(createMockConversation({ id: "1", title: "Updated Title" }));
@@ -704,7 +704,7 @@ describe("ConversationPanel", () => {
const user = userEvent.setup();
const updateConversationTitleSpy = vi.spyOn(
- V1ConversationService,
+ AgentServerConversationService,
"updateConversationTitle",
);
updateConversationTitleSpy.mockResolvedValue(createMockConversation({ id: "1", title: "Updated Title" }));
@@ -762,13 +762,13 @@ describe("ConversationPanel", () => {
const user = userEvent.setup();
// Create mock data with a RUNNING conversation
- const mockRunningConversations: V1AppConversation[] = [
- createMockConversation({ id: "1", title: "Running Conversation", execution_status: V1ExecutionStatus.RUNNING }),
- createMockConversation({ id: "2", title: "Starting Conversation", execution_status: V1ExecutionStatus.RUNNING }),
- createMockConversation({ id: "3", title: "Stopped Conversation", execution_status: V1ExecutionStatus.PAUSED }),
+ const mockRunningConversations: AppConversation[] = [
+ createMockConversation({ id: "1", title: "Running Conversation", execution_status: ExecutionStatus.RUNNING }),
+ createMockConversation({ id: "2", title: "Starting Conversation", execution_status: ExecutionStatus.RUNNING }),
+ createMockConversation({ id: "3", title: "Stopped Conversation", execution_status: ExecutionStatus.PAUSED }),
];
- vi.spyOn(V1ConversationService, "searchConversations").mockResolvedValue({
+ vi.spyOn(AgentServerConversationService, "searchConversations").mockResolvedValue({
items: mockRunningConversations,
next_page_id: null,
});
diff --git a/__tests__/components/features/conversation-panel/hooks-modal.test.tsx b/__tests__/components/features/conversation-panel/hooks-modal.test.tsx
index 8f78ca18e6..4edd7ef44f 100644
--- a/__tests__/components/features/conversation-panel/hooks-modal.test.tsx
+++ b/__tests__/components/features/conversation-panel/hooks-modal.test.tsx
@@ -6,7 +6,7 @@ import { HookEventItem } from "#/components/features/conversation-panel/hook-eve
import { HooksEmptyState } from "#/components/features/conversation-panel/hooks-empty-state";
import { HooksLoadingState } from "#/components/features/conversation-panel/hooks-loading-state";
import { HooksModalHeader } from "#/components/features/conversation-panel/hooks-modal-header";
-import { HookEvent } from "#/api/conversation-service/v1-conversation-service.types";
+import { HookEvent } from "#/api/conversation-service/agent-server-conversation-service.types";
// Mock react-i18next
vi.mock("react-i18next", async () => {
diff --git a/__tests__/components/features/conversation-panel/system-message-modal/tool-item.test.tsx b/__tests__/components/features/conversation-panel/system-message-modal/tool-item.test.tsx
index 15fcef2b5f..e0e71bda88 100644
--- a/__tests__/components/features/conversation-panel/system-message-modal/tool-item.test.tsx
+++ b/__tests__/components/features/conversation-panel/system-message-modal/tool-item.test.tsx
@@ -3,7 +3,7 @@ import userEvent from "@testing-library/user-event";
import { afterEach, describe, expect, it, vi } from "vitest";
import { renderWithProviders } from "test-utils";
import { ToolItem } from "#/components/features/conversation-panel/system-message-modal/tool-item";
-import type { ChatCompletionToolParam } from "#/types/v1/core";
+import type { ChatCompletionToolParam } from "#/types/agent-server/core";
describe("ToolItem", () => {
const user = userEvent.setup();
diff --git a/__tests__/components/features/conversation/conversation-name.test.tsx b/__tests__/components/features/conversation/conversation-name.test.tsx
index 253c6db2a9..153f0404b5 100644
--- a/__tests__/components/features/conversation/conversation-name.test.tsx
+++ b/__tests__/components/features/conversation/conversation-name.test.tsx
@@ -12,7 +12,7 @@ import {
import { renderWithProviders } from "test-utils";
import { ConversationName } from "#/components/features/conversation/conversation-name";
import { ConversationNameContextMenu } from "#/components/features/conversation/conversation-name-context-menu";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
import type { Backend } from "#/api/backend-registry/types";
import type { Conversation } from "#/api/open-hands.types";
@@ -648,7 +648,7 @@ describe("ConversationName public sharing", () => {
orgId: null,
});
updatePublicFlagSpy = vi
- .spyOn(V1ConversationService, "updateConversationPublicFlag")
+ .spyOn(AgentServerConversationService, "updateConversationPublicFlag")
.mockResolvedValue({ id: "test-conversation-id", public: true } as never);
});
diff --git a/__tests__/components/features/conversation/server-status.test.tsx b/__tests__/components/features/conversation/server-status.test.tsx
index 467ac9b1da..a3c241e8d2 100644
--- a/__tests__/components/features/conversation/server-status.test.tsx
+++ b/__tests__/components/features/conversation/server-status.test.tsx
@@ -7,7 +7,7 @@ import { ServerStatusContextMenu } from "#/components/features/controls/server-s
import { ConversationStatus } from "#/types/conversation-status";
import { AgentState } from "#/types/agent-state";
import { useAgentState } from "#/hooks/use-agent-state";
-import { V1ExecutionStatus } from "#/types/v1/core/base/common";
+import { ExecutionStatus } from "#/types/agent-server/core/base/common";
// Mock the agent state hook
vi.mock("#/hooks/use-agent-state", () => ({
@@ -70,7 +70,7 @@ describe("ServerStatus", () => {
it("should render server status with RUNNING conversation status", () => {
mockAgentStore(AgentState.RUNNING);
- renderWithProviders(<ServerStatus executionStatus={V1ExecutionStatus.RUNNING} />);
+ renderWithProviders(<ServerStatus executionStatus={ExecutionStatus.RUNNING} />);
expect(screen.getByTestId("server-status")).toBeInTheDocument();
expect(screen.getByText("Running")).toBeInTheDocument();
@@ -79,7 +79,7 @@ describe("ServerStatus", () => {
it("should render server status with STOPPED conversation status", () => {
mockAgentStore(AgentState.RUNNING);
- renderWithProviders(<ServerStatus executionStatus={V1ExecutionStatus.PAUSED} />);
+ renderWithProviders(<ServerStatus executionStatus={ExecutionStatus.PAUSED} />);
expect(screen.getByTestId("server-status")).toBeInTheDocument();
expect(screen.getByText("Server Stopped")).toBeInTheDocument();
@@ -88,7 +88,7 @@ describe("ServerStatus", () => {
it("should render STARTING status when agent state is LOADING", () => {
mockAgentStore(AgentState.LOADING);
- renderWithProviders(<ServerStatus executionStatus={V1ExecutionStatus.IDLE} />);
+ renderWithProviders(<ServerStatus executionStatus={ExecutionStatus.IDLE} />);
expect(screen.getByTestId("server-status")).toBeInTheDocument();
expect(screen.getByText("Starting")).toBeInTheDocument();
@@ -97,7 +97,7 @@ describe("ServerStatus", () => {
it("should render STARTING status when agent state is INIT", () => {
mockAgentStore(AgentState.INIT);
- renderWithProviders(<ServerStatus executionStatus={V1ExecutionStatus.IDLE} />);
+ renderWithProviders(<ServerStatus executionStatus={ExecutionStatus.IDLE} />);
expect(screen.getByTestId("server-status")).toBeInTheDocument();
expect(screen.getByText("Starting")).toBeInTheDocument();
@@ -106,7 +106,7 @@ describe("ServerStatus", () => {
it("should render ERROR status when agent state is ERROR", () => {
mockAgentStore(AgentState.ERROR);
- renderWithProviders(<ServerStatus executionStatus={V1ExecutionStatus.RUNNING} />);
+ renderWithProviders(<ServerStatus executionStatus={ExecutionStatus.RUNNING} />);
expect(screen.getByTestId("server-status")).toBeInTheDocument();
expect(screen.getByText("Error")).toBeInTheDocument();
@@ -116,7 +116,7 @@ describe("ServerStatus", () => {
mockAgentStore(AgentState.RUNNING);
renderWithProviders(
- <ServerStatus executionStatus={V1ExecutionStatus.RUNNING} isPausing={true} />,
+ <ServerStatus executionStatus={ExecutionStatus.RUNNING} isPausing={true} />,
);
expect(screen.getByTestId("server-status")).toBeInTheDocument();
@@ -136,7 +136,7 @@ describe("ServerStatus", () => {
mockAgentStore(AgentState.RUNNING);
renderWithProviders(
- <ServerStatus executionStatus={V1ExecutionStatus.RUNNING} className="custom-class" />,
+ <ServerStatus executionStatus={ExecutionStatus.RUNNING} className="custom-class" />,
);
const container = screen.getByTestId("server-status");
@@ -167,7 +167,7 @@ describe("ServerStatusContextMenu", () => {
renderWithProviders(
<ServerStatusContextMenu
{...defaultProps}
- executionStatus={V1ExecutionStatus.RUNNING}
+ executionStatus={ExecutionStatus.RUNNING}
onStopServer={vi.fn()}
/>,
);
@@ -183,7 +183,7 @@ describe("ServerStatusContextMenu", () => {
renderWithProviders(
<ServerStatusContextMenu
{...defaultProps}
- executionStatus={V1ExecutionStatus.PAUSED}
+ executionStatus={ExecutionStatus.PAUSED}
onStartServer={vi.fn()}
/>,
);
@@ -199,7 +199,7 @@ describe("ServerStatusContextMenu", () => {
renderWithProviders(
<ServerStatusContextMenu
{...defaultProps}
- executionStatus={V1ExecutionStatus.RUNNING}
+ executionStatus={ExecutionStatus.RUNNING}
/>,
);
@@ -213,7 +213,7 @@ describe("ServerStatusContextMenu", () => {
renderWithProviders(
<ServerStatusContextMenu
{...defaultProps}
- executionStatus={V1ExecutionStatus.PAUSED}
+ executionStatus={ExecutionStatus.PAUSED}
/>,
);
@@ -229,7 +229,7 @@ describe("ServerStatusContextMenu", () => {
renderWithProviders(
<ServerStatusContextMenu
{...defaultProps}
- executionStatus={V1ExecutionStatus.RUNNING}
+ executionStatus={ExecutionStatus.RUNNING}
onStopServer={onStopServer}
/>,
);
@@ -248,7 +248,7 @@ describe("ServerStatusContextMenu", () => {
renderWithProviders(
<ServerStatusContextMenu
{...defaultProps}
- executionStatus={V1ExecutionStatus.PAUSED}
+ executionStatus={ExecutionStatus.PAUSED}
onStartServer={onStartServer}
/>,
);
@@ -265,7 +265,7 @@ describe("ServerStatusContextMenu", () => {
renderWithProviders(
<ServerStatusContextMenu
{...defaultProps}
- executionStatus={V1ExecutionStatus.RUNNING}
+ executionStatus={ExecutionStatus.RUNNING}
onStopServer={vi.fn()}
/>,
);
@@ -281,7 +281,7 @@ describe("ServerStatusContextMenu", () => {
renderWithProviders(
<ServerStatusContextMenu
{...defaultProps}
- executionStatus={V1ExecutionStatus.PAUSED}
+ executionStatus={ExecutionStatus.PAUSED}
onStartServer={vi.fn()}
/>,
);
@@ -299,7 +299,7 @@ describe("ServerStatusContextMenu", () => {
<ServerStatusContextMenu
{...defaultProps}
onClose={onClose}
- executionStatus={V1ExecutionStatus.RUNNING}
+ executionStatus={ExecutionStatus.RUNNING}
onStopServer={vi.fn()}
/>,
);
@@ -315,7 +315,7 @@ describe("ServerStatusContextMenu", () => {
renderWithProviders(
<ServerStatusContextMenu
{...defaultProps}
- executionStatus={V1ExecutionStatus.IDLE}
+ executionStatus={ExecutionStatus.IDLE}
/>,
);
diff --git a/__tests__/components/features/home/new-conversation.test.tsx b/__tests__/components/features/home/new-conversation.test.tsx
index 5d3bc91e94..b2d39bfd0d 100644
--- a/__tests__/components/features/home/new-conversation.test.tsx
+++ b/__tests__/components/features/home/new-conversation.test.tsx
@@ -2,7 +2,7 @@ import { screen, waitFor } from "@testing-library/react";
import { describe, expect, it, vi } from "vitest";
import userEvent from "@testing-library/user-event";
import { renderWithProviders } from "test-utils";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
import { NewConversation } from "#/components/features/home/new-conversation/new-conversation";
vi.mock("#/hooks/query/use-settings", async () => {
@@ -11,7 +11,7 @@ vi.mock("#/hooks/query/use-settings", async () => {
);
return {
...actual,
- getSettingsQueryFn: vi.fn().mockResolvedValue({ v1_enabled: true }),
+ getSettingsQueryFn: vi.fn().mockResolvedValue({}),
};
});
@@ -45,7 +45,7 @@ describe("NewConversation", () => {
it("should create an empty conversation and navigate when pressing the launch from scratch button", async () => {
const navigate = vi.fn();
const createConversationSpy = vi
- .spyOn(V1ConversationService, "createConversation")
+ .spyOn(AgentServerConversationService, "createConversation")
.mockResolvedValue({
id: "task-id",
created_by_user_id: null,
@@ -84,7 +84,7 @@ describe("NewConversation", () => {
it("should change the launch button text to 'Loading...' when creating a conversation", async () => {
// Mock V1 API to never resolve, keeping the mutation in loading state
- vi.spyOn(V1ConversationService, "createConversation").mockImplementation(
+ vi.spyOn(AgentServerConversationService, "createConversation").mockImplementation(
() => new Promise(() => {}),
);
diff --git a/__tests__/components/features/home/recent-conversation.test.tsx b/__tests__/components/features/home/recent-conversation.test.tsx
index c42d9941ec..fdeba1b06a 100644
--- a/__tests__/components/features/home/recent-conversation.test.tsx
+++ b/__tests__/components/features/home/recent-conversation.test.tsx
@@ -2,8 +2,8 @@ import { screen } from "@testing-library/react";
import { describe, it, expect, vi } from "vitest";
import { renderWithProviders } from "test-utils";
import { RecentConversation } from "#/components/features/home/recent-conversations/recent-conversation";
-import type { V1AppConversation } from "#/api/conversation-service/v1-conversation-service.types";
-import { V1ExecutionStatus } from "#/types/v1/core";
+import type { AppConversation } from "#/api/conversation-service/agent-server-conversation-service.types";
+import { ExecutionStatus } from "#/types/agent-server/core";
vi.mock("react-i18next", async () => {
const actual = await vi.importActual("react-i18next");
@@ -24,10 +24,10 @@ vi.mock("react-i18next", async () => {
};
});
-const baseConversation: V1AppConversation = {
+const baseConversation: AppConversation = {
id: "test-id",
title: "Test Conversation",
- execution_status: V1ExecutionStatus.RUNNING,
+ execution_status: ExecutionStatus.RUNNING,
updated_at: "2021-10-01T12:00:00Z",
created_at: "2021-10-01T12:00:00Z",
selected_repository: null,
@@ -44,7 +44,7 @@ const baseConversation: V1AppConversation = {
sub_conversation_ids: [],
};
-const renderRecentConversation = (conversation: V1AppConversation) =>
+const renderRecentConversation = (conversation: AppConversation) =>
renderWithProviders(<RecentConversation conversation={conversation} />);
describe("RecentConversation - llm_model", () => {
diff --git a/__tests__/components/features/home/recent-conversations.test.tsx b/__tests__/components/features/home/recent-conversations.test.tsx
index d04e812a0c..2ef9130027 100644
--- a/__tests__/components/features/home/recent-conversations.test.tsx
+++ b/__tests__/components/features/home/recent-conversations.test.tsx
@@ -3,7 +3,7 @@ import { describe, it, expect, vi } from "vitest";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { createRoutesStub } from "react-router";
import { RecentConversations } from "#/components/features/home/recent-conversations/recent-conversations";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
const renderRecentConversations = () => {
const RouterStub = createRoutesStub([
@@ -30,7 +30,7 @@ const renderRecentConversations = () => {
describe("RecentConversations", () => {
const searchConversationsSpy = vi.spyOn(
- V1ConversationService,
+ AgentServerConversationService,
"searchConversations",
);
diff --git a/__tests__/components/features/home/task-card.test.tsx b/__tests__/components/features/home/task-card.test.tsx
index c4b54190c0..82ca471874 100644
--- a/__tests__/components/features/home/task-card.test.tsx
+++ b/__tests__/components/features/home/task-card.test.tsx
@@ -2,7 +2,7 @@ import { screen, waitFor } from "@testing-library/react";
import { beforeEach, describe, expect, it, vi } from "vitest";
import userEvent from "@testing-library/user-event";
import { renderWithProviders } from "test-utils";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
import GitService from "#/api/git-service/git-service.api";
import { TaskCard } from "#/components/features/home/tasks/task-card";
import { GitRepository } from "#/types/git";
@@ -14,7 +14,7 @@ vi.mock("#/hooks/query/use-settings", async () => {
);
return {
...actual,
- getSettingsQueryFn: vi.fn().mockResolvedValue({ v1_enabled: true }),
+ getSettingsQueryFn: vi.fn().mockResolvedValue({}),
};
});
@@ -49,7 +49,7 @@ describe("TaskCard", () => {
it("should call createConversation when clicking the launch button", async () => {
const createConversationSpy = vi
- .spyOn(V1ConversationService, "createConversation")
+ .spyOn(AgentServerConversationService, "createConversation")
.mockResolvedValue({
id: "task-id",
created_by_user_id: null,
@@ -99,7 +99,7 @@ describe("TaskCard", () => {
it("should call create conversation with suggest task trigger and selected suggested task", async () => {
const createConversationSpy = vi
- .spyOn(V1ConversationService, "createConversation")
+ .spyOn(AgentServerConversationService, "createConversation")
.mockResolvedValue({
id: "task-id",
created_by_user_id: null,
@@ -149,7 +149,7 @@ describe("TaskCard", () => {
it("should navigate to the conversation page after creating a conversation", async () => {
const navigate = vi.fn();
- vi.spyOn(V1ConversationService, "createConversation").mockResolvedValue({
+ vi.spyOn(AgentServerConversationService, "createConversation").mockResolvedValue({
id: "task-id",
created_by_user_id: null,
status: "READY",
diff --git a/__tests__/components/features/home/workspace-selection-form.test.tsx b/__tests__/components/features/home/workspace-selection-form.test.tsx
index 09f74d67bf..d1334b4910 100644
--- a/__tests__/components/features/home/workspace-selection-form.test.tsx
+++ b/__tests__/components/features/home/workspace-selection-form.test.tsx
@@ -4,7 +4,7 @@ import { describe, expect, vi, beforeEach, it } from "vitest";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { WorkspaceSelectionForm } from "../../../../src/components/features/home/workspace-selection-form";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
import FilesService from "#/api/files-service/files-service.api";
import { useWorkspacesStore } from "#/stores/workspaces-store";
import { LocalWorkspace } from "#/types/workspace";
@@ -224,7 +224,7 @@ describe("WorkspaceSelectionForm", () => {
{ id: "/Users/me/dev/repo2", name: "repo2", path: "/Users/me/dev/repo2" },
];
const createSpy = vi
- .spyOn(V1ConversationService, "createConversation")
+ .spyOn(AgentServerConversationService, "createConversation")
.mockResolvedValue(makeStartTask({ app_conversation_id: "conv-xyz" }));
renderForm(workspaces);
diff --git a/__tests__/components/features/launch/plugin-launch-modal.test.tsx b/__tests__/components/features/launch/plugin-launch-modal.test.tsx
index c5c27adc5d..8b78617fd2 100644
--- a/__tests__/components/features/launch/plugin-launch-modal.test.tsx
+++ b/__tests__/components/features/launch/plugin-launch-modal.test.tsx
@@ -3,7 +3,7 @@ import { describe, it, expect, vi, beforeEach } from "vitest";
import userEvent from "@testing-library/user-event";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { PluginLaunchModal } from "#/components/features/launch/plugin-launch-modal";
-import { PluginSpec } from "#/api/conversation-service/v1-conversation-service.types";
+import { PluginSpec } from "#/api/conversation-service/agent-server-conversation-service.types";
const mockOnStartConversation = vi.fn();
const mockOnClose = vi.fn();
diff --git a/__tests__/components/modals/skills/skill-modal.test.tsx b/__tests__/components/modals/skills/skill-modal.test.tsx
index 2882fd90fc..78853f2506 100644
--- a/__tests__/components/modals/skills/skill-modal.test.tsx
+++ b/__tests__/components/modals/skills/skill-modal.test.tsx
@@ -3,7 +3,7 @@ import userEvent from "@testing-library/user-event";
import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
import { renderWithProviders } from "test-utils";
import { SkillsModal } from "#/components/features/conversation-panel/skills-modal";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
import { AgentState } from "#/types/agent-state";
import { useAgentState } from "#/hooks/use-agent-state";
@@ -54,8 +54,8 @@ describe("SkillsModal", () => {
// Reset all mocks before each test
vi.clearAllMocks();
- // Setup default mock for getSkills (V1)
- vi.spyOn(V1ConversationService, "getSkills").mockResolvedValue({
+ // Setup default mock for getSkills (agent-server)
+ vi.spyOn(AgentServerConversationService, "getSkills").mockResolvedValue({
skills: mockSkills,
});
@@ -83,7 +83,7 @@ describe("SkillsModal", () => {
describe("Refresh Button Functionality", () => {
it("should call refetch when refresh button is clicked", async () => {
const user = userEvent.setup();
- const refreshSpy = vi.spyOn(V1ConversationService, "getSkills");
+ const refreshSpy = vi.spyOn(AgentServerConversationService, "getSkills");
renderWithProviders(<SkillsModal {...defaultProps} />);
@@ -102,7 +102,7 @@ describe("SkillsModal", () => {
describe("Skills Display", () => {
it("should display skills correctly", async () => {
- vi.spyOn(V1ConversationService, "getSkills").mockResolvedValue({
+ vi.spyOn(AgentServerConversationService, "getSkills").mockResolvedValue({
skills: mockSkills,
});
@@ -116,5 +116,5 @@ describe("SkillsModal", () => {
});
});
-// Note: Tests for V0 API and v1_enabled settings were removed as the component
-// now uses V1 API exclusively via useConversationSkills hook
+// Note: Tests for deprecated API and removed settings were removed as the component
+// now uses agent-server API exclusively via useConversationSkills hook
diff --git a/__tests__/helpers/websocket-test-components.tsx b/__tests__/helpers/websocket-test-components.tsx
index 016a8f38b8..1de407a652 100644
--- a/__tests__/helpers/websocket-test-components.tsx
+++ b/__tests__/helpers/websocket-test-components.tsx
@@ -3,8 +3,8 @@ import { useConversationWebSocket } from "#/contexts/conversation-websocket-cont
import { useEventStore } from "#/stores/use-event-store";
import { useErrorMessageStore } from "#/stores/error-message-store";
import { useOptimisticUserMessageStore } from "#/stores/optimistic-user-message-store";
-import { isV1Event } from "#/types/v1/type-guards";
-import { OpenHandsEvent } from "#/types/v1/core";
+import { isAgentServerEvent } from "#/types/agent-server/type-guards";
+import { OpenHandsEvent } from "#/types/agent-server/core";
/**
* Test component to access and display WebSocket connection state
@@ -31,7 +31,7 @@ export function EventStoreComponent() {
<div data-testid="events-count">{events.length}</div>
<div data-testid="ui-events-count">{uiEvents.length}</div>
<div data-testid="latest-event-id">
- {isV1Event(events[events.length - 1])
+ {isAgentServerEvent(events[events.length - 1])
? (events[events.length - 1] as OpenHandsEvent).id
: "none"}
</div>
diff --git a/__tests__/hooks/chat/use-btw-interceptor.test.ts b/__tests__/hooks/chat/use-btw-interceptor.test.ts
index b1a2397663..f42696e970 100644
--- a/__tests__/hooks/chat/use-btw-interceptor.test.ts
+++ b/__tests__/hooks/chat/use-btw-interceptor.test.ts
@@ -3,22 +3,21 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
import { useBtwInterceptor } from "#/hooks/chat/use-btw-interceptor";
import { useBtwStore } from "#/stores/btw-store";
-const mockAskV1Agent = vi.hoisted(() =>
+const mockAskAgent = vi.hoisted(() =>
vi.fn<(id: string, q: string) => Promise<{ response: string }>>(),
);
vi.mock("#/hooks/mutation/conversation-mutation-utils", () => ({
- askV1Agent: (id: string, q: string) => mockAskV1Agent(id, q),
+ askAgent: (id: string, q: string) => mockAskAgent(id, q),
}));
const CONV = "conv-1";
-const entries = () =>
- useBtwStore.getState().entriesByConversation[CONV] ?? [];
+const entries = () => useBtwStore.getState().entriesByConversation[CONV] ?? [];
describe("useBtwInterceptor", () => {
beforeEach(() => {
useBtwStore.setState({ entriesByConversation: {} });
- mockAskV1Agent.mockReset();
+ mockAskAgent.mockReset();
});
it("falls through to onSubmit for non-/btw messages", () => {
@@ -26,19 +25,19 @@ describe("useBtwInterceptor", () => {
const { result } = renderHook(() => useBtwInterceptor(CONV, onSubmit));
act(() => result.current("hello world"));
expect(onSubmit).toHaveBeenCalledWith("hello world");
- expect(mockAskV1Agent).not.toHaveBeenCalled();
+ expect(mockAskAgent).not.toHaveBeenCalled();
expect(entries()).toEqual([]);
});
- it("intercepts /btw, calls askV1Agent, and resolves the entry", async () => {
- mockAskV1Agent.mockResolvedValueOnce({ response: "because" });
+ it("intercepts /btw, calls askAgent, and resolves the entry", async () => {
+ mockAskAgent.mockResolvedValueOnce({ response: "because" });
const onSubmit = vi.fn();
const { result } = renderHook(() => useBtwInterceptor(CONV, onSubmit));
act(() => result.current("/btw why?"));
expect(onSubmit).not.toHaveBeenCalled();
- expect(mockAskV1Agent).toHaveBeenCalledWith(CONV, "why?");
+ expect(mockAskAgent).toHaveBeenCalledWith(CONV, "why?");
expect(entries()[0]).toMatchObject({ question: "why?", status: "pending" });
await waitFor(() => expect(entries()[0].status).toBe("done"));
@@ -48,19 +47,19 @@ describe("useBtwInterceptor", () => {
});
});
- it("marks the entry as error when askV1Agent rejects", async () => {
- mockAskV1Agent.mockRejectedValueOnce(new Error("boom"));
+ it("marks the entry as error when askAgent rejects", async () => {
+ mockAskAgent.mockRejectedValueOnce(new Error("boom"));
const { result } = renderHook(() => useBtwInterceptor(CONV, vi.fn()));
act(() => result.current("/btw why?"));
await waitFor(() => expect(entries()[0].status).toBe("error"));
expect(entries()[0].response).toBe("boom");
});
- it("falls through when conversationId is null (feature off for V0)", () => {
+ it("falls through when conversationId is null", () => {
const onSubmit = vi.fn();
const { result } = renderHook(() => useBtwInterceptor(null, onSubmit));
act(() => result.current("/btw why?"));
expect(onSubmit).toHaveBeenCalledWith("/btw why?");
- expect(mockAskV1Agent).not.toHaveBeenCalled();
+ expect(mockAskAgent).not.toHaveBeenCalled();
});
});
diff --git a/__tests__/hooks/mutation/use-create-conversation.test.tsx b/__tests__/hooks/mutation/use-create-conversation.test.tsx
index 349cafe84e..f155429e6d 100644
--- a/__tests__/hooks/mutation/use-create-conversation.test.tsx
+++ b/__tests__/hooks/mutation/use-create-conversation.test.tsx
@@ -1,7 +1,7 @@
import { renderHook, waitFor } from "@testing-library/react";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { describe, expect, it, vi } from "vitest";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
import { useCreateConversation } from "#/hooks/mutation/use-create-conversation";
import { SuggestedTask } from "#/utils/types";
@@ -14,7 +14,7 @@ vi.mock("#/hooks/use-tracking", () => ({
describe("useCreateConversation", () => {
it("passes suggested tasks to the V1 create conversation API", async () => {
const createConversationSpy = vi
- .spyOn(V1ConversationService, "createConversation")
+ .spyOn(AgentServerConversationService, "createConversation")
.mockResolvedValue({
id: "task-id",
created_by_user_id: null,
diff --git a/__tests__/hooks/mutation/use-new-conversation-command.test.tsx b/__tests__/hooks/mutation/use-new-conversation-command.test.tsx
index dfe53e1ef5..fd99e4b17f 100644
--- a/__tests__/hooks/mutation/use-new-conversation-command.test.tsx
+++ b/__tests__/hooks/mutation/use-new-conversation-command.test.tsx
@@ -1,7 +1,7 @@
import { renderHook, waitFor } from "@testing-library/react";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { describe, expect, it, vi, beforeEach } from "vitest";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
import { useNewConversationCommand } from "#/hooks/mutation/use-new-conversation-command";
const mockNavigate = vi.fn();
@@ -100,7 +100,7 @@ describe("useNewConversationCommand", () => {
it("calls createConversation and navigates on success", async () => {
const readyTask = makeStartTask();
const createSpy = vi
- .spyOn(V1ConversationService, "createConversation")
+ .spyOn(AgentServerConversationService, "createConversation")
.mockResolvedValue(readyTask as never);
const { result } = renderHook(() => useNewConversationCommand(), {
@@ -122,7 +122,7 @@ describe("useNewConversationCommand", () => {
app_conversation_id: null,
});
- vi.spyOn(V1ConversationService, "createConversation").mockResolvedValue(
+ vi.spyOn(AgentServerConversationService, "createConversation").mockResolvedValue(
errorTask as never,
);
@@ -140,7 +140,7 @@ describe("useNewConversationCommand", () => {
app_conversation_id: null,
});
- vi.spyOn(V1ConversationService, "createConversation").mockResolvedValue(
+ vi.spyOn(AgentServerConversationService, "createConversation").mockResolvedValue(
workingTask as never,
);
@@ -160,7 +160,7 @@ describe("useNewConversationCommand", () => {
it("invalidates conversation list queries on success", async () => {
const readyTask = makeStartTask();
- vi.spyOn(V1ConversationService, "createConversation").mockResolvedValue(
+ vi.spyOn(AgentServerConversationService, "createConversation").mockResolvedValue(
readyTask as never,
);
@@ -186,7 +186,7 @@ describe("useNewConversationCommand", () => {
// Arrange
const readyTask = makeStartTask();
const createSpy = vi
- .spyOn(V1ConversationService, "createConversation")
+ .spyOn(AgentServerConversationService, "createConversation")
.mockResolvedValue(readyTask as never);
// Act
@@ -214,7 +214,7 @@ describe("useNewConversationCommand", () => {
it("shows a loading toast and dismisses it on success", async () => {
const readyTask = makeStartTask();
- vi.spyOn(V1ConversationService, "createConversation").mockResolvedValue(
+ vi.spyOn(AgentServerConversationService, "createConversation").mockResolvedValue(
readyTask as never,
);
diff --git a/__tests__/hooks/mutation/use-v1-resume-conversation.test.tsx b/__tests__/hooks/mutation/use-resume-conversation.test.tsx
similarity index 81%
rename from __tests__/hooks/mutation/use-v1-resume-conversation.test.tsx
rename to __tests__/hooks/mutation/use-resume-conversation.test.tsx
index df6c84fd7e..07ef2b5957 100644
--- a/__tests__/hooks/mutation/use-v1-resume-conversation.test.tsx
+++ b/__tests__/hooks/mutation/use-resume-conversation.test.tsx
@@ -2,10 +2,10 @@ import { renderHook, waitFor } from "@testing-library/react";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { describe, expect, it, vi, beforeEach } from "vitest";
import React from "react";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
-import { useV1ResumeConversation } from "#/hooks/mutation/use-v1-resume-conversation";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
+import { useResumeConversation } from "#/hooks/mutation/use-resume-conversation";
-describe("useV1ResumeConversation", () => {
+describe("useResumeConversation", () => {
let queryClient: QueryClient;
beforeEach(() => {
@@ -24,7 +24,7 @@ describe("useV1ResumeConversation", () => {
it("invalidates conversation queries on settled", async () => {
vi.spyOn(
- V1ConversationService,
+ AgentServerConversationService,
"batchGetAppConversations",
).mockResolvedValue([
{
@@ -48,13 +48,13 @@ describe("useV1ResumeConversation", () => {
updated_at: new Date().toISOString(),
},
]);
- vi.spyOn(V1ConversationService, "resumeConversation").mockResolvedValue({
+ vi.spyOn(AgentServerConversationService, "resumeConversation").mockResolvedValue({
success: true,
});
const invalidateSpy = vi.spyOn(queryClient, "invalidateQueries");
- const { result } = renderHook(() => useV1ResumeConversation(), { wrapper });
+ const { result } = renderHook(() => useResumeConversation(), { wrapper });
result.current.mutate({ conversationId: "test-conv-id" });
diff --git a/__tests__/hooks/mutation/use-update-conversation-repository.test.tsx b/__tests__/hooks/mutation/use-update-conversation-repository.test.tsx
index 9d8105f924..2d243d0640 100644
--- a/__tests__/hooks/mutation/use-update-conversation-repository.test.tsx
+++ b/__tests__/hooks/mutation/use-update-conversation-repository.test.tsx
@@ -2,10 +2,10 @@ import { renderHook, waitFor } from "@testing-library/react";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { describe, it, expect, vi, beforeEach } from "vitest";
import { useUpdateConversationRepository } from "#/hooks/mutation/use-update-conversation-repository";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
-// Mock the V1ConversationService
-vi.mock("#/api/conversation-service/v1-conversation-service.api", () => ({
+// Mock the AgentServerConversationService
+vi.mock("#/api/conversation-service/agent-server-conversation-service.api", () => ({
default: {
updateConversationRepository: vi.fn(),
},
@@ -36,11 +36,9 @@ const createWrapper = () => {
},
});
- return function ({ children }: { children: React.ReactNode }) {
- return (
- <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
- );
- };
+ return ({ children }: { children: React.ReactNode }) => (
+ <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
+ );
};
describe("useUpdateConversationRepository", () => {
@@ -56,9 +54,9 @@ describe("useUpdateConversationRepository", () => {
git_provider: "github",
};
- vi.mocked(
- V1ConversationService.updateConversationRepository,
- ).mockResolvedValue(mockResponse as any);
+ vi.mocked(AgentServerConversationService.updateConversationRepository).mockResolvedValue(
+ mockResponse as any,
+ );
const { result } = renderHook(() => useUpdateConversationRepository(), {
wrapper: createWrapper(),
@@ -75,9 +73,7 @@ describe("useUpdateConversationRepository", () => {
expect(result.current.isSuccess).toBe(true);
});
- expect(
- V1ConversationService.updateConversationRepository,
- ).toHaveBeenCalledWith(
+ expect(AgentServerConversationService.updateConversationRepository).toHaveBeenCalledWith(
"test-conversation-id",
"owner/repo",
"main",
@@ -93,9 +89,9 @@ describe("useUpdateConversationRepository", () => {
git_provider: null,
};
- vi.mocked(
- V1ConversationService.updateConversationRepository,
- ).mockResolvedValue(mockResponse as any);
+ vi.mocked(AgentServerConversationService.updateConversationRepository).mockResolvedValue(
+ mockResponse as any,
+ );
const { result } = renderHook(() => useUpdateConversationRepository(), {
wrapper: createWrapper(),
@@ -112,15 +108,18 @@ describe("useUpdateConversationRepository", () => {
expect(result.current.isSuccess).toBe(true);
});
- expect(
- V1ConversationService.updateConversationRepository,
- ).toHaveBeenCalledWith("test-conversation-id", null, null, null);
+ expect(AgentServerConversationService.updateConversationRepository).toHaveBeenCalledWith(
+ "test-conversation-id",
+ null,
+ null,
+ null,
+ );
});
it("should handle errors gracefully", async () => {
- vi.mocked(
- V1ConversationService.updateConversationRepository,
- ).mockRejectedValue(new Error("Failed to update repository"));
+ vi.mocked(AgentServerConversationService.updateConversationRepository).mockRejectedValue(
+ new Error("Failed to update repository"),
+ );
const { result } = renderHook(() => useUpdateConversationRepository(), {
wrapper: createWrapper(),
diff --git a/__tests__/hooks/query/use-conversation-history.test.tsx b/__tests__/hooks/query/use-conversation-history.test.tsx
index 7c1da8d5af..aedf2b97ac 100644
--- a/__tests__/hooks/query/use-conversation-history.test.tsx
+++ b/__tests__/hooks/query/use-conversation-history.test.tsx
@@ -7,7 +7,7 @@ import { useConversationHistory } from "#/hooks/query/use-conversation-history";
import EventService from "#/api/event-service/event-service.api";
import { useUserConversation } from "#/hooks/query/use-user-conversation";
import type { Conversation } from "#/api/open-hands.types";
-import type { OpenHandsEvent } from "#/types/v1/core";
+import type { OpenHandsEvent } from "#/types/agent-server/core";
function makeConversation(version: "V0" | "V1"): Conversation {
return {
@@ -61,7 +61,7 @@ describe("useConversationHistory", () => {
});
it("calls V1 REST endpoint for V1 conversations", async () => {
- const v1SearchEventsSpy = vi.spyOn(EventService, "searchEventsV1");
+ const v1SearchEventsSpy = vi.spyOn(EventService, "searchEvents");
vi.mocked(useUserConversation).mockReturnValue({
data: makeConversation("V1"),
@@ -82,11 +82,11 @@ describe("useConversationHistory", () => {
expect(result.current.data).toBeDefined();
});
- // searchEventsV1 now accepts (conversationId, limit, conversationUrl,
+ // searchEvents now accepts (conversationId, limit, conversationUrl,
// sessionApiKey). The latter two are forwarded so cloud-mode calls
// can target the correct host. In this test fixture they're null
// (no conversation_url / session_api_key on the mocked conversation).
- expect(EventService.searchEventsV1).toHaveBeenCalledWith(
+ expect(EventService.searchEvents).toHaveBeenCalledWith(
"conv-123",
100,
null,
@@ -125,7 +125,7 @@ describe("useConversationHistory cache key stability", () => {
});
it("does not refetch when conversation object changes but version stays the same", async () => {
- const v1Spy = vi.spyOn(EventService, "searchEventsV1");
+ const v1Spy = vi.spyOn(EventService, "searchEvents");
v1Spy.mockResolvedValue([makeEvent()]);
const conv1 = makeConversation("V1");
@@ -178,11 +178,11 @@ describe("useConversationHistory cache key stability", () => {
// Note: The behavior of always using V1 API regardless of conversation_version
// means the "version change triggers refetch" test is no longer applicable.
- // The hook now consistently uses searchEventsV1 for all conversations.
+ // The hook now consistently uses searchEvents for all conversations.
});
it("treats cached history as never stale (staleTime is Infinity)", async () => {
- const v1Spy = vi.spyOn(EventService, "searchEventsV1");
+ const v1Spy = vi.spyOn(EventService, "searchEvents");
v1Spy.mockResolvedValue([makeEvent()]);
vi.mocked(useUserConversation).mockReturnValue({
@@ -214,7 +214,7 @@ describe("useConversationHistory cache key stability", () => {
});
it("has gcTime of at least 30 minutes for navigation resilience", async () => {
- const v1Spy = vi.spyOn(EventService, "searchEventsV1");
+ const v1Spy = vi.spyOn(EventService, "searchEvents");
v1Spy.mockResolvedValue([makeEvent()]);
vi.mocked(useUserConversation).mockReturnValue({
diff --git a/__tests__/hooks/query/use-conversation-metrics.test.tsx b/__tests__/hooks/query/use-conversation-metrics.test.tsx
index fe4e8bd7d3..0489038fd9 100644
--- a/__tests__/hooks/query/use-conversation-metrics.test.tsx
+++ b/__tests__/hooks/query/use-conversation-metrics.test.tsx
@@ -4,8 +4,8 @@ import { renderHook, waitFor } from "@testing-library/react";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { useConversationMetrics } from "#/hooks/query/use-conversation-metrics";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
-import { V1ExecutionStatus } from "#/types/v1/core/base/common";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
+import { ExecutionStatus } from "#/types/agent-server/core/base/common";
const runtimeInfo = {
id: "conv-abc",
@@ -13,7 +13,7 @@ const runtimeInfo = {
metrics: null,
created_at: "2026-04-16T00:00:00Z",
updated_at: "2026-04-16T00:00:00Z",
- status: V1ExecutionStatus.IDLE,
+ status: ExecutionStatus.IDLE,
stats: {
usage_to_metrics: {
agent: {
@@ -46,7 +46,7 @@ describe("useConversationMetrics", () => {
it("fires the query when sessionApiKey is null (local backends without auth)", async () => {
// Arrange
const spy = vi
- .spyOn(V1ConversationService, "getRuntimeConversation")
+ .spyOn(AgentServerConversationService, "getRuntimeConversation")
.mockResolvedValue(runtimeInfo);
// Act
diff --git a/__tests__/hooks/query/use-sub-conversation-task-polling.test.tsx b/__tests__/hooks/query/use-sub-conversation-task-polling.test.tsx
index b3b279f87a..20fda8f852 100644
--- a/__tests__/hooks/query/use-sub-conversation-task-polling.test.tsx
+++ b/__tests__/hooks/query/use-sub-conversation-task-polling.test.tsx
@@ -2,12 +2,12 @@ import { renderHook, waitFor } from "@testing-library/react";
import { describe, expect, it, vi, beforeEach, afterEach } from "vitest";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import React from "react";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
import { useSubConversationTaskPolling } from "#/hooks/query/use-sub-conversation-task-polling";
-import type { V1AppConversationStartTask } from "#/api/conversation-service/v1-conversation-service.types";
+import type { AppConversationStartTask } from "#/api/conversation-service/agent-server-conversation-service.types";
// Mock the underlying service
-vi.mock("#/api/conversation-service/v1-conversation-service.api", () => ({
+vi.mock("#/api/conversation-service/agent-server-conversation-service.api", () => ({
default: {
getStartTask: vi.fn(),
},
@@ -35,9 +35,9 @@ describe("useSubConversationTaskPolling", () => {
};
const createMockTask = (
- status: V1AppConversationStartTask["status"],
+ status: AppConversationStartTask["status"],
appConversationId: string | null = null,
- ): V1AppConversationStartTask => ({
+ ): AppConversationStartTask => ({
id: "task-123",
created_by_user_id: "user-1",
status,
@@ -60,7 +60,7 @@ describe("useSubConversationTaskPolling", () => {
it("should return task status when task is READY", async () => {
// Arrange
const mockTask = createMockTask("READY", "sub-conversation-123");
- vi.mocked(V1ConversationService.getStartTask).mockResolvedValue(mockTask);
+ vi.mocked(AgentServerConversationService.getStartTask).mockResolvedValue(mockTask);
// Act
const { result } = renderHook(
@@ -74,12 +74,12 @@ describe("useSubConversationTaskPolling", () => {
expect(result.current.taskStatus).toBe("READY");
});
expect(result.current.subConversationId).toBe("sub-conversation-123");
- expect(V1ConversationService.getStartTask).toHaveBeenCalledWith("task-123");
+ expect(AgentServerConversationService.getStartTask).toHaveBeenCalledWith("task-123");
});
it("should not poll when taskId is null", async () => {
// Arrange
- vi.mocked(V1ConversationService.getStartTask).mockResolvedValue(null);
+ vi.mocked(AgentServerConversationService.getStartTask).mockResolvedValue(null);
// Act
const { result } = renderHook(
@@ -91,13 +91,13 @@ describe("useSubConversationTaskPolling", () => {
await new Promise((resolve) => {
setTimeout(resolve, 100);
});
- expect(V1ConversationService.getStartTask).not.toHaveBeenCalled();
+ expect(AgentServerConversationService.getStartTask).not.toHaveBeenCalled();
expect(result.current.taskStatus).toBeUndefined();
});
it("should not poll when parentConversationId is null", async () => {
// Arrange
- vi.mocked(V1ConversationService.getStartTask).mockResolvedValue(null);
+ vi.mocked(AgentServerConversationService.getStartTask).mockResolvedValue(null);
// Act
const { result } = renderHook(
@@ -109,7 +109,7 @@ describe("useSubConversationTaskPolling", () => {
await new Promise((resolve) => {
setTimeout(resolve, 100);
});
- expect(V1ConversationService.getStartTask).not.toHaveBeenCalled();
+ expect(AgentServerConversationService.getStartTask).not.toHaveBeenCalled();
expect(result.current.taskStatus).toBeUndefined();
});
});
diff --git a/__tests__/hooks/use-filtered-events.test.ts b/__tests__/hooks/use-filtered-events.test.ts
index 66740ff64e..e74e3ea21f 100644
--- a/__tests__/hooks/use-filtered-events.test.ts
+++ b/__tests__/hooks/use-filtered-events.test.ts
@@ -2,61 +2,14 @@ import { describe, expect, it, beforeEach } from "vitest";
import { renderHook, act } from "@testing-library/react";
import { useFilteredEvents } from "#/hooks/use-filtered-events";
import { useEventStore } from "#/stores/use-event-store";
-import type { OpenHandsAction } from "#/types/core/actions";
-import type { ActionEvent, MessageEvent } from "#/types/v1/core";
-import { SecurityRisk } from "#/types/v1/core";
+import type { ActionEvent, MessageEvent } from "#/types/agent-server/core";
+import { SecurityRisk } from "#/types/agent-server/core";
+import type { SystemPromptEvent } from "#/types/agent-server/core/events/system-event";
-// --- V0 event factories ---
-
-function createV0UserMessage(id: number): OpenHandsAction {
- return {
- id,
- source: "user",
- action: "message",
- args: { content: `User message ${id}`, image_urls: [], file_urls: [] },
- message: `User message ${id}`,
- timestamp: `2025-07-01T00:00:0${id}Z`,
- };
-}
-
-function createV0AgentMessage(id: number): OpenHandsAction {
- return {
- id,
- source: "agent",
- action: "message",
- args: {
- thought: `Agent thought ${id}`,
- image_urls: null,
- file_urls: [],
- wait_for_response: true,
- },
- message: `Agent response ${id}`,
- timestamp: `2025-07-01T00:00:0${id}Z`,
- };
-}
-
-function createV0SystemEvent(id: number): OpenHandsAction {
+function createUserMessage(id: string): MessageEvent {
return {
id,
- source: "environment",
- action: "system",
- args: {
- content: "source .openhands/setup.sh",
- tools: null,
- openhands_version: null,
- agent_class: null,
- },
- message: "Running setup script",
- timestamp: `2025-07-01T00:00:0${id}Z`,
- };
-}
-
-// --- V1 event factories ---
-
-function createV1UserMessage(id: string): MessageEvent {
- return {
- id,
- timestamp: "2025-07-01T00:00:01Z",
+ timestamp: `2025-07-01T00:00:${id.slice(-1).padStart(2, "0")}Z`,
source: "user",
llm_message: {
role: "user",
@@ -67,7 +20,7 @@ function createV1UserMessage(id: string): MessageEvent {
};
}
-function createV1AgentAction(id: string): ActionEvent {
+function createAgentAction(id: string): ActionEvent {
return {
id,
timestamp: "2025-07-01T00:00:02Z",
@@ -93,8 +46,17 @@ function createV1AgentAction(id: string): ActionEvent {
};
}
+function createSystemPromptEvent(id: string): SystemPromptEvent {
+ return {
+ id,
+ timestamp: "2025-07-01T00:00:03Z",
+ source: "agent",
+ system_prompt: { type: "text", text: "system prompt" },
+ tools: [],
+ };
+}
+
beforeEach(() => {
- // Reset the event store before each test
useEventStore.setState({
events: [],
eventIds: new Set(),
@@ -104,184 +66,97 @@ beforeEach(() => {
describe("useFilteredEvents", () => {
describe("referential stability", () => {
- it("returns the same v0Events reference when storeEvents has not changed", () => {
- const v0Event = createV0UserMessage(1);
- useEventStore.setState({
- events: [v0Event],
- eventIds: new Set([1]),
- uiEvents: [v0Event],
- });
-
- const { result, rerender } = renderHook(() => useFilteredEvents());
- const firstV0Events = result.current.v0Events;
-
- // Rerender without changing the store
- rerender();
-
- expect(result.current.v0Events).toBe(firstV0Events);
- });
-
- it("returns the same v1UiEvents reference when uiEvents has not changed", () => {
- const v1Event = createV1UserMessage("msg-1");
+ it("returns the same renderableEvents reference when uiEvents has not changed", () => {
+ const event = createUserMessage("msg-1");
useEventStore.setState({
- events: [v1Event],
+ events: [event],
eventIds: new Set(["msg-1"]),
- uiEvents: [v1Event],
+ uiEvents: [event],
});
const { result, rerender } = renderHook(() => useFilteredEvents());
- const firstV1UiEvents = result.current.v1UiEvents;
+ const firstRenderableEvents = result.current.renderableEvents;
rerender();
- expect(result.current.v1UiEvents).toBe(firstV1UiEvents);
+ expect(result.current.renderableEvents).toBe(firstRenderableEvents);
});
- it("returns the same v1FullEvents reference when storeEvents has not changed", () => {
- const v1Event = createV1UserMessage("msg-1");
+ it("returns the same allConversationEvents reference when storeEvents has not changed", () => {
+ const event = createUserMessage("msg-1");
useEventStore.setState({
- events: [v1Event],
+ events: [event],
eventIds: new Set(["msg-1"]),
- uiEvents: [v1Event],
+ uiEvents: [event],
});
const { result, rerender } = renderHook(() => useFilteredEvents());
- const firstV1FullEvents = result.current.v1FullEvents;
+ const firstAllConversationEvents = result.current.allConversationEvents;
rerender();
- expect(result.current.v1FullEvents).toBe(firstV1FullEvents);
+ expect(result.current.allConversationEvents).toBe(
+ firstAllConversationEvents,
+ );
});
- it("returns a new v0Events reference when storeEvents changes", () => {
- const v0Event1 = createV0UserMessage(1);
+ it("returns a new renderableEvents reference when uiEvents changes", () => {
+ const firstEvent = createUserMessage("msg-1");
useEventStore.setState({
- events: [v0Event1],
- eventIds: new Set([1]),
- uiEvents: [v0Event1],
+ events: [firstEvent],
+ eventIds: new Set(["msg-1"]),
+ uiEvents: [firstEvent],
});
const { result } = renderHook(() => useFilteredEvents());
- const firstV0Events = result.current.v0Events;
+ const firstRenderableEvents = result.current.renderableEvents;
- // Add a new event to the store (new array reference)
- const v0Event2 = createV0AgentMessage(2);
+ const secondEvent = createAgentAction("action-2");
act(() => {
useEventStore.setState({
- events: [v0Event1, v0Event2],
- eventIds: new Set([1, 2]),
- uiEvents: [v0Event1, v0Event2],
+ events: [firstEvent, secondEvent],
+ eventIds: new Set(["msg-1", "action-2"]),
+ uiEvents: [firstEvent, secondEvent],
});
});
- expect(result.current.v0Events).not.toBe(firstV0Events);
- expect(result.current.v0Events).toHaveLength(2);
+ expect(result.current.renderableEvents).not.toBe(firstRenderableEvents);
+ expect(result.current.renderableEvents).toHaveLength(2);
});
});
- describe("V0 event filtering", () => {
- it("filters V0 events through isV0Event, isActionOrObservation, and shouldRenderEvent", () => {
- const userMsg = createV0UserMessage(1);
- const agentMsg = createV0AgentMessage(2);
+ describe("agent-server event filtering", () => {
+ it("filters renderable events from uiEvents", () => {
+ const userMessage = createUserMessage("msg-1");
+ const systemPrompt = createSystemPromptEvent("system-1");
useEventStore.setState({
- events: [userMsg, agentMsg],
- eventIds: new Set([1, 2]),
- uiEvents: [userMsg, agentMsg],
+ events: [userMessage, systemPrompt],
+ eventIds: new Set(["msg-1", "system-1"]),
+ uiEvents: [userMessage, systemPrompt],
});
const { result } = renderHook(() => useFilteredEvents());
- expect(result.current.v0Events).toHaveLength(2);
- expect(result.current.v0Events).toContainEqual(userMsg);
- expect(result.current.v0Events).toContainEqual(agentMsg);
+ expect(result.current.renderableEvents).toEqual([userMessage]);
+ expect(result.current.allConversationEvents).toEqual([
+ userMessage,
+ systemPrompt,
+ ]);
});
- it("excludes V0 system events from v0Events", () => {
- const userMsg = createV0UserMessage(1);
- const systemEvent = createV0SystemEvent(2);
+ it("uses renderable events for totalEvents", () => {
+ const userMessage = createUserMessage("msg-1");
+ const systemPrompt = createSystemPromptEvent("system-1");
useEventStore.setState({
- events: [userMsg, systemEvent],
- eventIds: new Set([1, 2]),
- uiEvents: [userMsg, systemEvent],
+ events: [userMessage, systemPrompt],
+ eventIds: new Set(["msg-1", "system-1"]),
+ uiEvents: [userMessage, systemPrompt],
});
const { result } = renderHook(() => useFilteredEvents());
-
- // System events are filtered out by shouldRenderEvent
- expect(result.current.v0Events).toHaveLength(1);
- expect(result.current.v0Events[0]).toEqual(userMsg);
- });
-
- it("does not include V1 events in v0Events", () => {
- const v0Event = createV0UserMessage(1);
- const v1Event = createV1UserMessage("msg-1");
-
- useEventStore.setState({
- events: [v0Event, v1Event],
- eventIds: new Set([1, "msg-1"]),
- uiEvents: [v0Event, v1Event],
- });
-
- const { result } = renderHook(() => useFilteredEvents());
-
- expect(result.current.v0Events).toHaveLength(1);
- expect(result.current.v0Events[0]).toEqual(v0Event);
- });
- });
-
- describe("V1 event filtering", () => {
- it("filters V1 events into v1FullEvents", () => {
- const v1Event = createV1UserMessage("msg-1");
-
- useEventStore.setState({
- events: [v1Event],
- eventIds: new Set(["msg-1"]),
- uiEvents: [v1Event],
- });
-
- const { result } = renderHook(() => useFilteredEvents());
-
- expect(result.current.v1FullEvents).toHaveLength(1);
- expect(result.current.v1FullEvents[0]).toEqual(v1Event);
- });
-
- it("does not include V0 events in v1FullEvents", () => {
- const v0Event = createV0UserMessage(1);
- const v1Event = createV1UserMessage("msg-1");
-
- useEventStore.setState({
- events: [v0Event, v1Event],
- eventIds: new Set([1, "msg-1"]),
- uiEvents: [v0Event, v1Event],
- });
-
- const { result } = renderHook(() => useFilteredEvents());
-
- expect(result.current.v1FullEvents).toHaveLength(1);
- expect(result.current.v1FullEvents[0]).toEqual(v1Event);
- });
- });
-
- describe("totalEvents", () => {
- it("returns V0 event count when V0 events exist", () => {
- const v0Event1 = createV0UserMessage(1);
- const v0Event2 = createV0AgentMessage(2);
-
- useEventStore.setState({
- events: [v0Event1, v0Event2],
- eventIds: new Set([1, 2]),
- uiEvents: [v0Event1, v0Event2],
- });
-
- const { result } = renderHook(() => useFilteredEvents());
- expect(result.current.totalEvents).toBe(2);
- });
-
- it("returns 0 when no events exist", () => {
- const { result } = renderHook(() => useFilteredEvents());
- expect(result.current.totalEvents).toBe(0);
+ expect(result.current.totalEvents).toBe(1);
});
});
@@ -291,34 +166,34 @@ describe("useFilteredEvents", () => {
expect(result.current.hasSubstantiveAgentActions).toBe(false);
});
- it("returns false when only user events exist (V0)", () => {
- const userMsg = createV0UserMessage(1);
+ it("returns false when only user events exist", () => {
+ const userMessage = createUserMessage("msg-1");
useEventStore.setState({
- events: [userMsg],
- eventIds: new Set([1]),
- uiEvents: [userMsg],
+ events: [userMessage],
+ eventIds: new Set(["msg-1"]),
+ uiEvents: [userMessage],
});
const { result } = renderHook(() => useFilteredEvents());
expect(result.current.hasSubstantiveAgentActions).toBe(false);
});
- it("returns true when V0 agent message actions exist", () => {
- const agentMsg = createV0AgentMessage(1);
+ it("returns false when only system prompt events exist", () => {
+ const systemPrompt = createSystemPromptEvent("system-1");
useEventStore.setState({
- events: [agentMsg],
- eventIds: new Set([1]),
- uiEvents: [agentMsg],
+ events: [systemPrompt],
+ eventIds: new Set(["system-1"]),
+ uiEvents: [systemPrompt],
});
const { result } = renderHook(() => useFilteredEvents());
- expect(result.current.hasSubstantiveAgentActions).toBe(true);
+ expect(result.current.hasSubstantiveAgentActions).toBe(false);
});
- it("returns true when V1 agent action events exist", () => {
- const agentAction = createV1AgentAction("action-1");
+ it("returns true when agent action events exist", () => {
+ const agentAction = createAgentAction("action-1");
useEventStore.setState({
events: [agentAction],
@@ -337,31 +212,17 @@ describe("useFilteredEvents", () => {
expect(result.current.userEventsExist).toBe(false);
});
- it("returns true when V0 user events exist", () => {
- const userMsg = createV0UserMessage(1);
-
- useEventStore.setState({
- events: [userMsg],
- eventIds: new Set([1]),
- uiEvents: [userMsg],
- });
-
- const { result } = renderHook(() => useFilteredEvents());
- expect(result.current.v0UserEventsExist).toBe(true);
- expect(result.current.userEventsExist).toBe(true);
- });
-
- it("returns true when V1 user events exist", () => {
- const userMsg = createV1UserMessage("msg-1");
+ it("returns true when user events exist", () => {
+ const userMessage = createUserMessage("msg-1");
useEventStore.setState({
- events: [userMsg],
+ events: [userMessage],
eventIds: new Set(["msg-1"]),
- uiEvents: [userMsg],
+ uiEvents: [userMessage],
});
const { result } = renderHook(() => useFilteredEvents());
- expect(result.current.v1UserEventsExist).toBe(true);
+ expect(result.current.conversationUserEventsExist).toBe(true);
expect(result.current.userEventsExist).toBe(true);
});
});
@@ -370,13 +231,11 @@ describe("useFilteredEvents", () => {
it("returns empty arrays and false flags for empty store", () => {
const { result } = renderHook(() => useFilteredEvents());
- expect(result.current.v0Events).toEqual([]);
- expect(result.current.v1UiEvents).toEqual([]);
- expect(result.current.v1FullEvents).toEqual([]);
+ expect(result.current.renderableEvents).toEqual([]);
+ expect(result.current.allConversationEvents).toEqual([]);
expect(result.current.totalEvents).toBe(0);
expect(result.current.hasSubstantiveAgentActions).toBe(false);
- expect(result.current.v0UserEventsExist).toBe(false);
- expect(result.current.v1UserEventsExist).toBe(false);
+ expect(result.current.conversationUserEventsExist).toBe(false);
expect(result.current.userEventsExist).toBe(false);
});
});
diff --git a/__tests__/hooks/use-handle-plan-click.test.tsx b/__tests__/hooks/use-handle-plan-click.test.tsx
index 60d9343303..bc34cbc531 100644
--- a/__tests__/hooks/use-handle-plan-click.test.tsx
+++ b/__tests__/hooks/use-handle-plan-click.test.tsx
@@ -10,7 +10,7 @@ import {
} from "#/utils/conversation-local-storage";
import { displaySuccessToast } from "#/utils/custom-toast-handlers";
import type { Conversation } from "#/api/open-hands.types";
-import { V1AppConversation } from "#/api/conversation-service/v1-conversation-service.types";
+import { AppConversation } from "#/api/conversation-service/agent-server-conversation-service.types";
// Mock dependencies
vi.mock("#/stores/conversation-store");
@@ -37,7 +37,7 @@ function asMockReturnValue<T>(value: Partial<T>): T {
return value as T;
}
-function makeConversation(overrides?: Partial<V1AppConversation>): V1AppConversation {
+function makeConversation(overrides?: Partial<AppConversation>): AppConversation {
return {
id: "conv-123",
title: "Test Conversation",
@@ -53,7 +53,7 @@ function makeConversation(overrides?: Partial<V1AppConversation>): V1AppConversa
conversation_version: "V1",
sub_conversation_ids: [],
...overrides,
- } as V1AppConversation;
+ } as AppConversation;
}
describe("useHandlePlanClick", () => {
@@ -294,10 +294,10 @@ describe("useHandlePlanClick", () => {
// Simulate successful conversation creation
const onSuccessCallback = mockCreateConversation.mock.calls[0][1]
- .onSuccess as (data: { v1_task_id?: string }) => void;
+ .onSuccess as (data: { task_id?: string }) => void;
act(() => {
- onSuccessCallback({ v1_task_id: taskId });
+ onSuccessCallback({ task_id: taskId });
});
expect(mockSetSubConversationTaskId).toHaveBeenCalledWith(taskId);
@@ -307,7 +307,7 @@ describe("useHandlePlanClick", () => {
expect(displaySuccessToast).toHaveBeenCalled();
});
- it("does not persist subConversationTaskId when v1_task_id is missing", () => {
+ it("does not persist subConversationTaskId when task_id is missing", () => {
const conversationId = "conv-123";
vi.mocked(useActiveConversation).mockReturnValue(
@@ -328,7 +328,7 @@ describe("useHandlePlanClick", () => {
});
const onSuccessCallback = mockCreateConversation.mock.calls[0][1]
- .onSuccess as (data: { v1_task_id?: string }) => void;
+ .onSuccess as (data: { task_id?: string }) => void;
act(() => {
onSuccessCallback({});
diff --git a/__tests__/hooks/use-runtime-is-ready.test.tsx b/__tests__/hooks/use-runtime-is-ready.test.tsx
index f656ba21ae..08b6f6a05b 100644
--- a/__tests__/hooks/use-runtime-is-ready.test.tsx
+++ b/__tests__/hooks/use-runtime-is-ready.test.tsx
@@ -4,8 +4,8 @@ import { useRuntimeIsReady } from "#/hooks/use-runtime-is-ready";
import { useAgentState } from "#/hooks/use-agent-state";
import { useActiveConversation } from "#/hooks/query/use-active-conversation";
import { AgentState } from "#/types/agent-state";
-import { V1AppConversation } from "#/api/conversation-service/v1-conversation-service.types";
-import { V1ExecutionStatus } from "#/types/v1/core/base/common";
+import { AppConversation } from "#/api/conversation-service/agent-server-conversation-service.types";
+import { ExecutionStatus } from "#/types/agent-server/core/base/common";
vi.mock("#/hooks/use-agent-state");
vi.mock("#/hooks/query/use-active-conversation");
@@ -14,7 +14,7 @@ function asMockReturnValue<T>(value: Partial<T>): T {
return value as T;
}
-function makeConversation(): V1AppConversation {
+function makeConversation(): AppConversation {
return {
id: "conv-123",
title: "Test Conversation",
@@ -23,7 +23,7 @@ function makeConversation(): V1AppConversation {
git_provider: null,
updated_at: new Date().toISOString(),
created_at: new Date().toISOString(),
- execution_status: V1ExecutionStatus.RUNNING,
+ execution_status: ExecutionStatus.RUNNING,
conversation_url: null,
session_api_key: null,
sandbox_id: null,
diff --git a/__tests__/hooks/use-settings-nav-items.test.tsx b/__tests__/hooks/use-settings-nav-items.test.tsx
index 948839fec5..e0cab683cf 100644
--- a/__tests__/hooks/use-settings-nav-items.test.tsx
+++ b/__tests__/hooks/use-settings-nav-items.test.tsx
@@ -104,6 +104,7 @@ describe("useSettingsNavItems", () => {
expect(paths).not.toContain("/settings/agent-server");
});
+
it("hides local-only sub-pages when the active backend is cloud", () => {
useConfigMock.mockReturnValue({ data: createConfig() });
useActiveBackendMock.mockReturnValue(cloudActive);
diff --git a/__tests__/hooks/use-task-list.test.ts b/__tests__/hooks/use-task-list.test.ts
index 319029a938..6e7574b0eb 100644
--- a/__tests__/hooks/use-task-list.test.ts
+++ b/__tests__/hooks/use-task-list.test.ts
@@ -3,29 +3,9 @@ import { renderHook, act } from "@testing-library/react";
import { useTaskList } from "#/hooks/use-task-list";
import { useEventStore } from "#/stores/use-event-store";
import type { OHEvent } from "#/stores/use-event-store";
-import type { TaskTrackingObservation } from "#/types/core/observations";
+import type { MessageEvent } from "#/types/agent-server/core";
-function createV0TaskTrackingObservation(
- id: number,
- command: string,
- taskList: TaskTrackingObservation["extras"]["task_list"],
-): TaskTrackingObservation {
- return {
- id,
- source: "agent",
- observation: "task_tracking",
- message: "Task tracking update",
- timestamp: `2025-07-01T00:00:0${id}Z`,
- cause: 0,
- content: "",
- extras: {
- command,
- task_list: taskList,
- },
- };
-}
-
-function createV1TaskTrackerObservation(
+function createTaskTrackerObservation(
id: string,
command: string,
taskList: Array<{
@@ -47,7 +27,21 @@ function createV1TaskTrackerObservation(
command,
task_list: taskList,
},
- } as unknown as OHEvent;
+ } as OHEvent;
+}
+
+function createUserMessage(id: string): MessageEvent {
+ return {
+ id,
+ timestamp: `2025-07-01T00:00:0${id}Z`,
+ source: "user",
+ llm_message: {
+ role: "user",
+ content: [{ type: "text", text: "Hello" }],
+ },
+ activated_microagents: [],
+ extended_content: [],
+ };
}
beforeEach(() => {
@@ -67,18 +61,10 @@ describe("useTaskList", () => {
});
it("returns empty taskList when no task tracking observations exist", () => {
+ const event = createUserMessage("1");
useEventStore.setState({
- events: [
- {
- id: 1,
- source: "user",
- action: "message",
- args: { content: "Hello", image_urls: [], file_urls: [] },
- message: "Hello",
- timestamp: "2025-07-01T00:00:01Z",
- },
- ],
- eventIds: new Set([1]),
+ events: [event],
+ eventIds: new Set(["1"]),
uiEvents: [],
});
@@ -88,192 +74,114 @@ describe("useTaskList", () => {
expect(result.current.hasTaskList).toBe(false);
});
- describe("v0 events", () => {
- it('returns the task list from a TaskTrackingObservation with command="plan"', () => {
- const tasks = [
- { id: "1", title: "First task", status: "todo" as const },
- { id: "2", title: "Second task", status: "in_progress" as const },
- ];
- const event = createV0TaskTrackingObservation(1, "plan", tasks);
+ it('returns the task list from a TaskTrackerObservation with command="plan"', () => {
+ const tasks = [
+ { title: "First task", notes: "", status: "todo" as const },
+ {
+ title: "Second task",
+ notes: "some note",
+ status: "in_progress" as const,
+ },
+ ];
+ const event = createTaskTrackerObservation("1", "plan", tasks);
- useEventStore.setState({
- events: [event],
- eventIds: new Set([1]),
- uiEvents: [event],
- });
-
- const { result } = renderHook(() => useTaskList());
-
- expect(result.current.taskList).toEqual(tasks);
- expect(result.current.hasTaskList).toBe(true);
- });
-
- it('ignores TaskTrackingObservation events with command !== "plan"', () => {
- const tasks = [{ id: "1", title: "First task", status: "todo" as const }];
- const event = createV0TaskTrackingObservation(1, "update", tasks);
-
- useEventStore.setState({
- events: [event],
- eventIds: new Set([1]),
- uiEvents: [event],
- });
-
- const { result } = renderHook(() => useTaskList());
-
- expect(result.current.taskList).toEqual([]);
- expect(result.current.hasTaskList).toBe(false);
+ useEventStore.setState({
+ events: [event],
+ eventIds: new Set(["1"]),
+ uiEvents: [event],
});
- it("returns the latest task list when multiple plan events exist", () => {
- const earlyTasks = [
- { id: "1", title: "First task", status: "todo" as const },
- ];
- const lateTasks = [
- { id: "1", title: "First task", status: "done" as const },
- { id: "2", title: "New task", status: "in_progress" as const },
- ];
-
- const event1 = createV0TaskTrackingObservation(1, "plan", earlyTasks);
- const event2 = createV0TaskTrackingObservation(2, "plan", lateTasks);
+ const { result } = renderHook(() => useTaskList());
- useEventStore.setState({
- events: [event1, event2],
- eventIds: new Set([1, 2]),
- uiEvents: [event1, event2],
- });
+ expect(result.current.taskList).toEqual([
+ { id: "1", title: "First task", notes: undefined, status: "todo" },
+ {
+ id: "2",
+ title: "Second task",
+ notes: "some note",
+ status: "in_progress",
+ },
+ ]);
+ expect(result.current.hasTaskList).toBe(true);
+ });
- const { result } = renderHook(() => useTaskList());
+ it('ignores TaskTrackerObservation with command !== "plan"', () => {
+ const tasks = [{ title: "First task", notes: "", status: "todo" as const }];
+ const event = createTaskTrackerObservation("1", "view", tasks);
- expect(result.current.taskList).toEqual(lateTasks);
- expect(result.current.hasTaskList).toBe(true);
+ useEventStore.setState({
+ events: [event],
+ eventIds: new Set(["1"]),
+ uiEvents: [event],
});
- it("updates when new events are added to the store", () => {
- const { result } = renderHook(() => useTaskList());
+ const { result } = renderHook(() => useTaskList());
- expect(result.current.hasTaskList).toBe(false);
+ expect(result.current.taskList).toEqual([]);
+ expect(result.current.hasTaskList).toBe(false);
+ });
- const tasks = [{ id: "1", title: "New task", status: "todo" as const }];
- const event = createV0TaskTrackingObservation(1, "plan", tasks);
+ it("returns the latest task list when multiple plan events exist", () => {
+ const earlyTasks = [
+ { title: "First task", notes: "", status: "todo" as const },
+ ];
+ const lateTasks = [
+ { title: "First task", notes: "", status: "done" as const },
+ { title: "New task", notes: "wip", status: "in_progress" as const },
+ ];
- act(() => {
- useEventStore.setState({
- events: [event],
- eventIds: new Set([1]),
- uiEvents: [event],
- });
- });
+ const event1 = createTaskTrackerObservation("1", "plan", earlyTasks);
+ const event2 = createTaskTrackerObservation("2", "plan", lateTasks);
- expect(result.current.taskList).toEqual(tasks);
- expect(result.current.hasTaskList).toBe(true);
+ useEventStore.setState({
+ events: [event1, event2],
+ eventIds: new Set(["1", "2"]),
+ uiEvents: [event1, event2],
});
- it("returns hasTaskList=false when the latest plan has an empty task list", () => {
- const event = createV0TaskTrackingObservation(1, "plan", []);
-
- useEventStore.setState({
- events: [event],
- eventIds: new Set([1]),
- uiEvents: [event],
- });
-
- const { result } = renderHook(() => useTaskList());
+ const { result } = renderHook(() => useTaskList());
- expect(result.current.taskList).toEqual([]);
- expect(result.current.hasTaskList).toBe(false);
- });
+ expect(result.current.taskList).toEqual([
+ { id: "1", title: "First task", notes: undefined, status: "done" },
+ { id: "2", title: "New task", notes: "wip", status: "in_progress" },
+ ]);
+ expect(result.current.hasTaskList).toBe(true);
});
- describe("v1 events", () => {
- it('returns the task list from a v1 TaskTrackerObservation with command="plan"', () => {
- const tasks = [
- { title: "First task", notes: "", status: "todo" as const },
- {
- title: "Second task",
- notes: "some note",
- status: "in_progress" as const,
- },
- ];
- const event = createV1TaskTrackerObservation("1", "plan", tasks);
-
- useEventStore.setState({
- events: [event],
- eventIds: new Set(["1"]),
- uiEvents: [event],
- });
-
- const { result } = renderHook(() => useTaskList());
+ it("updates when new events are added to the store", () => {
+ const { result } = renderHook(() => useTaskList());
- expect(result.current.taskList).toEqual([
- { id: "1", title: "First task", notes: undefined, status: "todo" },
- {
- id: "2",
- title: "Second task",
- notes: "some note",
- status: "in_progress",
- },
- ]);
- expect(result.current.hasTaskList).toBe(true);
- });
+ expect(result.current.hasTaskList).toBe(false);
- it('ignores v1 TaskTrackerObservation with command !== "plan"', () => {
- const tasks = [
- { title: "First task", notes: "", status: "todo" as const },
- ];
- const event = createV1TaskTrackerObservation("1", "view", tasks);
+ const tasks = [{ title: "New task", notes: "", status: "todo" as const }];
+ const event = createTaskTrackerObservation("1", "plan", tasks);
+ act(() => {
useEventStore.setState({
events: [event],
eventIds: new Set(["1"]),
uiEvents: [event],
});
-
- const { result } = renderHook(() => useTaskList());
-
- expect(result.current.taskList).toEqual([]);
- expect(result.current.hasTaskList).toBe(false);
});
- it("returns the latest v1 task list when multiple plan events exist", () => {
- const earlyTasks = [
- { title: "First task", notes: "", status: "todo" as const },
- ];
- const lateTasks = [
- { title: "First task", notes: "", status: "done" as const },
- { title: "New task", notes: "wip", status: "in_progress" as const },
- ];
-
- const event1 = createV1TaskTrackerObservation("1", "plan", earlyTasks);
- const event2 = createV1TaskTrackerObservation("2", "plan", lateTasks);
-
- useEventStore.setState({
- events: [event1, event2],
- eventIds: new Set(["1", "2"]),
- uiEvents: [event1, event2],
- });
+ expect(result.current.taskList).toEqual([
+ { id: "1", title: "New task", notes: undefined, status: "todo" },
+ ]);
+ expect(result.current.hasTaskList).toBe(true);
+ });
- const { result } = renderHook(() => useTaskList());
+ it("returns hasTaskList=false when the latest plan has an empty task list", () => {
+ const event = createTaskTrackerObservation("1", "plan", []);
- expect(result.current.taskList).toEqual([
- { id: "1", title: "First task", notes: undefined, status: "done" },
- { id: "2", title: "New task", notes: "wip", status: "in_progress" },
- ]);
- expect(result.current.hasTaskList).toBe(true);
+ useEventStore.setState({
+ events: [event],
+ eventIds: new Set(["1"]),
+ uiEvents: [event],
});
- it("returns hasTaskList=false when the latest v1 plan has an empty task list", () => {
- const event = createV1TaskTrackerObservation("1", "plan", []);
-
- useEventStore.setState({
- events: [event],
- eventIds: new Set(["1"]),
- uiEvents: [event],
- });
-
- const { result } = renderHook(() => useTaskList());
+ const { result } = renderHook(() => useTaskList());
- expect(result.current.taskList).toEqual([]);
- expect(result.current.hasTaskList).toBe(false);
- });
+ expect(result.current.taskList).toEqual([]);
+ expect(result.current.hasTaskList).toBe(false);
});
});
diff --git a/__tests__/hooks/use-terminal.test.tsx b/__tests__/hooks/use-terminal.test.tsx
index 0e4761b21b..5fd5659672 100644
--- a/__tests__/hooks/use-terminal.test.tsx
+++ b/__tests__/hooks/use-terminal.test.tsx
@@ -3,28 +3,17 @@ import { useTerminal } from "#/hooks/use-terminal";
import { Command, useCommandStore } from "#/stores/command-store";
import { renderWithProviders } from "../../test-utils";
-// Mock the WsClient context
-vi.mock("#/context/ws-client-provider", () => ({
- useWsClient: () => ({
- send: vi.fn(),
- status: "CONNECTED",
- isLoadingMessages: false,
- events: [],
- }),
-}));
-
// Mock useActiveConversation
vi.mock("#/hooks/query/use-active-conversation", () => ({
useActiveConversation: () => ({
data: {
id: "test-conversation-id",
- conversation_version: "V0",
},
isFetched: true,
}),
}));
-// Mock useConversationWebSocket (returns null for V0 conversations)
+// Mock useConversationWebSocket
vi.mock("#/contexts/conversation-websocket-context", () => ({
useConversationWebSocket: () => null,
}));
diff --git a/__tests__/routes/root-layout-refetch.test.tsx b/__tests__/routes/root-layout-refetch.test.tsx
index 5ee5a1cf2b..fab09e25c8 100644
--- a/__tests__/routes/root-layout-refetch.test.tsx
+++ b/__tests__/routes/root-layout-refetch.test.tsx
@@ -3,6 +3,7 @@ import { afterEach, describe, expect, it, vi } from "vitest";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { createRoutesStub } from "react-router";
import MainApp from "#/routes/root-layout";
+
import { ActiveBackendProvider } from "#/contexts/active-backend-context";
// Hoisted mocks for useIsAuthed and useConfig to allow dynamic control in tests
diff --git a/__tests__/routes/task-list-tab.test.tsx b/__tests__/routes/task-list-tab.test.tsx
index 605781e825..d5718d1749 100644
--- a/__tests__/routes/task-list-tab.test.tsx
+++ b/__tests__/routes/task-list-tab.test.tsx
@@ -2,7 +2,7 @@ import { render, screen } from "@testing-library/react";
import { describe, it, expect, vi, beforeEach } from "vitest";
import TaskListTab from "#/routes/task-list-tab";
import { useEventStore } from "#/stores/use-event-store";
-import type { TaskTrackingObservation } from "#/types/core/observations";
+import type { OHEvent } from "#/stores/use-event-store";
// Mock i18n
vi.mock("react-i18next", () => ({
@@ -17,30 +17,39 @@ vi.mock("react-i18next", () => ({
}),
}));
-function createTaskTrackingObservation(
- id: number,
- tasks: TaskTrackingObservation["extras"]["task_list"],
-): TaskTrackingObservation {
+type TestTask = {
+ id?: string;
+ title: string;
+ status: "todo" | "in_progress" | "done";
+ notes?: string;
+};
+
+function createTaskTrackingObservation(id: string, tasks: TestTask[]): OHEvent {
return {
id,
- source: "agent",
- observation: "task_tracking",
- message: "Task tracking update",
timestamp: `2025-07-01T00:00:0${id}Z`,
- cause: 0,
- content: "",
- extras: {
+ source: "environment",
+ tool_name: "task_tracker",
+ tool_call_id: `call_${id}`,
+ action_id: `action_${id}`,
+ observation: {
+ kind: "TaskTrackerObservation",
+ content: "Task tracking update",
command: "plan",
- task_list: tasks,
+ task_list: tasks.map((task) => ({
+ title: task.title,
+ notes: task.notes ?? "",
+ status: task.status,
+ })),
},
- };
+ } as OHEvent;
}
-function setTasks(tasks: TaskTrackingObservation["extras"]["task_list"]) {
- const event = createTaskTrackingObservation(1, tasks);
+function setTasks(tasks: TestTask[]) {
+ const event = createTaskTrackingObservation("1", tasks);
useEventStore.setState({
events: [event],
- eventIds: new Set([1]),
+ eventIds: new Set(["1"]),
uiEvents: [event],
});
}
@@ -135,17 +144,17 @@ describe("TaskListTab", () => {
});
it("uses the latest plan event when multiple exist", () => {
- const event1 = createTaskTrackingObservation(1, [
+ const event1 = createTaskTrackingObservation("1", [
{ id: "1", title: "Old task", status: "todo" },
]);
- const event2 = createTaskTrackingObservation(2, [
+ const event2 = createTaskTrackingObservation("2", [
{ id: "1", title: "Updated task", status: "done" },
{ id: "2", title: "New task", status: "in_progress" },
]);
useEventStore.setState({
events: [event1, event2],
- eventIds: new Set([1, 2]),
+ eventIds: new Set(["1", "2"]),
uiEvents: [event1, event2],
});
diff --git a/__tests__/stores/use-event-store.test.ts b/__tests__/stores/use-event-store.test.ts
index 82377d8179..5db692cce9 100644
--- a/__tests__/stores/use-event-store.test.ts
+++ b/__tests__/stores/use-event-store.test.ts
@@ -6,7 +6,7 @@ import {
MessageEvent,
ObservationEvent,
SecurityRisk,
-} from "#/types/v1/core";
+} from "#/types/agent-server/core";
const mockUserMessageEvent: MessageEvent = {
id: "test-event-1",
diff --git a/__tests__/utils/handle-event-for-ui.test.ts b/__tests__/utils/handle-event-for-ui.test.ts
index e9b8ae5608..60e74dd53c 100644
--- a/__tests__/utils/handle-event-for-ui.test.ts
+++ b/__tests__/utils/handle-event-for-ui.test.ts
@@ -5,8 +5,8 @@ import {
MessageEvent,
SecurityRisk,
OpenHandsEvent,
-} from "#/types/v1/core";
-import { ACPToolCallEvent } from "#/types/v1/core/events/acp-tool-call-event";
+} from "#/types/agent-server/core";
+import { ACPToolCallEvent } from "#/types/agent-server/core/events/acp-tool-call-event";
import { handleEventForUI } from "#/utils/handle-event-for-ui";
describe("handleEventForUI", () => {
diff --git a/__tests__/utils/status.test.ts b/__tests__/utils/status.test.ts
index 468c76547c..9b22451910 100644
--- a/__tests__/utils/status.test.ts
+++ b/__tests__/utils/status.test.ts
@@ -6,22 +6,22 @@ import {
} from "#/utils/status";
import { AgentState } from "#/types/agent-state";
import { I18nKey } from "#/i18n/declaration";
-import { V1ExecutionStatus } from "#/types/v1/core";
-import type { V1AppConversationStartTaskStatus } from "#/api/conversation-service/v1-conversation-service.types";
+import { ExecutionStatus } from "#/types/agent-server/core";
+import type { AppConversationStartTaskStatus } from "#/api/conversation-service/agent-server-conversation-service.types";
describe("getStatusCode", () => {
it("returns RUNNING_TASK when execution status is running", () => {
- const result = getStatusCode("OPEN", V1ExecutionStatus.RUNNING);
+ const result = getStatusCode("OPEN", ExecutionStatus.RUNNING);
expect(result).toBe(I18nKey.AGENT_STATUS$RUNNING_TASK);
});
it("returns WAITING_FOR_TASK when execution status is idle", () => {
- const result = getStatusCode("OPEN", V1ExecutionStatus.IDLE);
+ const result = getStatusCode("OPEN", ExecutionStatus.IDLE);
expect(result).toBe(I18nKey.AGENT_STATUS$WAITING_FOR_TASK);
});
it("returns STOPPED when execution status is paused", () => {
- const result = getStatusCode("OPEN", V1ExecutionStatus.PAUSED);
+ const result = getStatusCode("OPEN", ExecutionStatus.PAUSED);
expect(result).toBe(I18nKey.CHAT_INTERFACE$STOPPED);
});
@@ -36,7 +36,7 @@ describe("getStatusCode", () => {
});
it("returns DISCONNECTED when websocket is closed and no task", () => {
- const result = getStatusCode("CLOSED", V1ExecutionStatus.IDLE);
+ const result = getStatusCode("CLOSED", ExecutionStatus.IDLE);
expect(result).toBe(I18nKey.CHAT_INTERFACE$DISCONNECTED);
});
@@ -47,7 +47,7 @@ describe("getStatusCode", () => {
it("falls back to starting i18n key for an unknown task status instead of throwing", () => {
const unknownStatus =
- "FUTURE_STATUS_FROM_CLOUD" as V1AppConversationStartTaskStatus;
+ "FUTURE_STATUS_FROM_CLOUD" as AppConversationStartTaskStatus;
const result = getStatusCode("OPEN", null, unknownStatus);
expect(result).toBe(I18nKey.CONVERSATION$STARTING_CONVERSATION);
});
diff --git a/src/api/agent-server-adapter.ts b/src/api/agent-server-adapter.ts
index 61ecc7e702..1de5da6f68 100644
--- a/src/api/agent-server-adapter.ts
+++ b/src/api/agent-server-adapter.ts
@@ -1,15 +1,15 @@
import { DEFAULT_SETTINGS } from "#/services/settings";
import { Settings, SettingsValue } from "#/types/settings";
-import { V1ExecutionStatus } from "#/types/v1/core";
+import { ExecutionStatus } from "#/types/agent-server/core";
import { getAgentServerWorkingDir } from "./agent-server-config";
import { getEffectiveLocalBackend } from "./backend-registry/active-store";
import {
GetHooksResponse,
GetSkillsResponse,
PluginSpec,
- V1AppConversation,
- V1AppConversationPage,
-} from "./conversation-service/v1-conversation-service.types";
+ AppConversation,
+ AppConversationPage,
+} from "./conversation-service/agent-server-conversation-service.types";
import { createHttpClient, createSkillsClient } from "./typescript-client";
import SettingsService from "./settings-service/settings-service.api";
import { getStoredConversationMetadata } from "./conversation-metadata-store";
@@ -63,9 +63,9 @@ export function getDefaultConversationTitle(conversationId: string): string {
return `Conversation ${conversationId.slice(0, 5)}`;
}
-export function toV1AppConversation(
+export function toAppConversation(
info: DirectConversationInfo,
-): V1AppConversation {
+): AppConversation {
const metadata = getStoredConversationMetadata(info.id);
return {
id: info.id,
@@ -104,8 +104,8 @@ export function toV1AppConversation(
created_at: info.created_at,
updated_at: info.updated_at,
execution_status:
- (info.execution_status as V1AppConversation["execution_status"]) ??
- V1ExecutionStatus.IDLE,
+ (info.execution_status as AppConversation["execution_status"]) ??
+ ExecutionStatus.IDLE,
conversation_url: toConversationUrl(info.id),
session_api_key: getEffectiveLocalBackend().apiKey || null,
sandbox_id: null,
@@ -117,12 +117,12 @@ export function toV1AppConversation(
};
}
-export function toV1ConversationPage(data: {
+export function toConversationPage(data: {
items: DirectConversationInfo[];
next_page_id?: string | null;
-}): V1AppConversationPage {
+}): AppConversationPage {
return {
- items: data.items.map(toV1AppConversation),
+ items: data.items.map(toAppConversation),
next_page_id: data.next_page_id ?? null,
};
}
@@ -523,7 +523,7 @@ export async function downloadTextFile(path: string): Promise<string> {
}
export async function loadSkillsForConversation(
- conversation: V1AppConversation | null | undefined,
+ conversation: AppConversation | null | undefined,
): Promise<GetSkillsResponse> {
const projectDir =
conversation?.workspace?.working_dir ?? getAgentServerWorkingDir();
diff --git a/src/api/cloud/conversation-service.api.ts b/src/api/cloud/conversation-service.api.ts
index 3b6c413ab0..a6a0b88840 100644
--- a/src/api/cloud/conversation-service.api.ts
+++ b/src/api/cloud/conversation-service.api.ts
@@ -1,11 +1,11 @@
import { getActiveBackend } from "../backend-registry/active-store";
import type { Backend } from "../backend-registry/types";
import type {
- V1AppConversation,
- V1AppConversationPage,
- V1AppConversationStartRequest,
- V1AppConversationStartTask,
-} from "../conversation-service/v1-conversation-service.types";
+ AppConversation,
+ AppConversationPage,
+ AppConversationStartRequest,
+ AppConversationStartTask,
+} from "../conversation-service/agent-server-conversation-service.types";
import { callCloudProxy } from "./proxy";
function getActiveCloudBackend(): Backend {
@@ -18,14 +18,14 @@ function getActiveCloudBackend(): Backend {
/**
* Search the cloud SaaS app-conversations list. Mirrors the local
- * `V1ConversationService.searchConversations` interface but routes
+ * `AgentServerConversationService.searchConversations` interface but routes
* through the bundled agent-server's cloud proxy and hits the SaaS
* endpoint `/api/v1/app-conversations/search`.
*/
export async function searchCloudConversations(
limit: number = 20,
pageId?: string,
-): Promise<V1AppConversationPage> {
+): Promise<AppConversationPage> {
const backend = getActiveCloudBackend();
const params = new URLSearchParams();
params.set("limit", String(limit));
@@ -33,7 +33,7 @@ export async function searchCloudConversations(
params.set("sort_order", "UPDATED_AT_DESC");
const data = await callCloudProxy<{
- items: V1AppConversation[];
+ items: AppConversation[];
next_page_id: string | null;
}>({
backend,
@@ -49,16 +49,16 @@ export async function searchCloudConversations(
/**
* Batch-fetch cloud app-conversations by id. Mirrors the local
- * `V1ConversationService.batchGetAppConversations` interface.
+ * `AgentServerConversationService.batchGetAppConversations` interface.
*/
export async function batchGetCloudConversations(
ids: string[],
-): Promise<(V1AppConversation | null)[]> {
+): Promise<(AppConversation | null)[]> {
if (ids.length === 0) return [];
const backend = getActiveCloudBackend();
const params = new URLSearchParams();
for (const id of ids) params.append("ids", id);
- const data = await callCloudProxy<(V1AppConversation | null)[]>({
+ const data = await callCloudProxy<(AppConversation | null)[]>({
backend,
method: "GET",
path: `/api/v1/app-conversations?${params.toString()}`,
@@ -70,8 +70,8 @@ export async function batchGetCloudConversations(
* Create a v1 app-conversation on the cloud SaaS.
*
* Mirrors OpenHands' SaaS flow: POST /api/v1/app-conversations with the
- * `V1AppConversationStartRequest` payload, returning a
- * `V1AppConversationStartTask`. The task is initially WORKING; the caller
+ * `AppConversationStartRequest` payload, returning a
+ * `AppConversationStartTask`. The task is initially WORKING; the caller
* polls `getCloudAppConversationStartTask` (3s cadence per OpenHands)
* until status is READY (then `app_conversation_id`, `agent_server_url`,
* and `session_api_key` are populated) or ERROR.
@@ -83,10 +83,10 @@ export async function batchGetCloudConversations(
* task.
*/
export async function createCloudAppConversation(
- request: V1AppConversationStartRequest,
-): Promise<V1AppConversationStartTask> {
+ request: AppConversationStartRequest,
+): Promise<AppConversationStartTask> {
const backend = getActiveCloudBackend();
- const data = await callCloudProxy<V1AppConversationStartTask>({
+ const data = await callCloudProxy<AppConversationStartTask>({
backend,
method: "POST",
path: "/api/v1/app-conversations",
@@ -97,7 +97,7 @@ export async function createCloudAppConversation(
/**
* Download a v1 app-conversation as a ZIP from the cloud SaaS. Mirrors
- * the local `V1ConversationService.downloadConversation` interface but
+ * the local `AgentServerConversationService.downloadConversation` interface but
* routes through the bundled agent-server's cloud proxy and hits
* `GET /api/v1/app-conversations/{id}/download`, which returns
* `application/zip` with `Content-Disposition` set by the SaaS.
@@ -116,7 +116,7 @@ export async function downloadCloudConversation(
/**
* Delete a v1 app-conversation on the cloud SaaS. Mirrors the local
- * `V1ConversationService.deleteConversation` interface but routes
+ * `AgentServerConversationService.deleteConversation` interface but routes
* through the bundled agent-server's cloud proxy and hits
* `DELETE /api/v1/app-conversations/{id}`, which returns a JSON
* `Success` envelope (discarded here β€” the caller only needs to know
@@ -135,7 +135,7 @@ export async function deleteCloudConversation(
/**
* Toggle the public-sharing flag on a cloud v1 app-conversation. Mirrors
- * OpenHands' `V1ConversationService.updateConversationPublicFlag` β€”
+ * OpenHands' `AgentServerConversationService.updateConversationPublicFlag` β€”
* routes through the bundled agent-server's cloud proxy and hits
* `PATCH /api/v1/app-conversations/{id}` with `{ public }`, returning
* the updated conversation.
@@ -143,9 +143,9 @@ export async function deleteCloudConversation(
export async function updateCloudConversationPublicFlag(
conversationId: string,
isPublic: boolean,
-): Promise<V1AppConversation> {
+): Promise<AppConversation> {
const backend = getActiveCloudBackend();
- const data = await callCloudProxy<V1AppConversation>({
+ const data = await callCloudProxy<AppConversation>({
backend,
method: "PATCH",
path: `/api/v1/app-conversations/${conversationId}`,
@@ -172,7 +172,7 @@ export async function pauseCloudSandbox(sandboxId: string): Promise<void> {
/**
* Read a file from a cloud conversation's sandbox workspace. Mirrors
- * OpenHands' `V1ConversationService.readConversationFile` β€” hits
+ * OpenHands' `AgentServerConversationService.readConversationFile` β€” hits
* `GET /api/v1/app-conversations/{id}/file?file_path=...` on the SaaS
* and returns the file content as a string.
*/
@@ -193,16 +193,16 @@ export async function readCloudConversationFile(
/**
* Fetch a single v1 app-conversation start task. Mirrors OpenHands'
- * `V1ConversationService.getStartTask` β€” uses the batch search endpoint
+ * `AgentServerConversationService.getStartTask` β€” uses the batch search endpoint
* with a single id and unwraps the first result.
*/
export async function getCloudAppConversationStartTask(
taskId: string,
-): Promise<V1AppConversationStartTask | null> {
+): Promise<AppConversationStartTask | null> {
const backend = getActiveCloudBackend();
const params = new URLSearchParams();
params.set("ids", taskId);
- const data = await callCloudProxy<(V1AppConversationStartTask | null)[]>({
+ const data = await callCloudProxy<(AppConversationStartTask | null)[]>({
backend,
method: "GET",
path: `/api/v1/app-conversations/start-tasks?${params.toString()}`,
diff --git a/src/api/cloud/settings-service.api.ts b/src/api/cloud/settings-service.api.ts
index 54ac94603a..a020c68934 100644
--- a/src/api/cloud/settings-service.api.ts
+++ b/src/api/cloud/settings-service.api.ts
@@ -42,7 +42,6 @@ type CloudSettingsResponse = {
git_user_email?: string;
user_consents_to_analytics?: boolean | null;
is_new_user?: boolean;
- v1_enabled?: boolean;
remote_runtime_resource_factor?: number | null;
max_budget_per_task?: number | null;
provider_tokens_set?: Partial<Record<Provider, string | null>>;
diff --git a/src/api/conversation-service/v1-conversation-service.api.ts b/src/api/conversation-service/agent-server-conversation-service.api.ts
similarity index 91%
rename from src/api/conversation-service/v1-conversation-service.api.ts
rename to src/api/conversation-service/agent-server-conversation-service.api.ts
index 3099bab3e7..d53f41c7e1 100644
--- a/src/api/conversation-service/v1-conversation-service.api.ts
+++ b/src/api/conversation-service/agent-server-conversation-service.api.ts
@@ -27,8 +27,8 @@ import {
emptyHooksResponse,
getDefaultConversationTitle,
loadSkillsForConversation,
- toV1AppConversation,
- toV1ConversationPage,
+ toAppConversation,
+ toConversationPage,
} from "../agent-server-adapter";
import { GetVSCodeUrlResponse } from "../open-hands.types";
import {
@@ -46,20 +46,20 @@ import type {
GetHooksResponse,
GetSkillsResponse,
PluginSpec,
- V1AppConversation,
- V1AppConversationPage,
- V1AppConversationStartRequest,
- V1AppConversationStartTask,
- V1RuntimeConversationInfo,
- V1SendMessageRequest,
- V1SendMessageResponse,
-} from "./v1-conversation-service.types";
-
-class V1ConversationService {
+ AppConversation,
+ AppConversationPage,
+ AppConversationStartRequest,
+ AppConversationStartTask,
+ RuntimeConversationInfo,
+ SendMessageRequest,
+ SendMessageResponse,
+} from "./agent-server-conversation-service.types";
+
+class AgentServerConversationService {
static async sendMessage(
conversationId: string,
- message: V1SendMessageRequest,
- ): Promise<V1SendMessageResponse> {
+ message: SendMessageRequest,
+ ): Promise<SendMessageResponse> {
await createHttpClient().post(
`/api/conversations/${conversationId}/events`,
{
@@ -80,14 +80,14 @@ class V1ConversationService {
parentConversationId?: string,
agentType?: "default" | "plan",
sandboxId?: string,
- ): Promise<V1AppConversationStartTask> {
+ ): Promise<AppConversationStartTask> {
if (getActiveBackend().backend.kind === "cloud") {
// Cloud SaaS path mirrors OpenHands' frontend: build a flat
- // V1AppConversationStartRequest, POST /api/v1/app-conversations
+ // AppConversationStartRequest, POST /api/v1/app-conversations
// (returns a WORKING task), and let the conversation route's
// useTaskPolling drive it to READY. NO encrypted-settings
// round-trip β€” the SaaS holds secrets server-side.
- const request: V1AppConversationStartRequest = {
+ const request: AppConversationStartRequest = {
initial_message: initialUserMsg
? {
role: "user",
@@ -106,6 +106,7 @@ class V1ConversationService {
return createCloudAppConversation(request);
}
+
const settings = await SettingsService.getSettings();
const conversationId = uuidv4();
const workingDir =
@@ -129,7 +130,7 @@ class V1ConversationService {
if (metadata?.selected_repository) {
// The agent-server runtime has no concept of selected repo/branch, so
- // persist the home-page selection client-side. toV1AppConversation
+ // persist the home-page selection client-side. toAppConversation
// reads the same store when the chat page hydrates the badges.
setStoredConversationMetadata(data.id, metadata);
}
@@ -143,7 +144,7 @@ class V1ConversationService {
agent_server_url: getEffectiveLocalBackend().host,
request: {
initial_message: payload.initial_message as
- | V1AppConversationStartRequest["initial_message"]
+ | AppConversationStartRequest["initial_message"]
| undefined,
plugins: plugins ?? null,
},
@@ -154,7 +155,7 @@ class V1ConversationService {
static async getStartTask(
taskId: string,
- ): Promise<V1AppConversationStartTask | null> {
+ ): Promise<AppConversationStartTask | null> {
if (getActiveBackend().backend.kind === "cloud") {
return getCloudAppConversationStartTask(taskId);
}
@@ -166,7 +167,7 @@ class V1ConversationService {
static async searchStartTasks(
_limit: number = 100,
- ): Promise<V1AppConversationStartTask[]> {
+ ): Promise<AppConversationStartTask[]> {
return [];
}
@@ -257,7 +258,7 @@ class V1ConversationService {
static async batchGetAppConversations(
ids: string[],
- ): Promise<(V1AppConversation | null)[]> {
+ ): Promise<(AppConversation | null)[]> {
if (ids.length === 0) return [];
if (getActiveBackend().backend.kind === "cloud") {
@@ -269,7 +270,7 @@ class V1ConversationService {
>("/api/conversations", { params: { ids } });
return response.data.map((item) =>
- item ? toV1AppConversation(item) : null,
+ item ? toAppConversation(item) : null,
);
}
@@ -292,7 +293,7 @@ class V1ConversationService {
static async updateConversationPublicFlag(
conversationId: string,
isPublic: boolean,
- ): Promise<V1AppConversation> {
+ ): Promise<AppConversation> {
if (getActiveBackend().backend.kind !== "cloud") {
throw new Error("Public sharing requires a cloud backend.");
}
@@ -304,7 +305,7 @@ class V1ConversationService {
repository: string | null,
branch?: string | null,
gitProvider?: string | null,
- ): Promise<V1AppConversation> {
+ ): Promise<AppConversation> {
if (repository) {
setStoredConversationMetadata(conversationId, {
selected_repository: repository,
@@ -315,7 +316,7 @@ class V1ConversationService {
removeStoredConversationMetadata(conversationId);
}
const results = await this.batchGetAppConversations([conversationId]);
- return results[0] as V1AppConversation;
+ return results[0] as AppConversation;
}
static async readConversationFile(
@@ -370,11 +371,11 @@ class V1ConversationService {
conversationId: string,
conversationUrl: string | null | undefined,
sessionApiKey?: string | null,
- ): Promise<V1RuntimeConversationInfo> {
+ ): Promise<RuntimeConversationInfo> {
const active = getActiveBackend().backend;
type RawRuntime = DirectConversationInfo & {
- stats?: V1RuntimeConversationInfo["stats"];
+ stats?: RuntimeConversationInfo["stats"];
};
// Cloud mode: route through the cloud-proxy to the runtime sandbox at
@@ -429,7 +430,7 @@ class V1ConversationService {
created_at: data.created_at,
updated_at: data.updated_at,
status:
- (data.execution_status as V1RuntimeConversationInfo["status"]) ??
+ (data.execution_status as RuntimeConversationInfo["status"]) ??
"idle",
stats: data.stats ?? { usage_to_metrics: {} },
};
@@ -438,7 +439,7 @@ class V1ConversationService {
static async searchConversations(
limit: number = 20,
pageId?: string,
- ): Promise<V1AppConversationPage> {
+ ): Promise<AppConversationPage> {
if (getActiveBackend().backend.kind === "cloud") {
return searchCloudConversations(limit, pageId);
}
@@ -454,7 +455,7 @@ class V1ConversationService {
},
});
- return toV1ConversationPage(response.data);
+ return toConversationPage(response.data);
}
static async deleteConversation(conversationId: string): Promise<void> {
@@ -469,15 +470,15 @@ class V1ConversationService {
static async updateConversationTitle(
conversationId: string,
title: string,
- ): Promise<V1AppConversation> {
+ ): Promise<AppConversation> {
await createHttpClient().patch(`/api/conversations/${conversationId}`, {
title,
});
const [conversation] = await this.batchGetAppConversations([
conversationId,
]);
- return conversation as V1AppConversation;
+ return conversation as AppConversation;
}
}
-export default V1ConversationService;
+export default AgentServerConversationService;
diff --git a/src/api/conversation-service/v1-conversation-service.types.ts b/src/api/conversation-service/agent-server-conversation-service.types.ts
similarity index 68%
rename from src/api/conversation-service/v1-conversation-service.types.ts
rename to src/api/conversation-service/agent-server-conversation-service.types.ts
index 593ee011e7..4e6991c7f4 100644
--- a/src/api/conversation-service/v1-conversation-service.types.ts
+++ b/src/api/conversation-service/agent-server-conversation-service.types.ts
@@ -1,7 +1,7 @@
import { ConversationTrigger } from "../open-hands.types";
import { Provider } from "#/types/settings";
import { SuggestedTask } from "#/utils/types";
-import { V1ExecutionStatus } from "#/types/v1/core";
+import { ExecutionStatus } from "#/types/agent-server/core";
// Plugin specification for starting conversations with plugins
export interface PluginSpec {
@@ -12,7 +12,7 @@ export interface PluginSpec {
}
// V1 Metrics Types
-export interface V1TokenUsage {
+export interface TokenUsage {
prompt_tokens: number;
completion_tokens: number;
cache_read_tokens: number;
@@ -21,35 +21,35 @@ export interface V1TokenUsage {
per_turn_token: number;
}
-export interface V1MetricsSnapshot {
+export interface MetricsSnapshot {
accumulated_cost: number | null;
max_budget_per_task: number | null;
- accumulated_token_usage: V1TokenUsage | null;
+ accumulated_token_usage: TokenUsage | null;
}
// V1 API Types for requests
// These types match the SDK's TextContent and ImageContent formats
-export interface V1TextContent {
+export interface MessageTextContent {
type: "text";
text: string;
}
-export interface V1ImageContent {
+export interface MessageImageContent {
type: "image";
image_urls: string[];
}
-export type V1MessageContent = V1TextContent | V1ImageContent;
+export type MessageContent = MessageTextContent | MessageImageContent;
-type V1Role = "user" | "system" | "assistant" | "tool";
+type MessageRole = "user" | "system" | "assistant" | "tool";
-export interface V1SendMessageRequest {
- role: V1Role;
- content: V1MessageContent[];
+export interface SendMessageRequest {
+ role: MessageRole;
+ content: MessageContent[];
}
-export interface V1AppConversationStartRequest {
- initial_message?: V1SendMessageRequest | null;
+export interface AppConversationStartRequest {
+ initial_message?: SendMessageRequest | null;
processors?: unknown[]; // EventCallbackProcessor - keeping as unknown for now
llm_model?: string | null;
selected_repository?: string | null;
@@ -65,7 +65,7 @@ export interface V1AppConversationStartRequest {
plugins?: PluginSpec[] | null; // Plugins to load when starting the conversation
}
-export type V1AppConversationStartTaskStatus =
+export type AppConversationStartTaskStatus =
| "WORKING"
| "WAITING_FOR_SANDBOX"
| "PREPARING_REPOSITORY"
@@ -76,33 +76,33 @@ export type V1AppConversationStartTaskStatus =
| "READY"
| "ERROR";
-export interface V1AppConversationStartTask {
+export interface AppConversationStartTask {
id: string;
created_by_user_id: string | null;
- status: V1AppConversationStartTaskStatus;
+ status: AppConversationStartTaskStatus;
detail: string | null;
app_conversation_id: string | null;
agent_server_url: string | null;
- request: V1AppConversationStartRequest;
+ request: AppConversationStartRequest;
created_at: string;
updated_at: string;
}
-export interface V1SendMessageResponse {
+export interface SendMessageResponse {
role: "user" | "system" | "assistant" | "tool";
- content: V1MessageContent[];
+ content: MessageContent[];
}
-export interface V1AppConversationStartTaskPage {
- items: V1AppConversationStartTask[];
+export interface AppConversationStartTaskPage {
+ items: AppConversationStartTask[];
next_page_id: string | null;
}
-export interface V1ConversationWorkspace {
+export interface ConversationWorkspace {
working_dir: string | null;
}
-export interface V1AppConversation {
+export interface AppConversation {
id: string;
created_by_user_id: string | null;
selected_repository: string | null;
@@ -112,20 +112,20 @@ export interface V1AppConversation {
trigger: ConversationTrigger | null;
pr_number: number[];
llm_model: string | null;
- metrics: V1MetricsSnapshot | null;
+ metrics: MetricsSnapshot | null;
created_at: string;
updated_at: string;
- execution_status: V1ExecutionStatus | null;
+ execution_status: ExecutionStatus | null;
conversation_url: string | null;
session_api_key: string | null;
sandbox_id: string | null;
- workspace?: V1ConversationWorkspace | null;
+ workspace?: ConversationWorkspace | null;
public?: boolean;
sub_conversation_ids: string[];
}
-export interface V1AppConversationPage {
- items: V1AppConversation[];
+export interface AppConversationPage {
+ items: AppConversation[];
next_page_id: string | null;
}
@@ -162,38 +162,38 @@ export interface GetHooksResponse {
}
// Runtime conversation types (from agent server)
-export interface V1RuntimeConversationStats {
- usage_to_metrics: Record<string, V1RuntimeMetrics>;
+export interface RuntimeConversationStats {
+ usage_to_metrics: Record<string, RuntimeMetrics>;
}
-export interface V1RuntimeMetrics {
+export interface RuntimeMetrics {
model_name: string;
accumulated_cost: number;
max_budget_per_task: number | null;
- accumulated_token_usage: V1TokenUsage | null;
- costs: V1Cost[];
- response_latencies: V1ResponseLatency[];
- token_usages: V1TokenUsage[];
+ accumulated_token_usage: TokenUsage | null;
+ costs: Cost[];
+ response_latencies: ResponseLatency[];
+ token_usages: TokenUsage[];
}
-export interface V1Cost {
+export interface Cost {
model: string;
cost: number;
timestamp: number;
}
-export interface V1ResponseLatency {
+export interface ResponseLatency {
model: string;
latency: number;
response_id: string;
}
-export interface V1RuntimeConversationInfo {
+export interface RuntimeConversationInfo {
id: string;
title: string | null;
- metrics: V1MetricsSnapshot | null;
+ metrics: MetricsSnapshot | null;
created_at: string;
updated_at: string;
- status: V1ExecutionStatus;
- stats: V1RuntimeConversationStats;
+ status: ExecutionStatus;
+ stats: RuntimeConversationStats;
}
diff --git a/src/api/conversation-service/conversation-service.api.ts b/src/api/conversation-service/conversation-service.api.ts
index ab3dfd1918..0fccaa7be8 100644
--- a/src/api/conversation-service/conversation-service.api.ts
+++ b/src/api/conversation-service/conversation-service.api.ts
@@ -9,17 +9,17 @@ import {
createRemoteWorkspace,
createVSCodeClient,
} from "../typescript-client";
-import { V1AppConversation } from "./v1-conversation-service.types";
+import { AppConversation } from "./agent-server-conversation-service.types";
class ConversationService {
- private static currentConversation: V1AppConversation | null = null;
+ private static currentConversation: AppConversation | null = null;
- static getCurrentConversation(): V1AppConversation | null {
+ static getCurrentConversation(): AppConversation | null {
return this.currentConversation;
}
static setCurrentConversation(
- currentConversation: V1AppConversation | null,
+ currentConversation: AppConversation | null,
): void {
this.currentConversation = currentConversation;
}
diff --git a/src/api/event-service/event-service.api.ts b/src/api/event-service/event-service.api.ts
index c704d4a6e7..c74b8d2bfc 100644
--- a/src/api/event-service/event-service.api.ts
+++ b/src/api/event-service/event-service.api.ts
@@ -1,4 +1,4 @@
-import { OpenHandsEvent } from "#/types/v1/core";
+import { OpenHandsEvent } from "#/types/agent-server/core";
import { buildHttpBaseUrl } from "#/utils/websocket-url";
import { getActiveBackend } from "../backend-registry/active-store";
import { callCloudProxy } from "../cloud/proxy";
@@ -85,7 +85,7 @@ class EventService {
}).count();
}
- static async searchEventsV1(
+ static async searchEvents(
conversationId: string,
limit = 100,
conversationUrl?: string | null,
diff --git a/src/api/git-service/v1-git-service.api.ts b/src/api/git-service/agent-server-git-service.api.ts
similarity index 88%
rename from src/api/git-service/v1-git-service.api.ts
rename to src/api/git-service/agent-server-git-service.api.ts
index 709bb6e44d..1649f55846 100644
--- a/src/api/git-service/v1-git-service.api.ts
+++ b/src/api/git-service/agent-server-git-service.api.ts
@@ -1,17 +1,17 @@
-import { mapAnyGitStatusToV0Status } from "#/utils/git-status-mapper";
+import { mapAnyGitStatusToClientStatus } from "#/utils/git-status-mapper";
import { buildHttpBaseUrl } from "#/utils/websocket-url";
import type { GitChange, GitChangeDiff } from "../open-hands.types";
import { getActiveBackend } from "../backend-registry/active-store";
import { callCloudProxy } from "../cloud/proxy";
import { createRemoteWorkspace } from "../typescript-client";
-interface V1GitChange {
+interface AgentServerGitChange {
status: string;
path: string;
}
/**
- * Git operations for V1 conversations.
+ * Git operations for agent-server conversations.
*
* In **local** mode the runtime is reachable directly from the browser
* (it's `127.0.0.1:18000`); the SDK's `RemoteWorkspace` calls land
@@ -34,7 +34,7 @@ function toAbsoluteRuntimePath(path: string): string {
return path.startsWith("/") ? path : `/${path}`;
}
-class V1GitService {
+class AgentServerGitService {
static async getGitChanges(
conversationUrl: string | null | undefined,
sessionApiKey: string | null | undefined,
@@ -45,8 +45,7 @@ class V1GitService {
if (active.kind === "cloud" && conversationUrl) {
const params = new URLSearchParams();
params.set("path", toAbsoluteRuntimePath(path));
- params.set("ref", "HEAD");
- const data = await callCloudProxy<V1GitChange[]>({
+ const data = await callCloudProxy<AgentServerGitChange[]>({
backend: active,
method: "GET",
hostOverride: buildHttpBaseUrl(conversationUrl),
@@ -60,9 +59,9 @@ class V1GitService {
);
}
return data.map((change) => ({
- status: mapAnyGitStatusToV0Status(
+ status: mapAnyGitStatusToClientStatus(
String(change.status) as Parameters<
- typeof mapAnyGitStatusToV0Status
+ typeof mapAnyGitStatusToClientStatus
>[0],
),
path: change.path,
@@ -81,9 +80,9 @@ class V1GitService {
}
return changes.map((change) => ({
- status: mapAnyGitStatusToV0Status(
+ status: mapAnyGitStatusToClientStatus(
String(change.status) as Parameters<
- typeof mapAnyGitStatusToV0Status
+ typeof mapAnyGitStatusToClientStatus
>[0],
),
path: change.path,
@@ -100,7 +99,6 @@ class V1GitService {
if (active.kind === "cloud" && conversationUrl) {
const params = new URLSearchParams();
params.set("path", toAbsoluteRuntimePath(path));
- params.set("ref", "HEAD");
const diff = await callCloudProxy<GitChangeDiff & { diff?: string }>({
backend: active,
method: "GET",
@@ -129,4 +127,4 @@ class V1GitService {
}
}
-export default V1GitService;
+export default AgentServerGitService;
diff --git a/src/api/git-service/git-service.api.ts b/src/api/git-service/git-service.api.ts
index 68a3c55ad7..96ae62171c 100644
--- a/src/api/git-service/git-service.api.ts
+++ b/src/api/git-service/git-service.api.ts
@@ -1,9 +1,9 @@
import { RepositoryPage, BranchPage, InstallationPage } from "#/types/git";
import { Provider } from "#/types/settings";
import { GitChange, GitChangeDiff } from "../open-hands.types";
-import V1ConversationService from "../conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "../conversation-service/agent-server-conversation-service.api";
import { createRemoteWorkspace } from "../typescript-client";
-import { mapAnyGitStatusToV0Status } from "#/utils/git-status-mapper";
+import { mapAnyGitStatusToClientStatus } from "#/utils/git-status-mapper";
import { ProviderHandler } from "../git-providers/provider-handler";
import { getActiveBackend } from "../backend-registry/active-store";
import {
@@ -154,7 +154,7 @@ class GitService {
static async getGitChanges(conversationId: string): Promise<GitChange[]> {
const workingDir =
- await V1ConversationService.resolveConversationWorkingDir(conversationId);
+ await AgentServerConversationService.resolveConversationWorkingDir(conversationId);
const changes = await createRemoteWorkspace({ workingDir }).gitChanges(
workingDir,
{ ref: "HEAD" },
@@ -162,9 +162,9 @@ class GitService {
return changes.map((change) => ({
path: change.path,
- status: mapAnyGitStatusToV0Status(
+ status: mapAnyGitStatusToClientStatus(
String(change.status) as Parameters<
- typeof mapAnyGitStatusToV0Status
+ typeof mapAnyGitStatusToClientStatus
>[0],
),
}));
diff --git a/src/api/open-hands.types.ts b/src/api/open-hands.types.ts
index e38b786ef5..4d404c2c4e 100644
--- a/src/api/open-hands.types.ts
+++ b/src/api/open-hands.types.ts
@@ -88,11 +88,11 @@ export interface ResultSet<T> {
}
/**
- * @deprecated Use V1GitChangeStatus for new code. This type is maintained for backward compatibility with V0 API.
+ * @deprecated Use AgentServerGitChangeStatus for new code. This type is maintained for backward compatibility with V0 API.
*/
export type GitChangeStatus = "M" | "A" | "D" | "R" | "U";
-export type V1GitChangeStatus = "MOVED" | "ADDED" | "DELETED" | "UPDATED";
+export type AgentServerGitChangeStatus = "MOVED" | "ADDED" | "DELETED" | "UPDATED";
export interface GitChange {
status: GitChangeStatus;
diff --git a/src/api/pending-message-service/pending-message-service.types.ts b/src/api/pending-message-service/pending-message-service.types.ts
index cf7b8dbf0e..e838a52a45 100644
--- a/src/api/pending-message-service/pending-message-service.types.ts
+++ b/src/api/pending-message-service/pending-message-service.types.ts
@@ -2,7 +2,7 @@
* Types for the pending message service
*/
-import type { V1MessageContent } from "../conversation-service/v1-conversation-service.types";
+import type { MessageContent } from "../conversation-service/agent-server-conversation-service.types";
/**
* Response when queueing a pending message
@@ -18,5 +18,5 @@ export interface PendingMessageResponse {
*/
export interface QueuePendingMessageRequest {
role?: "user";
- content: V1MessageContent[];
+ content: MessageContent[];
}
diff --git a/src/api/shared-conversation-service.api.ts b/src/api/shared-conversation-service.api.ts
index 38e5dad9ee..4d812f86ee 100644
--- a/src/api/shared-conversation-service.api.ts
+++ b/src/api/shared-conversation-service.api.ts
@@ -1,4 +1,4 @@
-import { OpenHandsEvent } from "#/types/v1/core";
+import { OpenHandsEvent } from "#/types/agent-server/core";
import { createHttpClient } from "./typescript-client";
export interface SharedConversation {
diff --git a/src/components/v1/chat/event-content-helpers/create-skill-ready-event.ts b/src/components/conversation-events/chat/event-content-helpers/create-skill-ready-event.ts
similarity index 93%
rename from src/components/v1/chat/event-content-helpers/create-skill-ready-event.ts
rename to src/components/conversation-events/chat/event-content-helpers/create-skill-ready-event.ts
index 73fdf11646..d088c2561b 100644
--- a/src/components/v1/chat/event-content-helpers/create-skill-ready-event.ts
+++ b/src/components/conversation-events/chat/event-content-helpers/create-skill-ready-event.ts
@@ -1,5 +1,5 @@
-import { MessageEvent } from "#/types/v1/core";
-import { BaseEvent } from "#/types/v1/core/base/event";
+import { MessageEvent } from "#/types/agent-server/core";
+import { BaseEvent } from "#/types/agent-server/core/base/event";
import {
getSkillReadyContent,
getSkillReadyItems,
diff --git a/src/components/v1/chat/event-content-helpers/get-acp-tool-call-content.ts b/src/components/conversation-events/chat/event-content-helpers/get-acp-tool-call-content.ts
similarity index 96%
rename from src/components/v1/chat/event-content-helpers/get-acp-tool-call-content.ts
rename to src/components/conversation-events/chat/event-content-helpers/get-acp-tool-call-content.ts
index 9a39d71935..523f6b0aaf 100644
--- a/src/components/v1/chat/event-content-helpers/get-acp-tool-call-content.ts
+++ b/src/components/conversation-events/chat/event-content-helpers/get-acp-tool-call-content.ts
@@ -1,4 +1,4 @@
-import { ACPToolCallEvent } from "#/types/v1/core/events/acp-tool-call-event";
+import { ACPToolCallEvent } from "#/types/agent-server/core/events/acp-tool-call-event";
import i18n from "#/i18n";
import { MAX_CONTENT_LENGTH } from "./shared";
diff --git a/src/components/v1/chat/event-content-helpers/get-action-content.ts b/src/components/conversation-events/chat/event-content-helpers/get-action-content.ts
similarity index 97%
rename from src/components/v1/chat/event-content-helpers/get-action-content.ts
rename to src/components/conversation-events/chat/event-content-helpers/get-action-content.ts
index c0f2bf9db8..7af45fb4ef 100644
--- a/src/components/v1/chat/event-content-helpers/get-action-content.ts
+++ b/src/components/conversation-events/chat/event-content-helpers/get-action-content.ts
@@ -1,7 +1,7 @@
-import { ActionEvent } from "#/types/v1/core";
+import { ActionEvent } from "#/types/agent-server/core";
import { getDefaultEventContent, MAX_CONTENT_LENGTH } from "./shared";
import i18n from "#/i18n";
-import { SecurityRisk } from "#/types/v1/core/base/common";
+import { SecurityRisk } from "#/types/agent-server/core/base/common";
import {
ExecuteBashAction,
TerminalAction,
@@ -23,7 +23,7 @@ import {
BrowserCloseTabAction,
GlobAction,
GrepAction,
-} from "#/types/v1/core/base/action";
+} from "#/types/agent-server/core/base/action";
const getRiskText = (risk: SecurityRisk) => {
switch (risk) {
diff --git a/src/components/v1/chat/event-content-helpers/get-event-content.tsx b/src/components/conversation-events/chat/event-content-helpers/get-event-content.tsx
similarity index 98%
rename from src/components/v1/chat/event-content-helpers/get-event-content.tsx
rename to src/components/conversation-events/chat/event-content-helpers/get-event-content.tsx
index 47f1dc6508..a001df2f51 100644
--- a/src/components/v1/chat/event-content-helpers/get-event-content.tsx
+++ b/src/components/conversation-events/chat/event-content-helpers/get-event-content.tsx
@@ -1,11 +1,11 @@
import { Trans } from "react-i18next";
import React from "react";
-import { OpenHandsEvent, ObservationEvent, ActionEvent } from "#/types/v1/core";
+import { OpenHandsEvent, ObservationEvent, ActionEvent } from "#/types/agent-server/core";
import {
isActionEvent,
isObservationEvent,
isACPToolCallEvent,
-} from "#/types/v1/type-guards";
+} from "#/types/agent-server/type-guards";
import { MonoComponent } from "../../../features/chat/mono-component";
import { PathComponent } from "../../../features/chat/path-component";
import { getActionContent } from "./get-action-content";
@@ -15,7 +15,7 @@ import {
getACPToolCallTitleKey,
} from "./get-acp-tool-call-content";
import { TaskTrackingObservationContent } from "../task-tracking/task-tracking-observation-content";
-import { TaskTrackerObservation } from "#/types/v1/core/base/observation";
+import { TaskTrackerObservation } from "#/types/agent-server/core/base/observation";
import { SkillReadyEvent, isSkillReadyEvent } from "./create-skill-ready-event";
import i18n from "#/i18n";
diff --git a/src/components/v1/chat/event-content-helpers/get-observation-content.ts b/src/components/conversation-events/chat/event-content-helpers/get-observation-content.ts
similarity index 98%
rename from src/components/v1/chat/event-content-helpers/get-observation-content.ts
rename to src/components/conversation-events/chat/event-content-helpers/get-observation-content.ts
index 082cef7d74..8c30a3bed8 100644
--- a/src/components/v1/chat/event-content-helpers/get-observation-content.ts
+++ b/src/components/conversation-events/chat/event-content-helpers/get-observation-content.ts
@@ -1,4 +1,4 @@
-import { ObservationEvent } from "#/types/v1/core";
+import { ObservationEvent } from "#/types/agent-server/core";
import { getObservationResult } from "./get-observation-result";
import { getDefaultEventContent, MAX_CONTENT_LENGTH } from "./shared";
import i18n from "#/i18n";
@@ -14,7 +14,7 @@ import {
TaskTrackerObservation,
GlobObservation,
GrepObservation,
-} from "#/types/v1/core/base/observation";
+} from "#/types/agent-server/core/base/observation";
// File Editor Observations
const getFileEditorObservationContent = (
diff --git a/src/components/v1/chat/event-content-helpers/get-observation-result.ts b/src/components/conversation-events/chat/event-content-helpers/get-observation-result.ts
similarity index 92%
rename from src/components/v1/chat/event-content-helpers/get-observation-result.ts
rename to src/components/conversation-events/chat/event-content-helpers/get-observation-result.ts
index 8bf3bda325..41f229d68b 100644
--- a/src/components/v1/chat/event-content-helpers/get-observation-result.ts
+++ b/src/components/conversation-events/chat/event-content-helpers/get-observation-result.ts
@@ -1,5 +1,5 @@
-import { ObservationEvent } from "#/types/v1/core";
-import { ACPToolCallEvent } from "#/types/v1/core/events/acp-tool-call-event";
+import { ObservationEvent } from "#/types/agent-server/core";
+import { ACPToolCallEvent } from "#/types/agent-server/core/events/acp-tool-call-event";
export type ObservationResultStatus = "success" | "error" | "timeout";
diff --git a/src/components/v1/chat/event-content-helpers/get-skill-ready-content.ts b/src/components/conversation-events/chat/event-content-helpers/get-skill-ready-content.ts
similarity index 98%
rename from src/components/v1/chat/event-content-helpers/get-skill-ready-content.ts
rename to src/components/conversation-events/chat/event-content-helpers/get-skill-ready-content.ts
index 6cbe62afed..021eed2a85 100644
--- a/src/components/v1/chat/event-content-helpers/get-skill-ready-content.ts
+++ b/src/components/conversation-events/chat/event-content-helpers/get-skill-ready-content.ts
@@ -1,4 +1,4 @@
-import { TextContent } from "#/types/v1/core/base/common";
+import { TextContent } from "#/types/agent-server/core/base/common";
/**
* Represents a single activated skill with its name and associated content.
diff --git a/src/components/v1/chat/event-content-helpers/parse-message-from-event.ts b/src/components/conversation-events/chat/event-content-helpers/parse-message-from-event.ts
similarity index 95%
rename from src/components/v1/chat/event-content-helpers/parse-message-from-event.ts
rename to src/components/conversation-events/chat/event-content-helpers/parse-message-from-event.ts
index 8e2a0cb253..645dbb21fd 100644
--- a/src/components/v1/chat/event-content-helpers/parse-message-from-event.ts
+++ b/src/components/conversation-events/chat/event-content-helpers/parse-message-from-event.ts
@@ -1,4 +1,4 @@
-import { MessageEvent } from "#/types/v1/core";
+import { MessageEvent } from "#/types/agent-server/core";
import i18n from "#/i18n";
export const parseMessageFromEvent = (event: MessageEvent): string => {
diff --git a/src/components/v1/chat/event-content-helpers/shared.ts b/src/components/conversation-events/chat/event-content-helpers/shared.ts
similarity index 74%
rename from src/components/v1/chat/event-content-helpers/shared.ts
rename to src/components/conversation-events/chat/event-content-helpers/shared.ts
index 717de7a391..0ea19b4886 100644
--- a/src/components/v1/chat/event-content-helpers/shared.ts
+++ b/src/components/conversation-events/chat/event-content-helpers/shared.ts
@@ -1,4 +1,4 @@
-import { OpenHandsEvent } from "#/types/v1/core";
+import { OpenHandsEvent } from "#/types/agent-server/core";
export const MAX_CONTENT_LENGTH = 1000;
diff --git a/src/components/v1/chat/event-content-helpers/should-render-event.ts b/src/components/conversation-events/chat/event-content-helpers/should-render-event.ts
similarity index 94%
rename from src/components/v1/chat/event-content-helpers/should-render-event.ts
rename to src/components/conversation-events/chat/event-content-helpers/should-render-event.ts
index 5cf1c6fd8c..f9ad865915 100644
--- a/src/components/v1/chat/event-content-helpers/should-render-event.ts
+++ b/src/components/conversation-events/chat/event-content-helpers/should-render-event.ts
@@ -1,4 +1,4 @@
-import { OpenHandsEvent } from "#/types/v1/core";
+import { OpenHandsEvent } from "#/types/agent-server/core";
import {
isActionEvent,
isObservationEvent,
@@ -7,7 +7,7 @@ import {
isConversationStateUpdateEvent,
isHookExecutionEvent,
isACPToolCallEvent,
-} from "#/types/v1/type-guards";
+} from "#/types/agent-server/type-guards";
export const shouldRenderEvent = (event: OpenHandsEvent) => {
// Explicitly exclude system events that should not be rendered in chat
diff --git a/src/components/v1/chat/event-message-components/error-event-message.tsx b/src/components/conversation-events/chat/event-message-components/error-event-message.tsx
similarity index 73%
rename from src/components/v1/chat/event-message-components/error-event-message.tsx
rename to src/components/conversation-events/chat/event-message-components/error-event-message.tsx
index c400b43f61..1b26c39c88 100644
--- a/src/components/v1/chat/event-message-components/error-event-message.tsx
+++ b/src/components/conversation-events/chat/event-message-components/error-event-message.tsx
@@ -1,6 +1,6 @@
import React from "react";
-import { AgentErrorEvent } from "#/types/v1/core";
-import { isAgentErrorEvent } from "#/types/v1/type-guards";
+import { AgentErrorEvent } from "#/types/agent-server/core";
+import { isAgentErrorEvent } from "#/types/agent-server/type-guards";
import { ErrorMessage } from "../../../features/chat/error-message";
interface ErrorEventMessageProps {
diff --git a/src/components/v1/chat/event-message-components/event-group.tsx b/src/components/conversation-events/chat/event-message-components/event-group.tsx
similarity index 95%
rename from src/components/v1/chat/event-message-components/event-group.tsx
rename to src/components/conversation-events/chat/event-message-components/event-group.tsx
index 4e42b32058..fc76b53873 100644
--- a/src/components/v1/chat/event-message-components/event-group.tsx
+++ b/src/components/conversation-events/chat/event-message-components/event-group.tsx
@@ -2,8 +2,8 @@ import React from "react";
import { useTranslation } from "react-i18next";
import ArrowDown from "#/icons/angle-down-solid.svg?react";
import ArrowUp from "#/icons/angle-up-solid.svg?react";
-import { OpenHandsEvent, ActionEvent } from "#/types/v1/core";
-import { isActionEvent, isObservationEvent } from "#/types/v1/type-guards";
+import { OpenHandsEvent, ActionEvent } from "#/types/agent-server/core";
+import { isActionEvent, isObservationEvent } from "#/types/agent-server/type-guards";
import { I18nKey } from "#/i18n/declaration";
import { SuccessIndicator } from "../../../features/chat/success-indicator";
import { getEventContent } from "../event-content-helpers/get-event-content";
diff --git a/src/components/v1/chat/event-message-components/finish-event-message.tsx b/src/components/conversation-events/chat/event-message-components/finish-event-message.tsx
similarity index 84%
rename from src/components/v1/chat/event-message-components/finish-event-message.tsx
rename to src/components/conversation-events/chat/event-message-components/finish-event-message.tsx
index 8950876054..40bed72e99 100644
--- a/src/components/v1/chat/event-message-components/finish-event-message.tsx
+++ b/src/components/conversation-events/chat/event-message-components/finish-event-message.tsx
@@ -1,5 +1,5 @@
-import { ActionEvent } from "#/types/v1/core";
-import { FinishAction } from "#/types/v1/core/base/action";
+import { ActionEvent } from "#/types/agent-server/core";
+import { FinishAction } from "#/types/agent-server/core/base/action";
import { ChatMessage } from "../../../features/chat/chat-message";
import { getEventContent } from "../event-content-helpers/get-event-content";
diff --git a/src/components/v1/chat/event-message-components/generic-event-message-wrapper.tsx b/src/components/conversation-events/chat/event-message-components/generic-event-message-wrapper.tsx
similarity index 83%
rename from src/components/v1/chat/event-message-components/generic-event-message-wrapper.tsx
rename to src/components/conversation-events/chat/event-message-components/generic-event-message-wrapper.tsx
index 8bb997a35c..bbdbceefdf 100644
--- a/src/components/v1/chat/event-message-components/generic-event-message-wrapper.tsx
+++ b/src/components/conversation-events/chat/event-message-components/generic-event-message-wrapper.tsx
@@ -1,17 +1,17 @@
-import { OpenHandsEvent, ActionEvent } from "#/types/v1/core";
+import { OpenHandsEvent, ActionEvent } from "#/types/agent-server/core";
import { GenericEventMessage } from "../../../features/chat/generic-event-message";
import { getEventContent } from "../event-content-helpers/get-event-content";
import {
getACPToolCallResult,
getObservationResult,
} from "../event-content-helpers/get-observation-result";
-import { isACPToolCallEvent, isObservationEvent } from "#/types/v1/type-guards";
+import { isACPToolCallEvent, isObservationEvent } from "#/types/agent-server/type-guards";
import {
SkillReadyEvent,
isSkillReadyEvent,
} from "../event-content-helpers/create-skill-ready-event";
-import { V1ConfirmationButtons } from "#/components/shared/buttons/v1-confirmation-buttons";
-import { ObservationResultStatus } from "../../../features/chat/event-content-helpers/get-observation-result";
+import { ConversationConfirmationButtons } from "#/components/shared/buttons/conversation-confirmation-buttons";
+import { ObservationResultStatus } from "../event-content-helpers/get-observation-result";
import { SkillReadyContentList } from "./skill-ready-content-list";
interface GenericEventMessageWrapperProps {
@@ -62,7 +62,7 @@ export function GenericEventMessageWrapper({
success={success}
initiallyExpanded={false}
/>
- {isLastMessage && <V1ConfirmationButtons />}
+ {isLastMessage && <ConversationConfirmationButtons />}
</div>
);
}
diff --git a/src/components/features/chat/event-message-components/hook-execution-event-message.tsx b/src/components/conversation-events/chat/event-message-components/hook-execution-event-message.tsx
similarity index 100%
rename from src/components/features/chat/event-message-components/hook-execution-event-message.tsx
rename to src/components/conversation-events/chat/event-message-components/hook-execution-event-message.tsx
diff --git a/src/components/v1/chat/event-message-components/index.ts b/src/components/conversation-events/chat/event-message-components/index.ts
similarity index 100%
rename from src/components/v1/chat/event-message-components/index.ts
rename to src/components/conversation-events/chat/event-message-components/index.ts
diff --git a/src/components/v1/chat/event-message-components/observation-pair-event-message.tsx b/src/components/conversation-events/chat/event-message-components/observation-pair-event-message.tsx
similarity index 86%
rename from src/components/v1/chat/event-message-components/observation-pair-event-message.tsx
rename to src/components/conversation-events/chat/event-message-components/observation-pair-event-message.tsx
index 83eea75d30..5f8a0eada5 100644
--- a/src/components/v1/chat/event-message-components/observation-pair-event-message.tsx
+++ b/src/components/conversation-events/chat/event-message-components/observation-pair-event-message.tsx
@@ -1,6 +1,6 @@
import React from "react";
-import { ActionEvent } from "#/types/v1/core";
-import { isActionEvent } from "#/types/v1/type-guards";
+import { ActionEvent } from "#/types/agent-server/core";
+import { isActionEvent } from "#/types/agent-server/type-guards";
import { ChatMessage } from "../../../features/chat/chat-message";
interface ObservationPairEventMessageProps {
diff --git a/src/components/v1/chat/event-message-components/skill-item-expanded.tsx b/src/components/conversation-events/chat/event-message-components/skill-item-expanded.tsx
similarity index 100%
rename from src/components/v1/chat/event-message-components/skill-item-expanded.tsx
rename to src/components/conversation-events/chat/event-message-components/skill-item-expanded.tsx
diff --git a/src/components/v1/chat/event-message-components/skill-ready-content-list.tsx b/src/components/conversation-events/chat/event-message-components/skill-ready-content-list.tsx
similarity index 100%
rename from src/components/v1/chat/event-message-components/skill-ready-content-list.tsx
rename to src/components/conversation-events/chat/event-message-components/skill-ready-content-list.tsx
diff --git a/src/components/v1/chat/event-message-components/thought-event-message.tsx b/src/components/conversation-events/chat/event-message-components/thought-event-message.tsx
similarity index 93%
rename from src/components/v1/chat/event-message-components/thought-event-message.tsx
rename to src/components/conversation-events/chat/event-message-components/thought-event-message.tsx
index 24f4a55c67..25c6110a7a 100644
--- a/src/components/v1/chat/event-message-components/thought-event-message.tsx
+++ b/src/components/conversation-events/chat/event-message-components/thought-event-message.tsx
@@ -1,5 +1,5 @@
import React from "react";
-import { ActionEvent } from "#/types/v1/core";
+import { ActionEvent } from "#/types/agent-server/core";
import { ChatMessage } from "../../../features/chat/chat-message";
interface ThoughtEventMessageProps {
diff --git a/src/components/v1/chat/event-message-components/user-assistant-event-message.tsx b/src/components/conversation-events/chat/event-message-components/user-assistant-event-message.tsx
similarity index 82%
rename from src/components/v1/chat/event-message-components/user-assistant-event-message.tsx
rename to src/components/conversation-events/chat/event-message-components/user-assistant-event-message.tsx
index cf60af0143..5727ddc513 100644
--- a/src/components/v1/chat/event-message-components/user-assistant-event-message.tsx
+++ b/src/components/conversation-events/chat/event-message-components/user-assistant-event-message.tsx
@@ -1,8 +1,8 @@
import React from "react";
-import { MessageEvent } from "#/types/v1/core";
+import { MessageEvent } from "#/types/agent-server/core";
import { ChatMessage } from "../../../features/chat/chat-message";
import { ImageCarousel } from "../../../features/images/image-carousel";
-import { V1ConfirmationButtons } from "#/components/shared/buttons/v1-confirmation-buttons";
+import { ConversationConfirmationButtons } from "#/components/shared/buttons/conversation-confirmation-buttons";
import { parseMessageFromEvent } from "../event-content-helpers/parse-message-from-event";
interface UserAssistantEventMessageProps {
@@ -36,7 +36,7 @@ export function UserAssistantEventMessage({
{imageUrls.length > 0 && (
<ImageCarousel size="small" images={imageUrls} />
)}
- {isLastMessage && <V1ConfirmationButtons />}
+ {isLastMessage && <ConversationConfirmationButtons />}
</ChatMessage>
);
}
diff --git a/src/components/v1/chat/event-message.tsx b/src/components/conversation-events/chat/event-message.tsx
similarity index 98%
rename from src/components/v1/chat/event-message.tsx
rename to src/components/conversation-events/chat/event-message.tsx
index 146a4d1145..94130d351d 100644
--- a/src/components/v1/chat/event-message.tsx
+++ b/src/components/conversation-events/chat/event-message.tsx
@@ -1,6 +1,6 @@
import React from "react";
-import { OpenHandsEvent, MessageEvent, ActionEvent } from "#/types/v1/core";
-import { FinishAction, ThinkAction } from "#/types/v1/core/base/action";
+import { OpenHandsEvent, MessageEvent, ActionEvent } from "#/types/agent-server/core";
+import { FinishAction, ThinkAction } from "#/types/agent-server/core/base/action";
import {
isActionEvent,
isObservationEvent,
@@ -9,7 +9,7 @@ import {
isPlanningFileEditorObservationEvent,
isHookExecutionEvent,
isACPToolCallEvent,
-} from "#/types/v1/type-guards";
+} from "#/types/agent-server/type-guards";
import { useConfig } from "#/hooks/query/use-config";
import { useConversationStore } from "#/stores/conversation-store";
import { useAgentState } from "#/hooks/use-agent-state";
diff --git a/src/components/v1/chat/event-thought-helpers.ts b/src/components/conversation-events/chat/event-thought-helpers.ts
similarity index 90%
rename from src/components/v1/chat/event-thought-helpers.ts
rename to src/components/conversation-events/chat/event-thought-helpers.ts
index afdb03b6cf..807f55792d 100644
--- a/src/components/v1/chat/event-thought-helpers.ts
+++ b/src/components/conversation-events/chat/event-thought-helpers.ts
@@ -1,5 +1,5 @@
-import { ActionEvent, OpenHandsEvent } from "#/types/v1/core";
-import { isActionEvent, isObservationEvent } from "#/types/v1/type-guards";
+import { ActionEvent, OpenHandsEvent } from "#/types/agent-server/core";
+import { isActionEvent, isObservationEvent } from "#/types/agent-server/type-guards";
/**
* Returns the displayable thought text of an `ActionEvent`, or an empty
diff --git a/src/components/v1/chat/group-events.ts b/src/components/conversation-events/chat/group-events.ts
similarity index 96%
rename from src/components/v1/chat/group-events.ts
rename to src/components/conversation-events/chat/group-events.ts
index 842166244b..2118875923 100644
--- a/src/components/v1/chat/group-events.ts
+++ b/src/components/conversation-events/chat/group-events.ts
@@ -1,9 +1,9 @@
-import { ActionEvent, OpenHandsEvent } from "#/types/v1/core";
+import { ActionEvent, OpenHandsEvent } from "#/types/agent-server/core";
import {
isActionEvent,
isObservationEvent,
isPlanningFileEditorObservationEvent,
-} from "#/types/v1/type-guards";
+} from "#/types/agent-server/type-guards";
import { getThoughtSourceAction } from "./event-thought-helpers";
/** Minimum run-length before consecutive actions get folded into a single
diff --git a/src/components/v1/chat/hooks/use-plan-preview-events.ts b/src/components/conversation-events/chat/hooks/use-plan-preview-events.ts
similarity index 97%
rename from src/components/v1/chat/hooks/use-plan-preview-events.ts
rename to src/components/conversation-events/chat/hooks/use-plan-preview-events.ts
index 60cee582cd..2c639534e8 100644
--- a/src/components/v1/chat/hooks/use-plan-preview-events.ts
+++ b/src/components/conversation-events/chat/hooks/use-plan-preview-events.ts
@@ -1,9 +1,9 @@
import { useMemo } from "react";
-import { OpenHandsEvent } from "#/types/v1/core";
+import { OpenHandsEvent } from "#/types/agent-server/core";
import {
isUserMessageEvent,
isPlanningFileEditorObservationEvent,
-} from "#/types/v1/type-guards";
+} from "#/types/agent-server/type-guards";
/**
* Groups events into phases based on user messages.
diff --git a/src/components/v1/chat/index.ts b/src/components/conversation-events/chat/index.ts
similarity index 100%
rename from src/components/v1/chat/index.ts
rename to src/components/conversation-events/chat/index.ts
diff --git a/src/components/v1/chat/messages.tsx b/src/components/conversation-events/chat/messages.tsx
similarity index 98%
rename from src/components/v1/chat/messages.tsx
rename to src/components/conversation-events/chat/messages.tsx
index 4d05d828ab..c4ef5871dc 100644
--- a/src/components/v1/chat/messages.tsx
+++ b/src/components/conversation-events/chat/messages.tsx
@@ -1,5 +1,5 @@
import React from "react";
-import { OpenHandsEvent } from "#/types/v1/core";
+import { OpenHandsEvent } from "#/types/agent-server/core";
import { EventMessage } from "./event-message";
import { ChatMessage } from "../../features/chat/chat-message";
import { useOptimisticUserMessageStore } from "#/stores/optimistic-user-message-store";
diff --git a/src/components/v1/chat/task-tracking/task-item.tsx b/src/components/conversation-events/chat/task-tracking/task-item.tsx
similarity index 95%
rename from src/components/v1/chat/task-tracking/task-item.tsx
rename to src/components/conversation-events/chat/task-tracking/task-item.tsx
index b324e53e12..8c0c70008d 100644
--- a/src/components/v1/chat/task-tracking/task-item.tsx
+++ b/src/components/conversation-events/chat/task-tracking/task-item.tsx
@@ -1,6 +1,6 @@
import { useMemo } from "react";
import { useTranslation } from "react-i18next";
-import { TaskItem as TaskItemType } from "#/types/v1/core/base/common";
+import { TaskItem as TaskItemType } from "#/types/agent-server/core/base/common";
import CircleIcon from "#/icons/u-circle.svg?react";
import CheckCircleIcon from "#/icons/u-check-circle.svg?react";
import CheckCircleHalfIcon from "#/icons/u-check-circle-half.svg?react";
diff --git a/src/components/v1/chat/task-tracking/task-list-section.tsx b/src/components/conversation-events/chat/task-tracking/task-list-section.tsx
similarity index 93%
rename from src/components/v1/chat/task-tracking/task-list-section.tsx
rename to src/components/conversation-events/chat/task-tracking/task-list-section.tsx
index e1ba1d3af3..17287dbf1f 100644
--- a/src/components/v1/chat/task-tracking/task-list-section.tsx
+++ b/src/components/conversation-events/chat/task-tracking/task-list-section.tsx
@@ -1,7 +1,7 @@
import { useTranslation } from "react-i18next";
import { TaskItem } from "./task-item";
import LessonPlanIcon from "#/icons/lesson-plan.svg?react";
-import { TaskItem as TaskItemType } from "#/types/v1/core/base/common";
+import { TaskItem as TaskItemType } from "#/types/agent-server/core/base/common";
import { I18nKey } from "#/i18n/declaration";
import { Typography } from "#/ui/typography";
diff --git a/src/components/v1/chat/task-tracking/task-tracking-observation-content.tsx b/src/components/conversation-events/chat/task-tracking/task-tracking-observation-content.tsx
similarity index 81%
rename from src/components/v1/chat/task-tracking/task-tracking-observation-content.tsx
rename to src/components/conversation-events/chat/task-tracking/task-tracking-observation-content.tsx
index 167429cae8..a1f7f85ae8 100644
--- a/src/components/v1/chat/task-tracking/task-tracking-observation-content.tsx
+++ b/src/components/conversation-events/chat/task-tracking/task-tracking-observation-content.tsx
@@ -1,6 +1,6 @@
import React from "react";
-import { ObservationEvent } from "#/types/v1/core";
-import { TaskTrackerObservation } from "#/types/v1/core/base/observation";
+import { ObservationEvent } from "#/types/agent-server/core";
+import { TaskTrackerObservation } from "#/types/agent-server/core/base/observation";
import { TaskListSection } from "./task-list-section";
interface TaskTrackingObservationContentProps {
diff --git a/src/components/v1/index.ts b/src/components/conversation-events/index.ts
similarity index 100%
rename from src/components/v1/index.ts
rename to src/components/conversation-events/index.ts
diff --git a/src/components/features/chat/chat-interface.tsx b/src/components/features/chat/chat-interface.tsx
index de329ed175..a38c2d5809 100644
--- a/src/components/features/chat/chat-interface.tsx
+++ b/src/components/features/chat/chat-interface.tsx
@@ -23,7 +23,7 @@ import { displayErrorToast } from "#/utils/custom-toast-handlers";
import { useErrorMessageStore } from "#/stores/error-message-store";
import { useOptimisticUserMessageStore } from "#/stores/optimistic-user-message-store";
import { ErrorMessageBanner } from "./error-message-banner";
-import { Messages as V1Messages } from "#/components/v1/chat";
+import { Messages as Messages } from "#/components/conversation-events/chat";
import { useUnifiedUploadFiles } from "#/hooks/mutation/use-unified-upload-files";
import { validateFiles } from "#/utils/file-validation";
import { useConversationStore } from "#/stores/conversation-store";
@@ -53,12 +53,11 @@ export function ChatInterface() {
const conversationWebSocket = useConversationWebSocket();
const { send } = useSendMessage();
const {
- v0Events,
- v1UiEvents,
- v1FullEvents,
+ renderableEvents,
+ allConversationEvents,
totalEvents,
hasSubstantiveAgentActions,
- v1UserEventsExist,
+ conversationUserEventsExist,
userEventsExist,
} = useFilteredEvents();
const { setOptimisticUserMessage, getOptimisticUserMessage } =
@@ -121,13 +120,13 @@ export function ChatInterface() {
// or once loading completes. This replaces the old transition-observation
// pattern (useState + useEffect watching loading→loaded) which always showed
// skeleton on remount because local state initialized to false.
- const showV1Messages =
- v1FullEvents.length > 0 || !conversationWebSocket?.isLoadingHistory;
+ const showConversationMessages =
+ allConversationEvents.length > 0 || !conversationWebSocket?.isLoadingHistory;
const isReturningToConversation = !!conversationId;
// Only show loading skeleton when genuinely loading AND no events in store yet.
// If events exist (e.g., remount after data was already fetched), skip skeleton.
- const isHistoryLoading = !showV1Messages;
+ const isHistoryLoading = !showConversationMessages;
const isChatLoading = isHistoryLoading && !isTask;
const handleSendMessage = async (
@@ -215,12 +214,7 @@ export function ChatInterface() {
// Note: We intentionally exclude autoScroll from deps because we only want
// to scroll when message content changes, not when autoScroll state changes.
// eslint-disable-next-line react-hooks/exhaustive-deps
- }, [
- v1UiEvents.length,
- v0Events.length,
- optimisticUserMessage,
- scrollDomToBottom,
- ]);
+ }, [renderableEvents.length, optimisticUserMessage, scrollDomToBottom]);
// Create a ScrollProvider with the scroll hook values
const scrollProviderValue = {
@@ -286,8 +280,8 @@ export function ChatInterface() {
</div>
)}
- {showV1Messages && v1UserEventsExist && (
- <V1Messages messages={v1UiEvents} allEvents={v1FullEvents} />
+ {showConversationMessages && conversationUserEventsExist && (
+ <Messages messages={renderableEvents} allEvents={allConversationEvents} />
)}
</div>
diff --git a/src/components/features/chat/chat-message.tsx b/src/components/features/chat/chat-message.tsx
index f4956925be..fc993e769a 100644
--- a/src/components/features/chat/chat-message.tsx
+++ b/src/components/features/chat/chat-message.tsx
@@ -1,12 +1,12 @@
import React from "react";
import { cn } from "#/utils/utils";
import { CopyToClipboardButton } from "#/components/shared/buttons/copy-to-clipboard-button";
-import { OpenHandsSourceType } from "#/types/core/base";
+import type { SourceType } from "#/types/agent-server/core/base/common";
import { StyledTooltip } from "#/components/shared/buttons/styled-tooltip";
import { MarkdownRenderer } from "../markdown/markdown-renderer";
interface ChatMessageProps {
- type: OpenHandsSourceType;
+ type: SourceType;
message: string;
actions?: Array<{
icon: React.ReactNode;
diff --git a/src/components/features/chat/components/chat-input-actions.tsx b/src/components/features/chat/components/chat-input-actions.tsx
index 2739ed6743..3323742b27 100644
--- a/src/components/features/chat/components/chat-input-actions.tsx
+++ b/src/components/features/chat/components/chat-input-actions.tsx
@@ -3,8 +3,8 @@ import { Tools } from "../../controls/tools";
import { ChangeAgentButton } from "../change-agent-button";
import { useUnifiedPauseConversation } from "#/hooks/mutation/use-unified-stop-conversation";
import { useConversationId } from "#/hooks/use-conversation-id";
-import { useV1PauseConversation } from "#/hooks/mutation/use-v1-pause-conversation";
-import { useV1ResumeConversation } from "#/hooks/mutation/use-v1-resume-conversation";
+import { usePauseConversation } from "#/hooks/mutation/use-pause-conversation";
+import { useResumeConversation } from "#/hooks/mutation/use-resume-conversation";
import { useActiveBackend } from "#/contexts/active-backend-context";
interface ChatInputActionsProps {
@@ -12,25 +12,24 @@ interface ChatInputActionsProps {
}
export function ChatInputActions({ disabled }: ChatInputActionsProps) {
- const pauseConversationMutation = useUnifiedPauseConversation();
- const v1PauseConversationMutation = useV1PauseConversation();
- const v1ResumeConversationMutation = useV1ResumeConversation();
+ const unifiedPauseMutation = useUnifiedPauseConversation();
+ const pauseConversationMutation = usePauseConversation();
+ const resumeConversationMutation = useResumeConversation();
const { conversationId } = useConversationId();
const isCloud = useActiveBackend().backend.kind === "cloud";
const handlePauseAgent = () => {
- // V1: Pause the conversation (agent execution)
- v1PauseConversationMutation.mutate({ conversationId });
+ // Pause the conversation (agent execution)
+ pauseConversationMutation.mutate({ conversationId });
};
const handleResumeAgentClick = () => {
- // V1: Resume the conversation (agent execution)
- v1ResumeConversationMutation.mutate({ conversationId });
+ // Resume the conversation (agent execution)
+ resumeConversationMutation.mutate({ conversationId });
};
const isPausing =
- pauseConversationMutation.isPending ||
- v1PauseConversationMutation.isPending;
+ unifiedPauseMutation.isPending || pauseConversationMutation.isPending;
return (
<div className="w-full flex items-center justify-between">
diff --git a/src/components/features/chat/event-content-helpers/get-action-content.ts b/src/components/features/chat/event-content-helpers/get-action-content.ts
deleted file mode 100644
index a04be2c385..0000000000
--- a/src/components/features/chat/event-content-helpers/get-action-content.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-import { ActionSecurityRisk } from "#/stores/security-analyzer-store";
-import {
- FileWriteAction,
- CommandAction,
- IPythonAction,
- BrowseAction,
- BrowseInteractiveAction,
- MCPAction,
- ThinkAction,
- OpenHandsAction,
- FinishAction,
- TaskTrackingAction,
-} from "#/types/core/actions";
-import { getDefaultEventContent, MAX_CONTENT_LENGTH } from "./shared";
-import i18n from "#/i18n";
-
-const getRiskText = (risk: ActionSecurityRisk) => {
- switch (risk) {
- case ActionSecurityRisk.LOW:
- return i18n.t("SECURITY$LOW_RISK");
- case ActionSecurityRisk.MEDIUM:
- return i18n.t("SECURITY$MEDIUM_RISK");
- case ActionSecurityRisk.HIGH:
- return i18n.t("SECURITY$HIGH_RISK");
- case ActionSecurityRisk.UNKNOWN:
- default:
- return i18n.t("SECURITY$UNKNOWN_RISK");
- }
-};
-
-const getWriteActionContent = (event: FileWriteAction): string => {
- let { content } = event.args;
- if (content.length > MAX_CONTENT_LENGTH) {
- content = `${event.args.content.slice(0, MAX_CONTENT_LENGTH)}...`;
- }
- return `${event.args.path}\n${content}`;
-};
-
-const getRunActionContent = (event: CommandAction): string => {
- let content = `Command:\n\`${event.args.command}\``;
-
- if (event.args.confirmation_state === "awaiting_confirmation") {
- content += `\n\n${getRiskText(event.args.security_risk)}`;
- }
-
- return content;
-};
-
-const getIPythonActionContent = (event: IPythonAction): string => {
- let content = `\`\`\`\n${event.args.code}\n\`\`\``;
-
- if (event.args.confirmation_state === "awaiting_confirmation") {
- content += `\n\n${getRiskText(event.args.security_risk)}`;
- }
-
- return content;
-};
-
-const getBrowseActionContent = (event: BrowseAction): string =>
- `Browsing ${event.args.url}`;
-
-const getBrowseInteractiveActionContent = (event: BrowseInteractiveAction) =>
- `**Action:**\n\n\`\`\`python\n${event.args.browser_actions}\n\`\`\``;
-
-const getMcpActionContent = (event: MCPAction): string => {
- // Format MCP action with name and arguments
- const name = event.args.name || "";
- const args = event.args.arguments || {};
- let details = `**MCP Tool Call:** ${name}\n\n`;
- // Include thought if available
- if (event.args.thought) {
- details += `\n\n**Thought:**\n${event.args.thought}`;
- }
- details += `\n\n**Arguments:**\n\`\`\`json\n${JSON.stringify(args, null, 2)}\n\`\`\``;
- return details;
-};
-
-const getThinkActionContent = (event: ThinkAction): string =>
- event.args.thought;
-
-const getFinishActionContent = (event: FinishAction): string =>
- event.args.final_thought.trim();
-
-const getTaskTrackingActionContent = (event: TaskTrackingAction): string => {
- let content = `**Command:** \`${event.args.command}\``;
-
- if (
- event.args.command === "plan" &&
- event.args.task_list &&
- event.args.task_list.length > 0
- ) {
- content += `\n\n**Task List (${event.args.task_list.length} ${event.args.task_list.length === 1 ? "item" : "items"}):**\n`;
-
- event.args.task_list.forEach((task, index) => {
- const statusIcon =
- {
- todo: "⏳",
- in_progress: "πŸ”„",
- done: "βœ…",
- }[task.status] || "❓";
-
- content += `\n${index + 1}. ${statusIcon} **[${task.status.toUpperCase().replace("_", " ")}]** ${task.title}`;
- content += `\n *ID: ${task.id}*`;
- if (task.notes) {
- content += `\n *Notes: ${task.notes}*`;
- }
- });
- } else if (event.args.command === "plan") {
- content += "\n\n**Task List:** Empty";
- }
-
- return content;
-};
-
-const getNoContentActionContent = (): string => "";
-
-export const getActionContent = (event: OpenHandsAction): string => {
- switch (event.action) {
- case "read":
- case "edit":
- return getNoContentActionContent();
- case "write":
- return getWriteActionContent(event);
- case "run":
- return getRunActionContent(event);
- case "run_ipython":
- return getIPythonActionContent(event);
- case "browse":
- return getBrowseActionContent(event);
- case "browse_interactive":
- return getBrowseInteractiveActionContent(event);
- case "call_tool_mcp":
- return getMcpActionContent(event);
- case "think":
- return getThinkActionContent(event);
- case "finish":
- return getFinishActionContent(event);
- case "task_tracking":
- return getTaskTrackingActionContent(event);
- default:
- return getDefaultEventContent(event);
- }
-};
diff --git a/src/components/features/chat/event-content-helpers/get-event-content.tsx b/src/components/features/chat/event-content-helpers/get-event-content.tsx
deleted file mode 100644
index faaa076ab5..0000000000
--- a/src/components/features/chat/event-content-helpers/get-event-content.tsx
+++ /dev/null
@@ -1,92 +0,0 @@
-import { Trans } from "react-i18next";
-import { OpenHandsAction } from "#/types/core/actions";
-import { isOpenHandsAction, isOpenHandsObservation } from "#/types/core/guards";
-import { OpenHandsObservation } from "#/types/core/observations";
-import { MonoComponent } from "../mono-component";
-import { PathComponent } from "../path-component";
-import { getActionContent } from "./get-action-content";
-import { getObservationContent } from "./get-observation-content";
-import i18n from "#/i18n";
-
-const hasPathProperty = (
- obj: Record<string, unknown>,
-): obj is { path: string } => typeof obj.path === "string";
-
-const hasCommandProperty = (
- obj: Record<string, unknown>,
-): obj is { command: string } => typeof obj.command === "string";
-
-const trimText = (text: string, maxLength: number): string => {
- if (!text) return "";
- return text.length > maxLength ? `${text.substring(0, maxLength)}...` : text;
-};
-
-export const getEventContent = (
- event: OpenHandsAction | OpenHandsObservation,
-) => {
- let title: React.ReactNode = "";
- let details: string = "";
-
- if (isOpenHandsAction(event)) {
- const actionKey = `ACTION_MESSAGE$${event.action.toUpperCase()}`;
-
- // If translation key exists, use Trans component
- if (i18n.exists(actionKey)) {
- title = (
- <Trans
- ns="openhands"
- i18nKey={actionKey}
- values={{
- path: hasPathProperty(event.args) && event.args.path,
- command:
- hasCommandProperty(event.args) &&
- trimText(event.args.command, 80),
- mcp_tool_name: event.action === "call_tool_mcp" && event.args.name,
- }}
- components={{
- path: <PathComponent />,
- cmd: <MonoComponent />,
- }}
- />
- );
- } else {
- // For generic actions, just use the uppercase type
- title = event.action.toUpperCase();
- }
- details = getActionContent(event);
- }
-
- if (isOpenHandsObservation(event)) {
- const observationKey = `OBSERVATION_MESSAGE$${event.observation.toUpperCase()}`;
-
- // If translation key exists, use Trans component
- if (i18n.exists(observationKey)) {
- title = (
- <Trans
- ns="openhands"
- i18nKey={observationKey}
- values={{
- path: hasPathProperty(event.extras) && event.extras.path,
- command:
- hasCommandProperty(event.extras) &&
- trimText(event.extras.command, 80),
- mcp_tool_name: event.observation === "mcp" && event.extras.name,
- }}
- components={{
- path: <PathComponent />,
- cmd: <MonoComponent />,
- }}
- />
- );
- } else {
- // For generic observations, just use the uppercase type
- title = event.observation.toUpperCase();
- }
- details = getObservationContent(event);
- }
-
- return {
- title: title ?? i18n.t("EVENT$UNKNOWN_EVENT"),
- details,
- };
-};
diff --git a/src/components/features/chat/event-content-helpers/get-observation-content.ts b/src/components/features/chat/event-content-helpers/get-observation-content.ts
deleted file mode 100644
index 11276a4e39..0000000000
--- a/src/components/features/chat/event-content-helpers/get-observation-content.ts
+++ /dev/null
@@ -1,171 +0,0 @@
-import {
- ReadObservation,
- CommandObservation,
- IPythonObservation,
- EditObservation,
- BrowseObservation,
- OpenHandsObservation,
- RecallObservation,
- TaskTrackingObservation,
-} from "#/types/core/observations";
-import { getObservationResult } from "./get-observation-result";
-import { getDefaultEventContent, MAX_CONTENT_LENGTH } from "./shared";
-import i18n from "#/i18n";
-
-const getReadObservationContent = (event: ReadObservation): string =>
- `\`\`\`\n${event.content}\n\`\`\``;
-
-const getCommandObservationContent = (
- event: CommandObservation | IPythonObservation,
-): string => {
- let { content } = event;
- if (content.length > MAX_CONTENT_LENGTH) {
- content = `${content.slice(0, MAX_CONTENT_LENGTH)}...`;
- }
-
- const command = event.observation === "run" ? event.extras.command : null;
-
- if (command) {
- return `Command:\n\`\`\`sh\n${command}\n\`\`\`\n\nOutput:\n\`\`\`sh\n${content.trim() || i18n.t("OBSERVATION$COMMAND_NO_OUTPUT")}\n\`\`\``;
- }
-
- return `Output:\n\`\`\`sh\n${content.trim() || i18n.t("OBSERVATION$COMMAND_NO_OUTPUT")}\n\`\`\``;
-};
-
-const getEditObservationContent = (
- event: EditObservation,
- successMessage: boolean,
-): string => {
- if (successMessage) {
- return `\`\`\`diff\n${event.extras.diff}\n\`\`\``; // Content is already truncated by the ACI
- }
- return event.content;
-};
-
-const getBrowseObservationContent = (event: BrowseObservation) => {
- let contentDetails = `**URL:** ${event.extras.url}\n`;
- if (event.extras.error) {
- contentDetails += `\n\n**Error:**\n${event.extras.error}\n`;
- }
- contentDetails += `\n\n**Output:**\n${event.content}`;
- if (contentDetails.length > MAX_CONTENT_LENGTH) {
- contentDetails = `${contentDetails.slice(0, MAX_CONTENT_LENGTH)}...(truncated)`;
- }
- return contentDetails;
-};
-
-const getRecallObservationContent = (event: RecallObservation): string => {
- let content = "";
-
- if (event.extras.recall_type === "workspace_context") {
- if (event.extras.repo_name) {
- content += `\n\n**Repository:** ${event.extras.repo_name}`;
- }
- if (event.extras.repo_directory) {
- content += `\n\n**Directory:** ${event.extras.repo_directory}`;
- }
- if (event.extras.date) {
- content += `\n\n**Date:** ${event.extras.date}`;
- }
- if (
- event.extras.runtime_hosts &&
- Object.keys(event.extras.runtime_hosts).length > 0
- ) {
- content += `\n\n**Available Hosts**`;
- for (const [host, port] of Object.entries(event.extras.runtime_hosts)) {
- content += `\n\n- ${host} (port ${port})`;
- }
- }
- if (event.extras.repo_instructions) {
- content += `\n\n**Repository Instructions:**\n\n${event.extras.repo_instructions}`;
- }
- if (event.extras.conversation_instructions) {
- content += `\n\n**Conversation Instructions:**\n\n${event.extras.conversation_instructions}`;
- }
- if (event.extras.additional_agent_instructions) {
- content += `\n\n**Additional Instructions:**\n\n${event.extras.additional_agent_instructions}`;
- }
- }
-
- // Handle microagent knowledge
- if (
- event.extras.microagent_knowledge &&
- event.extras.microagent_knowledge.length > 0
- ) {
- content += `\n\n**Triggered Microagent Knowledge:**`;
- for (const knowledge of event.extras.microagent_knowledge) {
- content += `\n\n- **${knowledge.name}** (triggered by keyword: ${knowledge.trigger})\n\n${knowledge.content}`;
- }
- }
-
- if (
- event.extras.custom_secrets_descriptions &&
- Object.keys(event.extras.custom_secrets_descriptions).length > 0
- ) {
- content += `\n\n**Custom Secrets**`;
- for (const [name, description] of Object.entries(
- event.extras.custom_secrets_descriptions,
- )) {
- content += `\n\n- $${name}: ${description}`;
- }
- }
-
- return content;
-};
-
-const getTaskTrackingObservationContent = (
- event: TaskTrackingObservation,
-): string => {
- const { command, task_list: taskList } = event.extras;
- let content = `**Command:** \`${command}\``;
-
- if (command === "plan" && taskList.length > 0) {
- content += `\n\n**Task List (${taskList.length} ${taskList.length === 1 ? "item" : "items"}):**\n`;
-
- taskList.forEach((task, index) => {
- const statusIcon =
- {
- todo: "⏳",
- in_progress: "πŸ”„",
- done: "βœ…",
- }[task.status] || "❓";
-
- content += `\n${index + 1}. ${statusIcon} **[${task.status.toUpperCase().replace("_", " ")}]** ${task.title}`;
- content += `\n *ID: ${task.id}*`;
- if (task.notes) {
- content += `\n *Notes: ${task.notes}*`;
- }
- });
- } else if (command === "plan") {
- content += "\n\n**Task List:** Empty";
- }
-
- if (event.content?.trim()) {
- content += `\n\n**Result:** ${event.content.trim()}`;
- }
-
- return content;
-};
-
-export const getObservationContent = (event: OpenHandsObservation): string => {
- switch (event.observation) {
- case "read":
- return getReadObservationContent(event);
- case "edit":
- return getEditObservationContent(
- event,
- getObservationResult(event) === "success",
- );
- case "run_ipython":
- case "run":
- return getCommandObservationContent(event);
- case "browse":
- return getBrowseObservationContent(event);
- case "recall":
- return getRecallObservationContent(event);
- case "task_tracking":
- return getTaskTrackingObservationContent(event);
- default:
- return getDefaultEventContent(event);
- }
-};
diff --git a/src/components/features/chat/event-content-helpers/get-observation-result.ts b/src/components/features/chat/event-content-helpers/get-observation-result.ts
deleted file mode 100644
index fbbceb58fa..0000000000
--- a/src/components/features/chat/event-content-helpers/get-observation-result.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { OpenHandsObservation } from "#/types/core/observations";
-
-export type ObservationResultStatus = "success" | "error" | "timeout";
-
-export const getObservationResult = (event: OpenHandsObservation) => {
- const hasContent = event.content.length > 0;
- const contentIncludesError = event.content.toLowerCase().includes("error:");
-
- switch (event.observation) {
- case "run": {
- const exitCode = event.extras.metadata.exit_code;
-
- if (exitCode === -1) return "timeout"; // Command timed out
- if (exitCode === 0) return "success"; // Command executed successfully
- return "error"; // Command failed
- }
- case "run_ipython":
- case "read":
- case "edit":
- if (!hasContent || contentIncludesError) return "error";
- return "success";
-
- case "mcp":
- try {
- const parsed = JSON.parse(event.content);
- if (typeof parsed?.isError === "boolean") {
- return parsed.isError ? "error" : "success";
- }
- } catch {
- return hasContent ? "success" : "error";
- }
- return hasContent ? "success" : "error";
- default:
- return "success";
- }
-};
diff --git a/src/components/features/chat/event-content-helpers/parse-message-from-event.ts b/src/components/features/chat/event-content-helpers/parse-message-from-event.ts
deleted file mode 100644
index 2a6f288b1c..0000000000
--- a/src/components/features/chat/event-content-helpers/parse-message-from-event.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import {
- AssistantMessageAction,
- UserMessageAction,
-} from "#/types/core/actions";
-import i18n from "#/i18n";
-import { isUserMessage } from "#/types/core/guards";
-
-export const parseMessageFromEvent = (
- event: UserMessageAction | AssistantMessageAction,
-): string => {
- const m = isUserMessage(event) ? event.args.content : event.message;
- if (!event.args.file_urls || event.args.file_urls.length === 0) {
- return m;
- }
- const delimiter = i18n.t("CHAT_INTERFACE$AUGMENTED_PROMPT_FILES_TITLE");
- const parts = m.split(delimiter);
-
- return parts[0];
-};
diff --git a/src/components/features/chat/event-content-helpers/shared.ts b/src/components/features/chat/event-content-helpers/shared.ts
deleted file mode 100644
index 6dbce5b2a7..0000000000
--- a/src/components/features/chat/event-content-helpers/shared.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { OpenHandsAction } from "#/types/core/actions";
-import { OpenHandsObservation } from "#/types/core/observations";
-
-export const MAX_CONTENT_LENGTH = 1000;
-
-export const getDefaultEventContent = (
- event: OpenHandsAction | OpenHandsObservation,
-): string => `\`\`\`json\n${JSON.stringify(event, null, 2)}\n\`\`\``;
diff --git a/src/components/features/chat/event-content-helpers/should-render-event.ts b/src/components/features/chat/event-content-helpers/should-render-event.ts
deleted file mode 100644
index e07dc925b3..0000000000
--- a/src/components/features/chat/event-content-helpers/should-render-event.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { OpenHandsAction } from "#/types/core/actions";
-import { OpenHandsEventType } from "#/types/core/base";
-import {
- isCommandAction,
- isCommandObservation,
- isOpenHandsAction,
- isOpenHandsObservation,
-} from "#/types/core/guards";
-import { OpenHandsObservation } from "#/types/core/observations";
-
-const COMMON_NO_RENDER_LIST: OpenHandsEventType[] = [
- "system",
- "agent_state_changed",
- "change_agent_state",
-];
-
-const ACTION_NO_RENDER_LIST: OpenHandsEventType[] = ["recall"];
-
-const OBSERVATION_NO_RENDER_LIST: OpenHandsEventType[] = ["think"];
-
-export const shouldRenderEvent = (
- event: OpenHandsAction | OpenHandsObservation,
-) => {
- if (isOpenHandsAction(event)) {
- if (isCommandAction(event) && event.source === "user") {
- // For user commands, we always hide them from the chat interface
- return false;
- }
-
- const noRenderList = COMMON_NO_RENDER_LIST.concat(ACTION_NO_RENDER_LIST);
- return !noRenderList.includes(event.action);
- }
-
- if (isOpenHandsObservation(event)) {
- if (isCommandObservation(event) && event.source === "user") {
- // For user commands, we always hide them from the chat interface
- return false;
- }
-
- const noRenderList = COMMON_NO_RENDER_LIST.concat(
- OBSERVATION_NO_RENDER_LIST,
- );
- return !noRenderList.includes(event.observation);
- }
-
- return true;
-};
-
-export const hasUserEvent = (
- events: (OpenHandsAction | OpenHandsObservation)[],
-) =>
- events.some((event) => isOpenHandsAction(event) && event.source === "user");
diff --git a/src/components/features/chat/event-message-components/error-event-message.tsx b/src/components/features/chat/event-message-components/error-event-message.tsx
deleted file mode 100644
index 8f2a7b7368..0000000000
--- a/src/components/features/chat/event-message-components/error-event-message.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { OpenHandsObservation } from "#/types/core/observations";
-import { isErrorObservation } from "#/types/core/guards";
-import { ErrorMessage } from "../error-message";
-
-interface ErrorEventMessageProps {
- event: OpenHandsObservation;
-}
-
-export function ErrorEventMessage({ event }: ErrorEventMessageProps) {
- if (!isErrorObservation(event)) {
- return null;
- }
-
- return (
- <ErrorMessage
- errorId={event.extras.error_id}
- defaultMessage={event.message}
- />
- );
-}
diff --git a/src/components/features/chat/event-message-components/finish-event-message.tsx b/src/components/features/chat/event-message-components/finish-event-message.tsx
deleted file mode 100644
index 2d3eb34944..0000000000
--- a/src/components/features/chat/event-message-components/finish-event-message.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from "react";
-import { OpenHandsAction } from "#/types/core/actions";
-import { isFinishAction } from "#/types/core/guards";
-import { ChatMessage } from "../chat-message";
-import { getEventContent } from "../event-content-helpers/get-event-content";
-
-interface FinishEventMessageProps {
- event: OpenHandsAction;
-}
-
-export function FinishEventMessage({ event }: FinishEventMessageProps) {
- if (!isFinishAction(event)) {
- return null;
- }
-
- return <ChatMessage type="agent" message={getEventContent(event).details} />;
-}
diff --git a/src/components/features/chat/event-message-components/generic-event-message-wrapper.tsx b/src/components/features/chat/event-message-components/generic-event-message-wrapper.tsx
deleted file mode 100644
index 145f73090b..0000000000
--- a/src/components/features/chat/event-message-components/generic-event-message-wrapper.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import React from "react";
-import { OpenHandsAction } from "#/types/core/actions";
-import { OpenHandsObservation } from "#/types/core/observations";
-import { isOpenHandsAction, isOpenHandsObservation } from "#/types/core/guards";
-import { ChatMessage } from "../chat-message";
-import { GenericEventMessage } from "../generic-event-message";
-import { ConfirmationButtons } from "#/components/shared/buttons/confirmation-buttons";
-import { getEventContent } from "../event-content-helpers/get-event-content";
-import { getObservationResult } from "../event-content-helpers/get-observation-result";
-
-const hasThoughtProperty = (
- obj: Record<string, unknown>,
-): obj is { thought: string } => "thought" in obj && !!obj.thought;
-
-interface GenericEventMessageWrapperProps {
- event: OpenHandsAction | OpenHandsObservation;
- shouldShowConfirmationButtons: boolean;
-}
-
-export function GenericEventMessageWrapper({
- event,
- shouldShowConfirmationButtons,
-}: GenericEventMessageWrapperProps) {
- return (
- <div>
- {isOpenHandsAction(event) &&
- hasThoughtProperty(event.args) &&
- event.action !== "think" && (
- <ChatMessage type="agent" message={event.args.thought} />
- )}
-
- <GenericEventMessage
- title={getEventContent(event).title}
- details={getEventContent(event).details}
- success={
- isOpenHandsObservation(event)
- ? getObservationResult(event)
- : undefined
- }
- />
-
- {shouldShowConfirmationButtons && <ConfirmationButtons />}
- </div>
- );
-}
diff --git a/src/components/features/chat/event-message-components/index.ts b/src/components/features/chat/event-message-components/index.ts
deleted file mode 100644
index 1fef6dc50c..0000000000
--- a/src/components/features/chat/event-message-components/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export { ErrorEventMessage } from "./error-event-message";
-export { UserAssistantEventMessage } from "./user-assistant-event-message";
-export { FinishEventMessage } from "./finish-event-message";
-export { RejectEventMessage } from "./reject-event-message";
-export { McpEventMessage } from "./mcp-event-message";
-export { TaskTrackingEventMessage } from "./task-tracking-event-message";
-export { ObservationPairEventMessage } from "./observation-pair-event-message";
-export { GenericEventMessageWrapper } from "./generic-event-message-wrapper";
-export { HookExecutionEventMessage } from "./hook-execution-event-message";
diff --git a/src/components/features/chat/event-message-components/mcp-event-message.tsx b/src/components/features/chat/event-message-components/mcp-event-message.tsx
deleted file mode 100644
index 0793ad17d0..0000000000
--- a/src/components/features/chat/event-message-components/mcp-event-message.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from "react";
-import { OpenHandsObservation } from "#/types/core/observations";
-import { isMcpObservation } from "#/types/core/guards";
-import { GenericEventMessage } from "../generic-event-message";
-import { MCPObservationContent } from "../mcp-observation-content";
-import { ConfirmationButtons } from "#/components/shared/buttons/confirmation-buttons";
-import { getEventContent } from "../event-content-helpers/get-event-content";
-import { getObservationResult } from "../event-content-helpers/get-observation-result";
-
-interface McpEventMessageProps {
- event: OpenHandsObservation;
- shouldShowConfirmationButtons: boolean;
-}
-
-export function McpEventMessage({
- event,
- shouldShowConfirmationButtons,
-}: McpEventMessageProps) {
- if (!isMcpObservation(event)) {
- return null;
- }
-
- return (
- <div>
- <GenericEventMessage
- title={getEventContent(event).title}
- details={<MCPObservationContent event={event} />}
- success={getObservationResult(event)}
- />
- {shouldShowConfirmationButtons && <ConfirmationButtons />}
- </div>
- );
-}
diff --git a/src/components/features/chat/event-message-components/observation-pair-event-message.tsx b/src/components/features/chat/event-message-components/observation-pair-event-message.tsx
deleted file mode 100644
index 709a7d0169..0000000000
--- a/src/components/features/chat/event-message-components/observation-pair-event-message.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from "react";
-import { OpenHandsAction } from "#/types/core/actions";
-import { isOpenHandsAction } from "#/types/core/guards";
-import { ChatMessage } from "../chat-message";
-
-const hasThoughtProperty = (
- obj: Record<string, unknown>,
-): obj is { thought: string } => "thought" in obj && !!obj.thought;
-
-interface ObservationPairEventMessageProps {
- event: OpenHandsAction;
-}
-
-export function ObservationPairEventMessage({
- event,
-}: ObservationPairEventMessageProps) {
- if (!isOpenHandsAction(event)) {
- return null;
- }
-
- if (hasThoughtProperty(event.args) && event.action !== "think") {
- return (
- <div>
- <ChatMessage type="agent" message={event.args.thought} />
- </div>
- );
- }
-
- return null;
-}
diff --git a/src/components/features/chat/event-message-components/reject-event-message.tsx b/src/components/features/chat/event-message-components/reject-event-message.tsx
deleted file mode 100644
index 967a61ce1c..0000000000
--- a/src/components/features/chat/event-message-components/reject-event-message.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from "react";
-import { OpenHandsObservation } from "#/types/core/observations";
-import { isRejectObservation } from "#/types/core/guards";
-import { ChatMessage } from "../chat-message";
-
-interface RejectEventMessageProps {
- event: OpenHandsObservation;
-}
-
-export function RejectEventMessage({ event }: RejectEventMessageProps) {
- if (!isRejectObservation(event)) {
- return null;
- }
-
- return (
- <div>
- <ChatMessage type="agent" message={event.content} />
- </div>
- );
-}
diff --git a/src/components/features/chat/event-message-components/task-tracking-event-message.tsx b/src/components/features/chat/event-message-components/task-tracking-event-message.tsx
deleted file mode 100644
index cd6ff59a05..0000000000
--- a/src/components/features/chat/event-message-components/task-tracking-event-message.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { OpenHandsObservation } from "#/types/core/observations";
-import { isTaskTrackingObservation } from "#/types/core/guards";
-import { TaskTrackingObservationContent } from "../task-tracking-observation-content";
-import { ConfirmationButtons } from "#/components/shared/buttons/confirmation-buttons";
-
-interface TaskTrackingEventMessageProps {
- event: OpenHandsObservation;
- shouldShowConfirmationButtons: boolean;
-}
-
-export function TaskTrackingEventMessage({
- event,
- shouldShowConfirmationButtons,
-}: TaskTrackingEventMessageProps) {
- if (!isTaskTrackingObservation(event)) {
- return null;
- }
-
- return (
- <div>
- <TaskTrackingObservationContent event={event} />
- {shouldShowConfirmationButtons && <ConfirmationButtons />}
- </div>
- );
-}
diff --git a/src/components/features/chat/event-message-components/user-assistant-event-message.tsx b/src/components/features/chat/event-message-components/user-assistant-event-message.tsx
deleted file mode 100644
index 12f22d6c1c..0000000000
--- a/src/components/features/chat/event-message-components/user-assistant-event-message.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { OpenHandsAction } from "#/types/core/actions";
-import { isUserMessage, isAssistantMessage } from "#/types/core/guards";
-import { ChatMessage } from "../chat-message";
-import { ImageCarousel } from "../../images/image-carousel";
-import { FileList } from "../../files/file-list";
-import { ConfirmationButtons } from "#/components/shared/buttons/confirmation-buttons";
-import { parseMessageFromEvent } from "../event-content-helpers/parse-message-from-event";
-
-interface UserAssistantEventMessageProps {
- event: OpenHandsAction;
- shouldShowConfirmationButtons: boolean;
-}
-
-export function UserAssistantEventMessage({
- event,
- shouldShowConfirmationButtons,
-}: UserAssistantEventMessageProps) {
- if (!isUserMessage(event) && !isAssistantMessage(event)) {
- return null;
- }
-
- const message = parseMessageFromEvent(event);
-
- return (
- <ChatMessage type={event.source} message={message}>
- {event.args.image_urls && event.args.image_urls.length > 0 && (
- <ImageCarousel size="small" images={event.args.image_urls} />
- )}
- {event.args.file_urls && event.args.file_urls.length > 0 && (
- <FileList files={event.args.file_urls} />
- )}
- {shouldShowConfirmationButtons && <ConfirmationButtons />}
- </ChatMessage>
- );
-}
diff --git a/src/components/features/chat/event-message.tsx b/src/components/features/chat/event-message.tsx
deleted file mode 100644
index 03787c0512..0000000000
--- a/src/components/features/chat/event-message.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import { OpenHandsAction } from "#/types/core/actions";
-import {
- isUserMessage,
- isErrorObservation,
- isAssistantMessage,
- isOpenHandsAction,
- isFinishAction,
- isRejectObservation,
- isMcpObservation,
- isTaskTrackingObservation,
-} from "#/types/core/guards";
-import { OpenHandsObservation } from "#/types/core/observations";
-import {
- ErrorEventMessage,
- UserAssistantEventMessage,
- FinishEventMessage,
- RejectEventMessage,
- McpEventMessage,
- TaskTrackingEventMessage,
- ObservationPairEventMessage,
- GenericEventMessageWrapper,
-} from "./event-message-components";
-
-interface EventMessageProps {
- event: OpenHandsAction | OpenHandsObservation;
- hasObservationPair: boolean;
- isAwaitingUserConfirmation: boolean;
- isLastMessage: boolean;
-}
-
-/* eslint-disable react/jsx-props-no-spreading */
-export function EventMessage({
- event,
- hasObservationPair,
- isAwaitingUserConfirmation,
- isLastMessage,
-}: EventMessageProps) {
- const shouldShowConfirmationButtons =
- isLastMessage && event.source === "agent" && isAwaitingUserConfirmation;
-
- // Error observations
- if (isErrorObservation(event)) {
- return <ErrorEventMessage event={event} />;
- }
-
- // Observation pairs with OpenHands actions
- if (hasObservationPair && isOpenHandsAction(event)) {
- return <ObservationPairEventMessage event={event} />;
- }
-
- // Finish actions
- if (isFinishAction(event)) {
- return <FinishEventMessage event={event} />;
- }
-
- // User and assistant messages
- if (isUserMessage(event) || isAssistantMessage(event)) {
- return (
- <UserAssistantEventMessage
- event={event}
- shouldShowConfirmationButtons={shouldShowConfirmationButtons}
- />
- );
- }
-
- // Reject observations
- if (isRejectObservation(event)) {
- return <RejectEventMessage event={event} />;
- }
-
- // MCP observations
- if (isMcpObservation(event)) {
- return (
- <McpEventMessage
- event={event}
- shouldShowConfirmationButtons={shouldShowConfirmationButtons}
- />
- );
- }
-
- // Task tracking observations
- if (isTaskTrackingObservation(event)) {
- return (
- <TaskTrackingEventMessage
- event={event}
- shouldShowConfirmationButtons={shouldShowConfirmationButtons}
- />
- );
- }
-
- // Generic fallback
- return (
- <GenericEventMessageWrapper
- event={event}
- shouldShowConfirmationButtons={shouldShowConfirmationButtons}
- />
- );
-}
diff --git a/src/components/features/chat/expandable-message.tsx b/src/components/features/chat/expandable-message.tsx
deleted file mode 100644
index 837f6046d0..0000000000
--- a/src/components/features/chat/expandable-message.tsx
+++ /dev/null
@@ -1,161 +0,0 @@
-import { useEffect, useState } from "react";
-import { Trans, useTranslation } from "react-i18next";
-import ArrowDown from "#/icons/angle-down-solid.svg?react";
-import ArrowUp from "#/icons/angle-up-solid.svg?react";
-import CheckCircle from "#/icons/check-circle-solid.svg?react";
-import { OpenHandsAction } from "#/types/core/actions";
-import { OpenHandsObservation } from "#/types/core/observations";
-import { cn } from "#/utils/utils";
-import { MarkdownRenderer } from "../markdown/markdown-renderer";
-import { MonoComponent } from "./mono-component";
-import { PathComponent } from "./path-component";
-
-const trimText = (text: string, maxLength: number): string => {
- if (!text) return "";
- return text.length > maxLength ? `${text.substring(0, maxLength)}...` : text;
-};
-
-interface ExpandableMessageProps {
- id?: string;
- message: string;
- type: string;
- success?: boolean;
- observation?: { payload: OpenHandsObservation };
- action?: { payload: OpenHandsAction };
-}
-
-export function ExpandableMessage({
- id,
- message,
- type,
- success,
- observation,
- action,
-}: ExpandableMessageProps) {
- const { i18n } = useTranslation("openhands");
- const [showDetails, setShowDetails] = useState(true);
- const [details, setDetails] = useState(message);
- const [translationId, setTranslationId] = useState<string | undefined>(id);
- const [translationParams, setTranslationParams] = useState<
- Record<string, unknown>
- >({
- observation,
- action,
- });
-
- useEffect(() => {
- // If we have a translation ID, process it
- if (id && i18n.exists(id, { ns: "openhands" })) {
- let processedObservation = observation;
- let processedAction = action;
-
- if (action && action.payload.action === "run") {
- const trimmedCommand = trimText(action.payload.args.command, 80);
- processedAction = {
- ...action,
- payload: {
- ...action.payload,
- args: {
- ...action.payload.args,
- command: trimmedCommand,
- },
- },
- };
- }
-
- if (observation && observation.payload.observation === "run") {
- const trimmedCommand = trimText(observation.payload.extras.command, 80);
- processedObservation = {
- ...observation,
- payload: {
- ...observation.payload,
- extras: {
- ...observation.payload.extras,
- command: trimmedCommand,
- },
- },
- };
- }
-
- setTranslationId(id);
- setTranslationParams({
- observation: processedObservation,
- action: processedAction,
- });
- setDetails(message);
- setShowDetails(false);
- }
- }, [id, message, observation, action, i18n.language]);
-
- const statusIconClasses = "h-4 w-4 ml-2 inline";
-
- return (
- <div
- className={cn(
- "flex gap-2 items-center justify-start border-l-2 pl-2 my-2 py-2",
- type === "error" ? "border-danger" : "border-neutral-300",
- )}
- >
- <div className="text-sm w-full">
- <div className="flex flex-row justify-between items-center w-full">
- <span
- className={cn(
- "font-bold",
- type === "error" ? "text-danger" : "text-neutral-300",
- )}
- >
- {translationId &&
- i18n.exists(translationId, { ns: "openhands" }) ? (
- <Trans
- ns="openhands"
- i18nKey={translationId}
- values={translationParams}
- components={{
- bold: <strong />,
- path: <PathComponent />,
- cmd: <MonoComponent />,
- }}
- />
- ) : (
- message
- )}
- <button
- type="button"
- onClick={() => setShowDetails(!showDetails)}
- className="cursor-pointer text-left"
- >
- {showDetails ? (
- <ArrowUp
- className={cn(
- "h-4 w-4 ml-2 inline",
- type === "error" ? "fill-danger" : "fill-neutral-300",
- )}
- />
- ) : (
- <ArrowDown
- className={cn(
- "h-4 w-4 ml-2 inline",
- type === "error" ? "fill-danger" : "fill-neutral-300",
- )}
- />
- )}
- </button>
- </span>
- {type === "action" && success && (
- <span className="flex-shrink-0">
- <CheckCircle
- data-testid="status-icon"
- className={cn(statusIconClasses, "fill-success")}
- />
- </span>
- )}
- </div>
- {showDetails && (
- <div className="text-sm">
- <MarkdownRenderer includeStandard>{details}</MarkdownRenderer>
- </div>
- )}
- </div>
- </div>
- );
-}
diff --git a/src/components/features/chat/generic-event-message.tsx b/src/components/features/chat/generic-event-message.tsx
index e7e2233fb9..423e2fb615 100644
--- a/src/components/features/chat/generic-event-message.tsx
+++ b/src/components/features/chat/generic-event-message.tsx
@@ -2,7 +2,7 @@ import React from "react";
import ArrowDown from "#/icons/angle-down-solid.svg?react";
import ArrowUp from "#/icons/angle-up-solid.svg?react";
import { SuccessIndicator } from "./success-indicator";
-import { ObservationResultStatus } from "./event-content-helpers/get-observation-result";
+import { ObservationResultStatus } from "#/components/conversation-events/chat/event-content-helpers/get-observation-result";
import { MarkdownRenderer } from "../markdown/markdown-renderer";
import { IsInEventGroupContext } from "./is-in-event-group-context";
diff --git a/src/components/features/chat/mcp-observation-content.tsx b/src/components/features/chat/mcp-observation-content.tsx
deleted file mode 100644
index 92f58ea5ce..0000000000
--- a/src/components/features/chat/mcp-observation-content.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import React from "react";
-import ReactJsonView from "@microlink/react-json-view";
-import { useTranslation } from "react-i18next";
-import { MCPObservation } from "#/types/core/observations";
-import { JSON_VIEW_THEME } from "#/utils/constants";
-
-interface MCPObservationContentProps {
- event: MCPObservation;
-}
-
-export function MCPObservationContent({ event }: MCPObservationContentProps) {
- const { t } = useTranslation("openhands");
-
- // Parse the content as JSON if possible
- let outputData: unknown;
- try {
- outputData = JSON.parse(event.content);
- } catch (e) {
- // If parsing fails, use the raw content
- outputData = event.content;
- }
-
- const hasArguments =
- event.extras.arguments && Object.keys(event.extras.arguments).length > 0;
-
- return (
- <div className="flex flex-col gap-4">
- {/* Arguments section */}
- {hasArguments && (
- <div className="flex flex-col gap-2">
- <div className="flex items-center justify-between">
- <h3 className="text-sm font-semibold text-gray-300">
- {t("MCP_OBSERVATION$ARGUMENTS")}
- </h3>
- </div>
- <div className="p-3 bg-gray-900 rounded-md overflow-auto text-gray-300 max-h-[200px] shadow-inner">
- <ReactJsonView
- name={false}
- src={event.extras.arguments}
- theme={JSON_VIEW_THEME}
- collapsed={1}
- displayDataTypes={false}
- />
- </div>
- </div>
- )}
-
- {/* Output section */}
- <div className="flex flex-col gap-2">
- <div className="flex items-center justify-between">
- <h3 className="text-sm font-semibold text-gray-300">
- {t("MCP_OBSERVATION$OUTPUT")}
- </h3>
- </div>
- <div className="p-3 bg-gray-900 rounded-md overflow-auto text-gray-300 max-h-[300px] shadow-inner">
- {typeof outputData === "object" && outputData !== null ? (
- <ReactJsonView
- name={false}
- src={outputData}
- theme={JSON_VIEW_THEME}
- collapsed={1}
- displayDataTypes={false}
- />
- ) : (
- <pre className="whitespace-pre-wrap">
- {event.content.trim() || t("OBSERVATION$MCP_NO_OUTPUT")}
- </pre>
- )}
- </div>
- </div>
- </div>
- );
-}
diff --git a/src/components/features/chat/messages.tsx b/src/components/features/chat/messages.tsx
deleted file mode 100644
index c64f3d29b2..0000000000
--- a/src/components/features/chat/messages.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import React from "react";
-import { OpenHandsAction } from "#/types/core/actions";
-import { OpenHandsObservation } from "#/types/core/observations";
-import { isOpenHandsAction, isOpenHandsObservation } from "#/types/core/guards";
-import { EventMessage } from "./event-message";
-import { ChatMessage } from "./chat-message";
-import { useOptimisticUserMessageStore } from "#/stores/optimistic-user-message-store";
-
-interface MessagesProps {
- messages: (OpenHandsAction | OpenHandsObservation)[];
- isAwaitingUserConfirmation: boolean;
-}
-
-export const Messages: React.FC<MessagesProps> = React.memo(
- ({ messages, isAwaitingUserConfirmation }) => {
- const { getOptimisticUserMessage } = useOptimisticUserMessageStore();
- const optimisticUserMessage = getOptimisticUserMessage();
-
- const actionHasObservationPair = React.useCallback(
- (event: OpenHandsAction | OpenHandsObservation): boolean => {
- if (isOpenHandsAction(event)) {
- return !!messages.some(
- (msg) => isOpenHandsObservation(msg) && msg.cause === event.id,
- );
- }
-
- return false;
- },
- [messages],
- );
-
- return (
- <>
- {messages.map((message, index) => (
- <EventMessage
- key={index}
- event={message}
- hasObservationPair={actionHasObservationPair(message)}
- isAwaitingUserConfirmation={isAwaitingUserConfirmation}
- isLastMessage={messages.length - 1 === index}
- />
- ))}
-
- {optimisticUserMessage && (
- <ChatMessage type="user" message={optimisticUserMessage} />
- )}
- </>
- );
- },
- (prevProps, nextProps) => {
- // Prevent re-renders if messages are the same length
- if (prevProps.messages.length !== nextProps.messages.length) {
- return false;
- }
-
- return true;
- },
-);
-
-Messages.displayName = "Messages";
diff --git a/src/components/features/chat/success-indicator.tsx b/src/components/features/chat/success-indicator.tsx
index 12e16d67fe..d84ede233e 100644
--- a/src/components/features/chat/success-indicator.tsx
+++ b/src/components/features/chat/success-indicator.tsx
@@ -1,6 +1,6 @@
import { FaClock } from "react-icons/fa";
import CheckCircle from "#/icons/check-circle-solid.svg?react";
-import { ObservationResultStatus } from "./event-content-helpers/get-observation-result";
+import { ObservationResultStatus } from "#/components/conversation-events/chat/event-content-helpers/get-observation-result";
interface SuccessIndicatorProps {
status: ObservationResultStatus;
diff --git a/src/components/features/chat/task-tracking-observation-content.tsx b/src/components/features/chat/task-tracking-observation-content.tsx
deleted file mode 100644
index 7d9e7ff146..0000000000
--- a/src/components/features/chat/task-tracking-observation-content.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { TaskTrackingObservation } from "#/types/core/observations";
-import { TaskListSection } from "./task-tracking/task-list-section";
-
-interface TaskTrackingObservationContentProps {
- event: TaskTrackingObservation;
-}
-
-export function TaskTrackingObservationContent({
- event,
-}: TaskTrackingObservationContentProps) {
- const { command, task_list: taskList } = event.extras;
- const shouldShowTaskList = command === "plan" && taskList.length > 0;
-
- return (
- <div className="flex flex-col gap-4">
- {/* Task List section - only show for 'plan' command */}
- {shouldShowTaskList && <TaskListSection taskList={taskList} />}
- </div>
- );
-}
diff --git a/src/components/features/controls/server-status-context-menu.tsx b/src/components/features/controls/server-status-context-menu.tsx
index 6e89e7aa62..0d88ba81e6 100644
--- a/src/components/features/controls/server-status-context-menu.tsx
+++ b/src/components/features/controls/server-status-context-menu.tsx
@@ -8,14 +8,14 @@ import { ServerStatusContextMenuIconText } from "./server-status-context-menu-ic
import { ServerStatus } from "./server-status";
import { Divider } from "#/ui/divider";
import { cn } from "#/utils/utils";
-import { V1ExecutionStatus } from "#/types/v1/core/base/common";
+import { ExecutionStatus } from "#/types/agent-server/core/base/common";
import { isExecutionActive, isExecutionPaused } from "#/utils/status";
interface ServerStatusContextMenuProps {
onClose: () => void;
onStopServer?: (event: React.MouseEvent<HTMLButtonElement>) => void;
onStartServer?: (event: React.MouseEvent<HTMLButtonElement>) => void;
- executionStatus: V1ExecutionStatus | null;
+ executionStatus: ExecutionStatus | null;
position?: "top" | "bottom";
className?: string;
isPausing?: boolean;
diff --git a/src/components/features/controls/server-status.tsx b/src/components/features/controls/server-status.tsx
index 59b570de59..833743e854 100644
--- a/src/components/features/controls/server-status.tsx
+++ b/src/components/features/controls/server-status.tsx
@@ -5,12 +5,12 @@ import { useAgentState } from "#/hooks/use-agent-state";
import { useTaskPolling } from "#/hooks/query/use-task-polling";
import { getStatusColor, getStatusText } from "#/utils/utils";
import { useErrorMessageStore } from "#/stores/error-message-store";
-import { V1ExecutionStatus } from "#/types/v1/core/base/common";
+import { ExecutionStatus } from "#/types/agent-server/core/base/common";
import { isExecutionErrored, isExecutionPaused } from "#/utils/status";
export interface ServerStatusProps {
className?: string;
- executionStatus: V1ExecutionStatus | null;
+ executionStatus: ExecutionStatus | null;
isPausing?: boolean;
}
diff --git a/src/components/features/conversation-panel/conversation-card/conversation-card-actions.tsx b/src/components/features/conversation-panel/conversation-card/conversation-card-actions.tsx
index 64774edd2d..f2a0ce0e83 100644
--- a/src/components/features/conversation-panel/conversation-card/conversation-card-actions.tsx
+++ b/src/components/features/conversation-panel/conversation-card/conversation-card-actions.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { cn } from "#/utils/utils";
-import { V1ExecutionStatus } from "#/types/v1/core/base/common";
+import { ExecutionStatus } from "#/types/agent-server/core/base/common";
import { isExecutionActive, isExecutionPaused } from "#/utils/status";
import { ConversationCardContextMenu } from "./conversation-card-context-menu";
import EllipsisIcon from "#/icons/ellipsis.svg?react";
@@ -13,7 +13,7 @@ interface ConversationCardActionsProps {
onEdit?: (event: React.MouseEvent<HTMLButtonElement>) => void;
onDownloadViaVSCode?: (event: React.MouseEvent<HTMLButtonElement>) => void;
onDownloadConversation?: (event: React.MouseEvent<HTMLButtonElement>) => void;
- executionStatus?: V1ExecutionStatus | null;
+ executionStatus?: ExecutionStatus | null;
conversationId?: string;
showOptions?: boolean;
}
diff --git a/src/components/features/conversation-panel/conversation-card/conversation-card-footer.tsx b/src/components/features/conversation-panel/conversation-card/conversation-card-footer.tsx
index 90460ee317..49796759c1 100644
--- a/src/components/features/conversation-panel/conversation-card/conversation-card-footer.tsx
+++ b/src/components/features/conversation-panel/conversation-card/conversation-card-footer.tsx
@@ -3,7 +3,7 @@ import { formatTimeDelta } from "#/utils/format-time-delta";
import { cn } from "#/utils/utils";
import { I18nKey } from "#/i18n/declaration";
import { RepositorySelection } from "#/api/open-hands.types";
-import { V1ExecutionStatus } from "#/types/v1/core/base/common";
+import { ExecutionStatus } from "#/types/agent-server/core/base/common";
import { isExecutionPaused } from "#/utils/status";
import { ConversationRepoLink } from "./conversation-repo-link";
import { NoRepository } from "./no-repository";
@@ -13,7 +13,7 @@ interface ConversationCardFooterProps {
selectedRepository: RepositorySelection | null;
lastUpdatedAt: string;
createdAt?: string;
- executionStatus?: V1ExecutionStatus | null;
+ executionStatus?: ExecutionStatus | null;
llmModel?: string | null;
}
diff --git a/src/components/features/conversation-panel/conversation-card/conversation-card-header.tsx b/src/components/features/conversation-panel/conversation-card/conversation-card-header.tsx
index d611a542b0..2591c9619f 100644
--- a/src/components/features/conversation-panel/conversation-card/conversation-card-header.tsx
+++ b/src/components/features/conversation-panel/conversation-card/conversation-card-header.tsx
@@ -1,4 +1,4 @@
-import { V1ExecutionStatus } from "#/types/v1/core/base/common";
+import { ExecutionStatus } from "#/types/agent-server/core/base/common";
import { ConversationCardTitle } from "./conversation-card-title";
import { ConversationStatusDot } from "../../home/recent-conversations/conversation-status-dot";
@@ -6,7 +6,7 @@ interface ConversationCardHeaderProps {
title: string;
titleMode: "view" | "edit";
onTitleSave: (title: string) => void;
- executionStatus?: V1ExecutionStatus | null;
+ executionStatus?: ExecutionStatus | null;
}
export function ConversationCardHeader({
diff --git a/src/components/features/conversation-panel/conversation-card/conversation-card.tsx b/src/components/features/conversation-panel/conversation-card/conversation-card.tsx
index d34a2f2768..8bcaeb75da 100644
--- a/src/components/features/conversation-panel/conversation-card/conversation-card.tsx
+++ b/src/components/features/conversation-panel/conversation-card/conversation-card.tsx
@@ -3,7 +3,7 @@ import { usePostHog } from "posthog-js/react";
import { cn } from "#/utils/utils";
import { transformVSCodeUrl } from "#/utils/vscode-url-helper";
import ConversationService from "#/api/conversation-service/conversation-service.api";
-import { V1ExecutionStatus } from "#/types/v1/core/base/common";
+import { ExecutionStatus } from "#/types/agent-server/core/base/common";
import { RepositorySelection } from "#/api/open-hands.types";
import { ConversationCardHeader } from "./conversation-card-header";
import { ConversationCardActions } from "./conversation-card-actions";
@@ -20,7 +20,7 @@ interface ConversationCardProps {
selectedRepository: RepositorySelection | null;
lastUpdatedAt: string;
createdAt?: string;
- executionStatus?: V1ExecutionStatus | null;
+ executionStatus?: ExecutionStatus | null;
conversationId?: string;
contextMenuOpen?: boolean;
onContextMenuToggle?: (isOpen: boolean) => void;
diff --git a/src/components/features/conversation-panel/hook-event-item.tsx b/src/components/features/conversation-panel/hook-event-item.tsx
index ff5f1f1756..4fbb3c49a7 100644
--- a/src/components/features/conversation-panel/hook-event-item.tsx
+++ b/src/components/features/conversation-panel/hook-event-item.tsx
@@ -1,7 +1,7 @@
import { useTranslation } from "react-i18next";
import { ChevronDown, ChevronRight } from "lucide-react";
import { Typography } from "#/ui/typography";
-import { HookEvent } from "#/api/conversation-service/v1-conversation-service.types";
+import { HookEvent } from "#/api/conversation-service/agent-server-conversation-service.types";
import { HookMatcherContent } from "./hook-matcher-content";
import { I18nKey } from "#/i18n/declaration";
diff --git a/src/components/features/conversation-panel/hook-matcher-content.tsx b/src/components/features/conversation-panel/hook-matcher-content.tsx
index fd6dd992d5..d561ac0259 100644
--- a/src/components/features/conversation-panel/hook-matcher-content.tsx
+++ b/src/components/features/conversation-panel/hook-matcher-content.tsx
@@ -2,7 +2,7 @@ import { useTranslation } from "react-i18next";
import { I18nKey } from "#/i18n/declaration";
import { Typography } from "#/ui/typography";
import { Pre } from "#/ui/pre";
-import { HookMatcher } from "#/api/conversation-service/v1-conversation-service.types";
+import { HookMatcher } from "#/api/conversation-service/agent-server-conversation-service.types";
interface HookMatcherContentProps {
matcher: HookMatcher;
diff --git a/src/components/features/conversation-panel/skill-item.tsx b/src/components/features/conversation-panel/skill-item.tsx
index 2a57e9e8f8..3c20c43eba 100644
--- a/src/components/features/conversation-panel/skill-item.tsx
+++ b/src/components/features/conversation-panel/skill-item.tsx
@@ -2,7 +2,7 @@ import { ChevronDown, ChevronRight } from "lucide-react";
import { Typography } from "#/ui/typography";
import { SkillTriggers } from "./skill-triggers";
import { SkillContent } from "./skill-content";
-import { Skill } from "#/api/conversation-service/v1-conversation-service.types";
+import { Skill } from "#/api/conversation-service/agent-server-conversation-service.types";
interface SkillItemProps {
skill: Skill;
diff --git a/src/components/features/conversation-panel/start-task-card/start-task-card-header.tsx b/src/components/features/conversation-panel/start-task-card/start-task-card-header.tsx
index b8524c77a5..5fc3214d10 100644
--- a/src/components/features/conversation-panel/start-task-card/start-task-card-header.tsx
+++ b/src/components/features/conversation-panel/start-task-card/start-task-card-header.tsx
@@ -1,10 +1,10 @@
-import type { V1AppConversationStartTaskStatus } from "#/api/conversation-service/v1-conversation-service.types";
+import type { AppConversationStartTaskStatus } from "#/api/conversation-service/agent-server-conversation-service.types";
import { StartTaskStatusIndicator } from "./start-task-status-indicator";
import { StartTaskStatusBadge } from "./start-task-status-badge";
interface StartTaskCardHeaderProps {
title: string;
- taskStatus: V1AppConversationStartTaskStatus;
+ taskStatus: AppConversationStartTaskStatus;
}
export function StartTaskCardHeader({
diff --git a/src/components/features/conversation-panel/start-task-card/start-task-card.tsx b/src/components/features/conversation-panel/start-task-card/start-task-card.tsx
index 68982f93bf..5664eadd2e 100644
--- a/src/components/features/conversation-panel/start-task-card/start-task-card.tsx
+++ b/src/components/features/conversation-panel/start-task-card/start-task-card.tsx
@@ -1,12 +1,12 @@
import { useTranslation } from "react-i18next";
-import type { V1AppConversationStartTask } from "#/api/conversation-service/v1-conversation-service.types";
+import type { AppConversationStartTask } from "#/api/conversation-service/agent-server-conversation-service.types";
import { cn } from "#/utils/utils";
import { I18nKey } from "#/i18n/declaration";
import { StartTaskCardHeader } from "./start-task-card-header";
import { StartTaskCardFooter } from "./start-task-card-footer";
interface StartTaskCardProps {
- task: V1AppConversationStartTask;
+ task: AppConversationStartTask;
onClick?: () => void;
}
diff --git a/src/components/features/conversation-panel/start-task-card/start-task-status-badge.tsx b/src/components/features/conversation-panel/start-task-card/start-task-status-badge.tsx
index 1f67a8b2c5..d68f2e3431 100644
--- a/src/components/features/conversation-panel/start-task-card/start-task-status-badge.tsx
+++ b/src/components/features/conversation-panel/start-task-card/start-task-status-badge.tsx
@@ -1,8 +1,8 @@
-import type { V1AppConversationStartTaskStatus } from "#/api/conversation-service/v1-conversation-service.types";
+import type { AppConversationStartTaskStatus } from "#/api/conversation-service/agent-server-conversation-service.types";
import { cn } from "#/utils/utils";
interface StartTaskStatusBadgeProps {
- taskStatus: V1AppConversationStartTaskStatus;
+ taskStatus: AppConversationStartTaskStatus;
}
export function StartTaskStatusBadge({
diff --git a/src/components/features/conversation-panel/start-task-card/start-task-status-indicator.tsx b/src/components/features/conversation-panel/start-task-card/start-task-status-indicator.tsx
index d48a604b5b..19254cb131 100644
--- a/src/components/features/conversation-panel/start-task-card/start-task-status-indicator.tsx
+++ b/src/components/features/conversation-panel/start-task-card/start-task-status-indicator.tsx
@@ -1,8 +1,8 @@
-import type { V1AppConversationStartTaskStatus } from "#/api/conversation-service/v1-conversation-service.types";
+import type { AppConversationStartTaskStatus } from "#/api/conversation-service/agent-server-conversation-service.types";
import { cn } from "#/utils/utils";
interface StartTaskStatusIndicatorProps {
- taskStatus: V1AppConversationStartTaskStatus;
+ taskStatus: AppConversationStartTaskStatus;
}
export function StartTaskStatusIndicator({
diff --git a/src/components/features/conversation-panel/system-message-modal/tab-content.tsx b/src/components/features/conversation-panel/system-message-modal/tab-content.tsx
index 99bb544e04..fba2bb849c 100644
--- a/src/components/features/conversation-panel/system-message-modal/tab-content.tsx
+++ b/src/components/features/conversation-panel/system-message-modal/tab-content.tsx
@@ -1,7 +1,7 @@
import { SystemMessageContent } from "./system-message-content";
import { ToolsList } from "./tools-list";
import { EmptyToolsState } from "./empty-tools-state";
-import { ChatCompletionToolParam } from "#/types/v1/core";
+import { ChatCompletionToolParam } from "#/types/agent-server/core";
interface TabContentProps {
activeTab: "system" | "tools";
diff --git a/src/components/features/conversation-panel/system-message-modal/tool-item.tsx b/src/components/features/conversation-panel/system-message-modal/tool-item.tsx
index 61cfc7332a..3593d770c5 100644
--- a/src/components/features/conversation-panel/system-message-modal/tool-item.tsx
+++ b/src/components/features/conversation-panel/system-message-modal/tool-item.tsx
@@ -1,6 +1,6 @@
import { ToolParameters } from "./tool-parameters";
import { ToggleButton } from "./toggle-button";
-import { ChatCompletionToolParam } from "#/types/v1/core";
+import { ChatCompletionToolParam } from "#/types/agent-server/core";
import { MarkdownRenderer } from "../../markdown/markdown-renderer";
interface FunctionData {
@@ -10,13 +10,13 @@ interface FunctionData {
}
interface ToolData {
- // V0/OpenAI format
+ // OpenAI-compatible format
type?: string;
function?: FunctionData;
name?: string;
description?: string;
parameters?: Record<string, unknown>;
- // V1 format
+ // agent-server format
title?: string;
kind?: string;
annotations?: {
@@ -36,31 +36,31 @@ export function ToolItem({ tool, index, isExpanded, onToggle }: ToolItemProps) {
const toolData = tool as ToolData;
const functionData = toolData.function || toolData;
- // Extract tool name/title - support both V0 and V1 formats
+ // Extract tool name/title from supported tool schemas
const name =
- // V1 format: check for title field (root level or in annotations)
+ // agent-server format: check for title field (root level or in annotations)
toolData.title ||
toolData.annotations?.title ||
- // V0 format: check for function.name or name
+ // OpenAI-compatible format: check for function.name or name
functionData.name ||
(toolData.type === "function" && toolData.function?.name) ||
"";
- // Extract description - support both V0 and V1 formats
+ // Extract description from supported tool schemas
const description =
- // V1 format: description at root level
+ // agent-server format: description at root level
toolData.description ||
- // V0 format: description in function object
+ // OpenAI-compatible format: description in function object
functionData.description ||
(toolData.type === "function" && toolData.function?.description) ||
"";
- // Extract parameters - support both V0 and V1 formats
+ // Extract parameters from supported tool schemas
const parameters =
- // V0 format: parameters in function object
+ // OpenAI-compatible format: parameters in function object
functionData.parameters ||
(toolData.type === "function" && toolData.function?.parameters) ||
- // V1 format: parameters at root level (if present)
+ // agent-server format: parameters at root level (if present)
toolData.parameters ||
null;
diff --git a/src/components/features/conversation-panel/system-message-modal/tools-list.tsx b/src/components/features/conversation-panel/system-message-modal/tools-list.tsx
index 5087161899..586e770174 100644
--- a/src/components/features/conversation-panel/system-message-modal/tools-list.tsx
+++ b/src/components/features/conversation-panel/system-message-modal/tools-list.tsx
@@ -1,4 +1,4 @@
-import { ChatCompletionToolParam } from "#/types/v1/core";
+import { ChatCompletionToolParam } from "#/types/agent-server/core";
import { ToolItem } from "./tool-item";
interface ToolsListProps {
diff --git a/src/components/features/home/recent-conversations/conversation-status-dot.tsx b/src/components/features/home/recent-conversations/conversation-status-dot.tsx
index 9dcc79b8be..6d2ad93911 100644
--- a/src/components/features/home/recent-conversations/conversation-status-dot.tsx
+++ b/src/components/features/home/recent-conversations/conversation-status-dot.tsx
@@ -1,24 +1,24 @@
import { useMemo } from "react";
import { useTranslation } from "react-i18next";
-import { V1ExecutionStatus } from "#/types/v1/core/base/common";
+import { ExecutionStatus } from "#/types/agent-server/core/base/common";
import { cn } from "#/utils/utils";
import { StyledTooltip } from "#/components/shared/buttons/styled-tooltip";
interface ConversationStatusDotProps {
- executionStatus: V1ExecutionStatus | null | undefined;
+ executionStatus: ExecutionStatus | null | undefined;
}
-const labelKeyFor = (status: V1ExecutionStatus | null | undefined): string => {
+const labelKeyFor = (status: ExecutionStatus | null | undefined): string => {
switch (status) {
- case V1ExecutionStatus.RUNNING:
- case V1ExecutionStatus.IDLE:
- case V1ExecutionStatus.WAITING_FOR_CONFIRMATION:
- case V1ExecutionStatus.FINISHED:
+ case ExecutionStatus.RUNNING:
+ case ExecutionStatus.IDLE:
+ case ExecutionStatus.WAITING_FOR_CONFIRMATION:
+ case ExecutionStatus.FINISHED:
return "COMMON$RUNNING";
- case V1ExecutionStatus.PAUSED:
+ case ExecutionStatus.PAUSED:
return "COMMON$PAUSED";
- case V1ExecutionStatus.ERROR:
- case V1ExecutionStatus.STUCK:
+ case ExecutionStatus.ERROR:
+ case ExecutionStatus.STUCK:
return "COMMON$STOPPED";
default:
return "COMMON$STOPPED";
@@ -32,15 +32,15 @@ export function ConversationStatusDot({
const backgroundColor = useMemo(() => {
switch (executionStatus) {
- case V1ExecutionStatus.RUNNING:
- case V1ExecutionStatus.IDLE:
- case V1ExecutionStatus.WAITING_FOR_CONFIRMATION:
- case V1ExecutionStatus.FINISHED:
+ case ExecutionStatus.RUNNING:
+ case ExecutionStatus.IDLE:
+ case ExecutionStatus.WAITING_FOR_CONFIRMATION:
+ case ExecutionStatus.FINISHED:
return "bg-[#1FBD53]";
- case V1ExecutionStatus.PAUSED:
+ case ExecutionStatus.PAUSED:
return "bg-[#A3A3A3]";
- case V1ExecutionStatus.ERROR:
- case V1ExecutionStatus.STUCK:
+ case ExecutionStatus.ERROR:
+ case ExecutionStatus.STUCK:
return "bg-[#A3A3A3]";
default:
return "bg-[#3C3C49]";
diff --git a/src/components/features/home/recent-conversations/recent-conversation.tsx b/src/components/features/home/recent-conversations/recent-conversation.tsx
index 6065ce0bd9..283b1f8834 100644
--- a/src/components/features/home/recent-conversations/recent-conversation.tsx
+++ b/src/components/features/home/recent-conversations/recent-conversation.tsx
@@ -1,6 +1,6 @@
import { useTranslation } from "react-i18next";
import CodeBranchIcon from "#/icons/u-code-branch.svg?react";
-import { V1AppConversation } from "#/api/conversation-service/v1-conversation-service.types";
+import { AppConversation } from "#/api/conversation-service/agent-server-conversation-service.types";
import { NavigationLink } from "#/components/shared/navigation-link";
import { GitProviderIcon } from "#/components/shared/git-provider-icon";
import { Provider } from "#/types/settings";
@@ -11,7 +11,7 @@ import RepoForkedIcon from "#/icons/repo-forked.svg?react";
import CircuitIcon from "#/icons/u-circuit.svg?react";
interface RecentConversationProps {
- conversation: V1AppConversation;
+ conversation: AppConversation;
}
export function RecentConversation({ conversation }: RecentConversationProps) {
diff --git a/src/components/features/launch/plugin-launch-modal.tsx b/src/components/features/launch/plugin-launch-modal.tsx
index 6294e42003..fdd23bc60e 100644
--- a/src/components/features/launch/plugin-launch-modal.tsx
+++ b/src/components/features/launch/plugin-launch-modal.tsx
@@ -4,7 +4,7 @@ import { IoClose } from "react-icons/io5";
import { ModalBackdrop } from "#/components/shared/modals/modal-backdrop";
import { BrandButton } from "#/components/features/settings/brand-button";
import { I18nKey } from "#/i18n/declaration";
-import { PluginSpec } from "#/api/conversation-service/v1-conversation-service.types";
+import { PluginSpec } from "#/api/conversation-service/agent-server-conversation-service.types";
import { Typography } from "#/ui/typography";
import { cn } from "#/utils/utils";
import { PluginLaunchPluginSection } from "./plugin-launch-plugin-section";
diff --git a/src/components/features/launch/plugin-launch-plugin-section.tsx b/src/components/features/launch/plugin-launch-plugin-section.tsx
index c03694a58d..fb5ee368be 100644
--- a/src/components/features/launch/plugin-launch-plugin-section.tsx
+++ b/src/components/features/launch/plugin-launch-plugin-section.tsx
@@ -1,7 +1,7 @@
import { useTranslation } from "react-i18next";
import { IoChevronDown, IoChevronForward } from "react-icons/io5";
import { I18nKey } from "#/i18n/declaration";
-import { PluginSpec } from "#/api/conversation-service/v1-conversation-service.types";
+import { PluginSpec } from "#/api/conversation-service/agent-server-conversation-service.types";
import { Typography } from "#/ui/typography";
import { PluginLaunchParameterInput } from "./plugin-launch-parameter-input";
diff --git a/src/components/shared/buttons/confirmation-buttons.tsx b/src/components/shared/buttons/confirmation-buttons.tsx
deleted file mode 100644
index 73dee47aaf..0000000000
--- a/src/components/shared/buttons/confirmation-buttons.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-import { useCallback, useEffect } from "react";
-import { useTranslation } from "react-i18next";
-import { I18nKey } from "#/i18n/declaration";
-import { AgentState } from "#/types/agent-state";
-import { generateAgentStateChangeEvent } from "#/services/agent-state-service";
-import { ActionTooltip } from "../action-tooltip";
-import { isOpenHandsAction, isActionOrObservation } from "#/types/core/guards";
-import { ActionSecurityRisk } from "#/stores/security-analyzer-store";
-import { RiskAlert } from "#/components/shared/risk-alert";
-import WarningIcon from "#/icons/u-warning.svg?react";
-import { useEventMessageStore } from "#/stores/event-message-store";
-import { useEventStore } from "#/stores/use-event-store";
-import { isV0Event } from "#/types/v1/type-guards";
-import { useSendMessage } from "#/hooks/use-send-message";
-
-export function ConfirmationButtons() {
- const submittedEventIds = useEventMessageStore(
- (state) => state.submittedEventIds,
- );
- const addSubmittedEventId = useEventMessageStore(
- (state) => state.addSubmittedEventId,
- );
-
- const { t } = useTranslation("openhands");
-
- const { send } = useSendMessage();
- const events = useEventStore((state) => state.events);
-
- // Find the most recent action awaiting confirmation
- const awaitingAction = events
- .filter(isV0Event)
- .filter(isActionOrObservation)
- .slice()
- .reverse()
- .find((ev) => {
- if (!isOpenHandsAction(ev) || ev.source !== "agent") return false;
- const args = ev.args as Record<string, unknown>;
- return args?.confirmation_state === "awaiting_confirmation";
- });
-
- const handleStateChange = useCallback(
- (state: AgentState) => {
- if (!awaitingAction) {
- return;
- }
-
- addSubmittedEventId(awaitingAction.id);
- send(generateAgentStateChangeEvent(state));
- },
- [send, addSubmittedEventId],
- );
-
- // Handle keyboard shortcuts
- useEffect(() => {
- if (!awaitingAction) {
- return undefined;
- }
-
- const handleCancelShortcut = (event: KeyboardEvent) => {
- if (event.shiftKey && event.metaKey && event.key === "Backspace") {
- event.preventDefault();
- handleStateChange(AgentState.USER_REJECTED);
- }
- };
-
- const handleContinueShortcut = (event: KeyboardEvent) => {
- if (event.metaKey && event.key === "Enter") {
- event.preventDefault();
- handleStateChange(AgentState.USER_CONFIRMED);
- }
- };
-
- const handleKeyDown = (event: KeyboardEvent) => {
- // Cancel: Shift+Cmd+Backspace (β‡§βŒ˜βŒ«)
- handleCancelShortcut(event);
- // Continue: Cmd+Enter (βŒ˜β†©)
- handleContinueShortcut(event);
- };
-
- document.addEventListener("keydown", handleKeyDown);
-
- return () => document.removeEventListener("keydown", handleKeyDown);
- }, [awaitingAction, handleStateChange]);
-
- if (!awaitingAction || submittedEventIds.includes(awaitingAction.id)) {
- return null;
- }
-
- const { args } = awaitingAction as { args: Record<string, unknown> };
-
- const risk = args?.security_risk;
-
- const isHighRisk =
- typeof risk === "string"
- ? risk.toLowerCase() === "high"
- : Number(risk) === ActionSecurityRisk.HIGH;
-
- return (
- <div className="flex flex-col gap-2 pt-4">
- {isHighRisk && (
- <RiskAlert
- content={t(I18nKey.CHAT_INTERFACE$HIGH_RISK_WARNING)}
- icon={<WarningIcon width={16} height={16} color="#fff" />}
- severity="high"
- title={t(I18nKey.COMMON$HIGH_RISK)}
- />
- )}
- <div className="flex justify-between items-center">
- <p className="text-sm font-normal text-white">
- {t(I18nKey.CHAT_INTERFACE$USER_ASK_CONFIRMATION)}
- </p>
- <div className="flex items-center gap-3">
- <ActionTooltip
- type="reject"
- onClick={() => handleStateChange(AgentState.USER_REJECTED)}
- />
- <ActionTooltip
- type="confirm"
- onClick={() => handleStateChange(AgentState.USER_CONFIRMED)}
- />
- </div>
- </div>
- </div>
- );
-}
diff --git a/src/components/shared/buttons/v1-confirmation-buttons.tsx b/src/components/shared/buttons/conversation-confirmation-buttons.tsx
similarity index 83%
rename from src/components/shared/buttons/v1-confirmation-buttons.tsx
rename to src/components/shared/buttons/conversation-confirmation-buttons.tsx
index 390fae31e8..16e8c6f855 100644
--- a/src/components/shared/buttons/v1-confirmation-buttons.tsx
+++ b/src/components/shared/buttons/conversation-confirmation-buttons.tsx
@@ -7,18 +7,18 @@ import { RiskAlert } from "#/components/shared/risk-alert";
import WarningIcon from "#/icons/u-warning.svg?react";
import { useEventMessageStore } from "#/stores/event-message-store";
import { useEventStore } from "#/stores/use-event-store";
-import { isV1Event, isActionEvent } from "#/types/v1/type-guards";
+import { isActionEvent } from "#/types/agent-server/type-guards";
import { useActiveConversation } from "#/hooks/query/use-active-conversation";
import { useAgentState } from "#/hooks/use-agent-state";
import { useRespondToConfirmation } from "#/hooks/mutation/use-respond-to-confirmation";
-import { SecurityRisk } from "#/types/v1/core/base/common";
+import { SecurityRisk } from "#/types/agent-server/core/base/common";
-export function V1ConfirmationButtons() {
- const v1SubmittedEventIds = useEventMessageStore(
- (state) => state.v1SubmittedEventIds,
+export function ConversationConfirmationButtons() {
+ const submittedEventIds = useEventMessageStore(
+ (state) => state.submittedEventIds,
);
- const addV1SubmittedEventId = useEventMessageStore(
- (state) => state.addV1SubmittedEventId,
+ const addSubmittedEventId = useEventMessageStore(
+ (state) => state.addSubmittedEventId,
);
const { t } = useTranslation("openhands");
@@ -27,14 +27,11 @@ export function V1ConfirmationButtons() {
const { mutate: respondToConfirmation } = useRespondToConfirmation();
const events = useEventStore((state) => state.events);
- // Find the most recent V1 action awaiting confirmation
const awaitingAction = events
- .filter(isV1Event)
.slice()
.reverse()
.find((ev) => {
if (ev.source !== "agent") return false;
- // For V1, we check if the agent state is waiting for confirmation
return curAgentState === AgentState.AWAITING_USER_CONFIRMATION;
});
@@ -45,9 +42,9 @@ export function V1ConfirmationButtons() {
}
// Mark event as submitted to prevent duplicate submissions
- addV1SubmittedEventId(awaitingAction.id);
+ addSubmittedEventId(awaitingAction.id);
- // Call the V1 API endpoint
+ // Call the agent-server API endpoint
respondToConfirmation({
conversationId: conversation.id,
conversationUrl: conversation.conversation_url || "",
@@ -55,12 +52,7 @@ export function V1ConfirmationButtons() {
accept,
});
},
- [
- awaitingAction,
- conversation,
- addV1SubmittedEventId,
- respondToConfirmation,
- ],
+ [awaitingAction, conversation, addSubmittedEventId, respondToConfirmation],
);
// Handle keyboard shortcuts
@@ -99,7 +91,7 @@ export function V1ConfirmationButtons() {
if (
curAgentState !== AgentState.AWAITING_USER_CONFIRMATION ||
!awaitingAction ||
- v1SubmittedEventIds.includes(awaitingAction.id)
+ submittedEventIds.includes(awaitingAction.id)
) {
return null;
}
diff --git a/src/components/shared/hook-execution-event-message.tsx b/src/components/shared/hook-execution-event-message.tsx
index 63f68f41c3..48f7d1bf4e 100644
--- a/src/components/shared/hook-execution-event-message.tsx
+++ b/src/components/shared/hook-execution-event-message.tsx
@@ -1,7 +1,7 @@
import React from "react";
import { useTranslation } from "react-i18next";
-import { isHookExecutionEvent } from "#/types/v1/type-guards";
-import { OpenHandsEvent } from "#/types/v1/core";
+import { isHookExecutionEvent } from "#/types/agent-server/type-guards";
+import { OpenHandsEvent } from "#/types/agent-server/core";
import { GenericEventMessage } from "#/components/features/chat/generic-event-message";
interface HookExecutionEventMessageProps {
diff --git a/src/components/v1/chat/event-message-components/hook-execution-event-message.tsx b/src/components/v1/chat/event-message-components/hook-execution-event-message.tsx
deleted file mode 100644
index 4bec021ab7..0000000000
--- a/src/components/v1/chat/event-message-components/hook-execution-event-message.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { HookExecutionEventMessage } from "#/components/shared/hook-execution-event-message";
diff --git a/src/context/conversation-subscriptions-provider.tsx b/src/context/conversation-subscriptions-provider.tsx
deleted file mode 100644
index b93845e368..0000000000
--- a/src/context/conversation-subscriptions-provider.tsx
+++ /dev/null
@@ -1,324 +0,0 @@
-import React, {
- createContext,
- useContext,
- useState,
- useCallback,
- useEffect,
- useRef,
-} from "react";
-import { io, Socket } from "socket.io-client";
-import { OpenHandsParsedEvent } from "#/types/core";
-import {
- isOpenHandsEvent,
- isAgentStateChangeObservation,
- isStatusUpdate,
-} from "#/types/core/guards";
-import { AgentState } from "#/types/agent-state";
-import {
- renderConversationErroredToast,
- renderConversationCreatedToast,
- renderConversationFinishedToast,
-} from "#/components/shared/conversation-toast";
-import { Provider } from "#/types/settings";
-
-interface ConversationSocket {
- socket: Socket;
- isConnected: boolean;
- events: OpenHandsParsedEvent[];
-}
-
-interface ConversationSubscriptionsContextType {
- activeConversationIds: string[];
- subscribeToConversation: (options: {
- conversationId: string;
- sessionApiKey: string | null;
- providersSet: Provider[];
- baseUrl: string;
- socketPath?: string;
- onEvent?: (event: unknown, conversationId: string) => void;
- }) => void;
- unsubscribeFromConversation: (conversationId: string) => void;
- isSubscribedToConversation: (conversationId: string) => boolean;
- getEventsForConversation: (conversationId: string) => OpenHandsParsedEvent[];
-}
-
-const ConversationSubscriptionsContext =
- createContext<ConversationSubscriptionsContextType>({
- activeConversationIds: [],
- subscribeToConversation: () => {
- throw new Error("ConversationSubscriptionsProvider not initialized");
- },
- unsubscribeFromConversation: () => {
- throw new Error("ConversationSubscriptionsProvider not initialized");
- },
- isSubscribedToConversation: () => false,
- getEventsForConversation: () => [],
- });
-
-const isErrorEvent = (
- event: unknown,
-): event is { error: true; message: string } =>
- typeof event === "object" &&
- event !== null &&
- "error" in event &&
- event.error === true &&
- "message" in event &&
- typeof event.message === "string";
-
-const isAgentStatusError = (event: unknown): event is OpenHandsParsedEvent =>
- isOpenHandsEvent(event) &&
- isAgentStateChangeObservation(event) &&
- event.extras.agent_state === AgentState.ERROR;
-
-export function ConversationSubscriptionsProvider({
- children,
-}: React.PropsWithChildren) {
- const [activeConversationIds, setActiveConversationIds] = useState<string[]>(
- [],
- );
- const [conversationSockets, setConversationSockets] = useState<
- Record<string, ConversationSocket>
- >({});
- const eventHandlersRef = useRef<Record<string, (event: unknown) => void>>({});
-
- // Cleanup function to remove all subscriptions when component unmounts
- useEffect(
- () => () => {
- // Store the current sockets in a local variable to avoid closure issues
- const socketsToDisconnect = { ...conversationSockets };
-
- Object.values(socketsToDisconnect).forEach((socketData) => {
- if (socketData.socket) {
- socketData.socket.removeAllListeners();
- socketData.socket.disconnect();
- }
- });
- },
- [],
- );
-
- const unsubscribeFromConversation = useCallback((conversationId: string) => {
- // Use functional update to access current socket data and perform cleanup
- setConversationSockets((prev) => {
- const socketData = prev[conversationId];
-
- if (socketData) {
- const { socket } = socketData;
- const handler = eventHandlersRef.current[conversationId];
-
- if (socket) {
- if (handler) {
- socket.off("oh_event", handler);
- }
- socket.removeAllListeners();
- socket.disconnect();
- }
-
- // Clean up event handler reference
- delete eventHandlersRef.current[conversationId];
-
- // Remove the socket from state
- const newSockets = { ...prev };
- delete newSockets[conversationId];
- return newSockets;
- }
-
- return prev; // No change if socket not found
- });
-
- // Remove from active IDs
- setActiveConversationIds((prev) =>
- prev.filter((id) => id !== conversationId),
- );
- }, []);
-
- const subscribeToConversation = useCallback(
- (options: {
- conversationId: string;
- sessionApiKey: string | null;
- providersSet: Provider[];
- baseUrl: string;
- socketPath?: string;
- onEvent?: (event: unknown, conversationId: string) => void;
- }) => {
- const {
- conversationId,
- sessionApiKey,
- providersSet,
- baseUrl,
- socketPath,
- onEvent,
- } = options;
-
- // If already subscribed, don't create a new subscription
- if (conversationSockets[conversationId]) {
- return;
- }
-
- const handleOhEvent = (event: unknown) => {
- // Call the custom event handler if provided
- if (onEvent) {
- onEvent(event, conversationId);
- }
-
- // Update the events for this subscription
- if (isOpenHandsEvent(event)) {
- setConversationSockets((prev) => {
- // Make sure the conversation still exists in our state
- if (!prev[conversationId]) return prev;
-
- return {
- ...prev,
- [conversationId]: {
- ...prev[conversationId],
- events: [...(prev[conversationId]?.events || []), event],
- },
- };
- });
- }
-
- // Handle error events
- if (isErrorEvent(event) || isAgentStatusError(event)) {
- renderConversationErroredToast(
- conversationId,
- isErrorEvent(event) ? event.message : "MICROAGENT$UNKNOWN_ERROR",
- );
- } else if (isStatusUpdate(event)) {
- if (event.type === "info" && event.id === "STATUS$STARTING_RUNTIME") {
- renderConversationCreatedToast();
- }
- } else if (
- isOpenHandsEvent(event) &&
- isAgentStateChangeObservation(event)
- ) {
- if (event.extras.agent_state === AgentState.FINISHED) {
- renderConversationFinishedToast();
- unsubscribeFromConversation(conversationId);
- }
- }
- };
-
- // Store the event handler in ref for cleanup
- eventHandlersRef.current[conversationId] = handleOhEvent;
-
- try {
- // Create socket connection
- const socket = io(baseUrl, {
- transports: ["websocket"],
- path: socketPath ?? "/socket.io",
- query: {
- conversation_id: conversationId,
- session_api_key: sessionApiKey,
- providers_set: providersSet,
- },
- reconnection: true,
- reconnectionAttempts: 5,
- reconnectionDelay: 1000,
- });
-
- // Set up event listeners
- socket.on("connect", () => {
- setConversationSockets((prev) => {
- // Make sure the conversation still exists in our state
- if (!prev[conversationId]) return prev;
-
- return {
- ...prev,
- [conversationId]: {
- ...prev[conversationId],
- isConnected: true,
- },
- };
- });
- });
-
- socket.on("connect_error", (error) => {
- // eslint-disable-next-line no-console
- console.warn(
- `Socket for conversation ${conversationId} CONNECTION ERROR:`,
- error,
- );
- });
-
- socket.on("disconnect", (reason) => {
- // eslint-disable-next-line no-console
- console.warn(
- `Socket for conversation ${conversationId} DISCONNECTED! Reason:`,
- reason,
- );
- setConversationSockets((prev) => {
- // Make sure the conversation still exists in our state
- if (!prev[conversationId]) return prev;
-
- return {
- ...prev,
- [conversationId]: {
- ...prev[conversationId],
- isConnected: false,
- },
- };
- });
- });
-
- socket.on("oh_event", handleOhEvent);
-
- // Add the socket to our state first
- setConversationSockets((prev) => ({
- ...prev,
- [conversationId]: {
- socket,
- isConnected: socket.connected,
- events: [],
- },
- }));
-
- // Then add to active conversation IDs
- setActiveConversationIds((prev) =>
- prev.includes(conversationId) ? prev : [...prev, conversationId],
- );
- } catch {
- // Clean up the event handler if there was an error
- delete eventHandlersRef.current[conversationId];
- }
- },
- [conversationSockets],
- );
-
- const isSubscribedToConversation = useCallback(
- (conversationId: string) => !!conversationSockets[conversationId],
- [conversationSockets],
- );
-
- const getEventsForConversation = useCallback(
- (conversationId: string) =>
- conversationSockets[conversationId]?.events || [],
- [conversationSockets],
- );
-
- const value = React.useMemo(
- () => ({
- activeConversationIds,
- subscribeToConversation,
- unsubscribeFromConversation,
- isSubscribedToConversation,
- getEventsForConversation,
- }),
- [
- activeConversationIds,
- subscribeToConversation,
- unsubscribeFromConversation,
- isSubscribedToConversation,
- getEventsForConversation,
- ],
- );
-
- return (
- <ConversationSubscriptionsContext.Provider value={value}>
- {children}
- </ConversationSubscriptionsContext.Provider>
- );
-}
-
-export function useConversationSubscriptions() {
- return useContext(ConversationSubscriptionsContext);
-}
diff --git a/src/contexts/conversation-websocket-context.tsx b/src/contexts/conversation-websocket-context.tsx
index b080ffcfe9..2c86eebaca 100644
--- a/src/contexts/conversation-websocket-context.tsx
+++ b/src/contexts/conversation-websocket-context.tsx
@@ -13,11 +13,11 @@ import { useWebSocket, WebSocketHookOptions } from "#/hooks/use-websocket";
import { useEventStore } from "#/stores/use-event-store";
import { useErrorMessageStore } from "#/stores/error-message-store";
import { useOptimisticUserMessageStore } from "#/stores/optimistic-user-message-store";
-import { useV1ConversationStateStore } from "#/stores/v1-conversation-state-store";
+import { useConversationStateStore } from "#/stores/conversation-state-store";
import { useCommandStore } from "#/stores/command-store";
import { useBrowserStore } from "#/stores/browser-store";
import {
- isV1Event,
+ isAgentServerEvent,
isAgentErrorEvent,
isUserMessageEvent,
isActionEvent,
@@ -31,18 +31,18 @@ import {
isPlanningFileEditorObservationEvent,
isBrowserObservationEvent,
isBrowserNavigateActionEvent,
-} from "#/types/v1/type-guards";
-import { ConversationStateUpdateEventStats } from "#/types/v1/core/events/conversation-state-event";
+} from "#/types/agent-server/type-guards";
+import { ConversationStateUpdateEventStats } from "#/types/agent-server/core/events/conversation-state-event";
import type {
ConversationErrorEvent,
ServerErrorEvent,
-} from "#/types/v1/core/events/conversation-state-event";
+} from "#/types/agent-server/core/events/conversation-state-event";
import { handleActionEventCacheInvalidation } from "#/utils/cache-utils";
import { buildWebSocketUrl } from "#/utils/websocket-url";
import type {
- V1AppConversation,
- V1SendMessageRequest,
-} from "#/api/conversation-service/v1-conversation-service.types";
+ AppConversation,
+ SendMessageRequest,
+} from "#/api/conversation-service/agent-server-conversation-service.types";
import EventService from "#/api/event-service/event-service.api";
import PendingMessageService from "#/api/pending-message-service/pending-message-service.api";
import { useConversationStore } from "#/stores/conversation-store";
@@ -53,7 +53,7 @@ import { useConversationHistory } from "#/hooks/query/use-conversation-history";
import { setConversationState } from "#/utils/conversation-local-storage";
// eslint-disable-next-line @typescript-eslint/naming-convention
-export type V1_WebSocketConnectionState =
+export type WebSocketConnectionState =
| "CONNECTING"
| "OPEN"
| "CLOSED"
@@ -64,8 +64,8 @@ interface SendMessageResult {
}
interface ConversationWebSocketContextType {
- connectionState: V1_WebSocketConnectionState;
- sendMessage: (message: V1SendMessageRequest) => Promise<SendMessageResult>;
+ connectionState: WebSocketConnectionState;
+ sendMessage: (message: SendMessageRequest) => Promise<SendMessageResult>;
isLoadingHistory: boolean;
}
@@ -85,14 +85,14 @@ export function ConversationWebSocketProvider({
conversationId?: string;
conversationUrl?: string | null;
sessionApiKey?: string | null;
- subConversations?: V1AppConversation[];
+ subConversations?: AppConversation[];
subConversationIds?: string[];
}) {
// Separate connection state tracking for each WebSocket
const [mainConnectionState, setMainConnectionState] =
- useState<V1_WebSocketConnectionState>("CONNECTING");
+ useState<WebSocketConnectionState>("CONNECTING");
const [planningConnectionState, setPlanningConnectionState] =
- useState<V1_WebSocketConnectionState>("CONNECTING");
+ useState<WebSocketConnectionState>("CONNECTING");
// Track if we've ever successfully connected for each connection
// Don't show errors until after first successful connection
@@ -104,7 +104,7 @@ export function ConversationWebSocketProvider({
const { addEvent } = useEventStore();
const { setErrorMessage, removeErrorMessage } = useErrorMessageStore();
const { removeOptimisticUserMessage } = useOptimisticUserMessageStore();
- const { setExecutionStatus } = useV1ConversationStateStore();
+ const { setExecutionStatus } = useConversationStateStore();
const { appendInput, appendOutput } = useCommandStore();
// History loading state - separate per connection
@@ -204,7 +204,7 @@ export function ConversationWebSocketProvider({
}, [subConversations]);
// Merged connection state - reflects combined status of both connections
- const connectionState = useMemo<V1_WebSocketConnectionState>(() => {
+ const connectionState = useMemo<WebSocketConnectionState>(() => {
// If planning agent connection doesn't exist, use main connection state
if (!planningAgentWsUrl) {
return mainConnectionState;
@@ -354,7 +354,7 @@ export function ConversationWebSocketProvider({
}
// Use type guard to validate v1 event structure
- if (isV1Event(event)) {
+ if (isAgentServerEvent(event)) {
addEvent(event);
// Handle displayable error events - show error banner
@@ -498,7 +498,7 @@ export function ConversationWebSocketProvider({
}
// Use type guard to validate v1 event structure
- if (isV1Event(event)) {
+ if (isAgentServerEvent(event)) {
// Mark this event as coming from the planning agent
const eventWithPlanningFlag = {
...event,
@@ -794,7 +794,7 @@ export function ConversationWebSocketProvider({
// V1 send message function via WebSocket
// Falls back to REST API queue when WebSocket is not connected
const sendMessage = useCallback(
- async (message: V1SendMessageRequest): Promise<SendMessageResult> => {
+ async (message: SendMessageRequest): Promise<SendMessageResult> => {
const currentMode = useConversationStore.getState().conversationMode;
const currentSocket =
currentMode === "plan" ? planningAgentSocket : mainSocket;
diff --git a/src/hooks/chat/use-btw-interceptor.ts b/src/hooks/chat/use-btw-interceptor.ts
index ee139f3fb2..89fdfb2b98 100644
--- a/src/hooks/chat/use-btw-interceptor.ts
+++ b/src/hooks/chat/use-btw-interceptor.ts
@@ -1,5 +1,5 @@
import { useCallback } from "react";
-import { askV1Agent } from "#/hooks/mutation/conversation-mutation-utils";
+import { askAgent } from "#/hooks/mutation/conversation-mutation-utils";
import { useBtwStore } from "#/stores/btw-store";
import { BTW_COMMAND } from "#/utils/constants";
@@ -8,7 +8,7 @@ const BTW_PREFIX = `${BTW_COMMAND} `;
/**
* Intercepts "/btw <question>" submissions and routes them through the
* ask_agent side-channel. Everything else falls through to `onSubmit`.
- * Passthrough when `conversationId` is null (e.g. V0 conversations).
+ * Passthrough when `conversationId` is null.
*/
export const useBtwInterceptor = (
conversationId: string | null | undefined,
@@ -30,7 +30,7 @@ export const useBtwInterceptor = (
if (!question) return;
const entryId = addPending(conversationId, question);
- askV1Agent(conversationId, question)
+ askAgent(conversationId, question)
.then(({ response }) => resolve(conversationId, entryId, response))
.catch((err) =>
fail(conversationId, entryId, err?.message ?? "Failed to ask agent"),
diff --git a/src/hooks/chat/use-slash-command.ts b/src/hooks/chat/use-slash-command.ts
index 9678d315f8..273357d494 100644
--- a/src/hooks/chat/use-slash-command.ts
+++ b/src/hooks/chat/use-slash-command.ts
@@ -1,6 +1,6 @@
import { useState, useCallback, useEffect, useMemo, useRef } from "react";
import { useConversationSkills } from "#/hooks/query/use-conversation-skills";
-import { Skill } from "#/api/conversation-service/v1-conversation-service.types";
+import { Skill } from "#/api/conversation-service/agent-server-conversation-service.types";
import { Microagent } from "#/api/open-hands.types";
import { BUILT_IN_COMMANDS } from "#/utils/constants";
import { useActiveBackend } from "#/contexts/active-backend-context";
diff --git a/src/hooks/mutation/conversation-mutation-utils.test.ts b/src/hooks/mutation/conversation-mutation-utils.test.ts
index e884358715..894842acf4 100644
--- a/src/hooks/mutation/conversation-mutation-utils.test.ts
+++ b/src/hooks/mutation/conversation-mutation-utils.test.ts
@@ -1,10 +1,10 @@
import { describe, expect, it } from "vitest";
import { QueryClient } from "@tanstack/react-query";
import { updateConversationExecutionStatusInCache } from "./conversation-mutation-utils";
-import { V1ExecutionStatus } from "#/types/v1/core/base/common";
-import { V1AppConversation } from "#/api/conversation-service/v1-conversation-service.types";
+import { ExecutionStatus } from "#/types/agent-server/core/base/common";
+import { AppConversation } from "#/api/conversation-service/agent-server-conversation-service.types";
-const createConversation = (): V1AppConversation => ({
+const createConversation = (): AppConversation => ({
id: "conversation-1",
created_by_user_id: null,
selected_repository: null,
@@ -17,7 +17,7 @@ const createConversation = (): V1AppConversation => ({
metrics: null,
created_at: "2026-04-16T00:00:00Z",
updated_at: "2026-04-16T00:00:00Z",
- execution_status: V1ExecutionStatus.RUNNING,
+ execution_status: ExecutionStatus.RUNNING,
conversation_url: "http://localhost:3000/api/conversations/conversation-1",
session_api_key: "session-key",
sandbox_id: null,
@@ -37,17 +37,17 @@ describe("updateConversationExecutionStatusInCache", () => {
updateConversationExecutionStatusInCache(
queryClient,
conversation.id,
- V1ExecutionStatus.PAUSED,
+ ExecutionStatus.PAUSED,
);
expect(
- queryClient.getQueryData<V1AppConversation | null>([
+ queryClient.getQueryData<AppConversation | null>([
"user",
"conversation",
conversation.id,
]),
).toMatchObject({
- execution_status: V1ExecutionStatus.PAUSED,
+ execution_status: ExecutionStatus.PAUSED,
});
});
});
diff --git a/src/hooks/mutation/conversation-mutation-utils.ts b/src/hooks/mutation/conversation-mutation-utils.ts
index 12797d2ddf..e85b8a1a20 100644
--- a/src/hooks/mutation/conversation-mutation-utils.ts
+++ b/src/hooks/mutation/conversation-mutation-utils.ts
@@ -1,19 +1,19 @@
import { QueryClient } from "@tanstack/react-query";
import { getActiveBackend } from "#/api/backend-registry/active-store";
import { pauseCloudSandbox } from "#/api/cloud/conversation-service.api";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
-import { V1AppConversation } from "#/api/conversation-service/v1-conversation-service.types";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
+import { AppConversation } from "#/api/conversation-service/agent-server-conversation-service.types";
-type ExecutionStatusValue = V1AppConversation["execution_status"];
+type ExecutionStatusValue = AppConversation["execution_status"];
-const fetchV1ConversationData = async (
+const fetchConversationData = async (
conversationId: string,
): Promise<{
conversationUrl: string | null;
sessionApiKey: string | null;
sandboxId: string | null;
}> => {
- const conversations = await V1ConversationService.batchGetAppConversations([
+ const conversations = await AgentServerConversationService.batchGetAppConversations([
conversationId,
]);
@@ -29,9 +29,9 @@ const fetchV1ConversationData = async (
};
};
-export const pauseV1Conversation = async (conversationId: string) => {
+export const pauseConversation = async (conversationId: string) => {
const { conversationUrl, sessionApiKey, sandboxId } =
- await fetchV1ConversationData(conversationId);
+ await fetchConversationData(conversationId);
if (getActiveBackend().backend.kind === "cloud") {
if (!sandboxId) {
@@ -43,7 +43,7 @@ export const pauseV1Conversation = async (conversationId: string) => {
return { success: true };
}
- return V1ConversationService.pauseConversation(
+ return AgentServerConversationService.pauseConversation(
conversationId,
conversationUrl,
sessionApiKey,
@@ -53,13 +53,13 @@ export const pauseV1Conversation = async (conversationId: string) => {
/**
* Ask the agent a side question on a V1 conversation
*/
-export const askV1Agent = async (
+export const askAgent = async (
conversationId: string,
question: string,
): Promise<{ response: string }> => {
const { conversationUrl, sessionApiKey } =
- await fetchV1ConversationData(conversationId);
- return V1ConversationService.askAgent(
+ await fetchConversationData(conversationId);
+ return AgentServerConversationService.askAgent(
conversationId,
conversationUrl,
question,
@@ -67,10 +67,10 @@ export const askV1Agent = async (
);
};
-export const resumeV1Conversation = async (conversationId: string) => {
+export const resumeConversation = async (conversationId: string) => {
const { conversationUrl, sessionApiKey } =
- await fetchV1ConversationData(conversationId);
- return V1ConversationService.resumeConversation(
+ await fetchConversationData(conversationId);
+ return AgentServerConversationService.resumeConversation(
conversationId,
conversationUrl,
sessionApiKey,
@@ -82,7 +82,7 @@ export const updateConversationExecutionStatusInCache = (
conversationId: string,
execution_status: ExecutionStatusValue,
): void => {
- queryClient.setQueryData<V1AppConversation | null>(
+ queryClient.setQueryData<AppConversation | null>(
["user", "conversation", conversationId],
(oldData) => {
if (!oldData) return oldData;
diff --git a/src/hooks/mutation/use-v1-upload-files.ts b/src/hooks/mutation/use-conversation-upload-files.ts
similarity index 89%
rename from src/hooks/mutation/use-v1-upload-files.ts
rename to src/hooks/mutation/use-conversation-upload-files.ts
index 564dde4479..fba7b5d552 100644
--- a/src/hooks/mutation/use-v1-upload-files.ts
+++ b/src/hooks/mutation/use-conversation-upload-files.ts
@@ -1,8 +1,8 @@
import { useMutation } from "@tanstack/react-query";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
import { FileUploadSuccessResponse } from "#/api/open-hands.types";
-interface V1UploadFilesVariables {
+interface UploadFilesVariables {
conversationUrl: string | null | undefined;
sessionApiKey: string | null | undefined;
files: File[];
@@ -14,11 +14,11 @@ interface V1UploadFilesVariables {
*
* @returns Mutation hook with mutateAsync function
*/
-export const useV1UploadFiles = () =>
+export const useConversationUploadFiles = () =>
useMutation({
mutationKey: ["v1-upload-files"],
mutationFn: async (
- variables: V1UploadFilesVariables,
+ variables: UploadFilesVariables,
): Promise<FileUploadSuccessResponse> => {
const { conversationUrl, sessionApiKey, files } = variables;
@@ -27,7 +27,7 @@ export const useV1UploadFiles = () =>
try {
// Upload to /workspace/{filename}
const filePath = `/workspace/${file.name}`;
- await V1ConversationService.uploadFile(
+ await AgentServerConversationService.uploadFile(
conversationUrl,
sessionApiKey,
file,
diff --git a/src/hooks/mutation/use-create-conversation.ts b/src/hooks/mutation/use-create-conversation.ts
index 7e1f531a20..445b53b2b7 100644
--- a/src/hooks/mutation/use-create-conversation.ts
+++ b/src/hooks/mutation/use-create-conversation.ts
@@ -1,6 +1,6 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
-import { PluginSpec } from "#/api/conversation-service/v1-conversation-service.types";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
+import { PluginSpec } from "#/api/conversation-service/agent-server-conversation-service.types";
import { SuggestedTask } from "#/utils/types";
import { Provider } from "#/types/settings";
import { useTracking } from "#/hooks/use-tracking";
@@ -20,13 +20,11 @@ interface CreateConversationVariables {
workingDir?: string;
}
-// Response type for V1 conversations
interface CreateConversationResponse {
conversation_id: string;
session_api_key: string | null;
url: string | null;
- v1_task_id?: string;
- is_v1?: boolean;
+ task_id?: string;
}
export const useCreateConversation = () => {
@@ -48,7 +46,7 @@ export const useCreateConversation = () => {
agentType,
} = variables;
- const conversation = await V1ConversationService.createConversation(
+ const conversation = await AgentServerConversationService.createConversation(
query,
conversationInstructions,
plugins,
@@ -77,8 +75,7 @@ export const useCreateConversation = () => {
conversation_id: conversationId,
session_api_key: null,
url: conversation.agent_server_url,
- v1_task_id: conversation.id,
- is_v1: true,
+ task_id: conversation.id,
};
},
onSuccess: async (_, { repository }) => {
diff --git a/src/hooks/mutation/use-delete-conversation.ts b/src/hooks/mutation/use-delete-conversation.ts
index 2bbd921f2f..0f026ce91e 100644
--- a/src/hooks/mutation/use-delete-conversation.ts
+++ b/src/hooks/mutation/use-delete-conversation.ts
@@ -1,5 +1,5 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
import { clearConversationLocalStorage } from "#/utils/conversation-local-storage";
export const useDeleteConversation = () => {
@@ -7,7 +7,7 @@ export const useDeleteConversation = () => {
return useMutation({
mutationFn: (variables: { conversationId: string }) =>
- V1ConversationService.deleteConversation(variables.conversationId),
+ AgentServerConversationService.deleteConversation(variables.conversationId),
onMutate: async (variables) => {
await queryClient.cancelQueries({ queryKey: ["user", "conversations"] });
const previousConversations = queryClient.getQueryData([
diff --git a/src/hooks/mutation/use-new-conversation-command.ts b/src/hooks/mutation/use-new-conversation-command.ts
index 65e448dde0..096775d94f 100644
--- a/src/hooks/mutation/use-new-conversation-command.ts
+++ b/src/hooks/mutation/use-new-conversation-command.ts
@@ -2,7 +2,7 @@ import { useMutation, useQueryClient } from "@tanstack/react-query";
import { useTranslation } from "react-i18next";
import toast from "react-hot-toast";
import { I18nKey } from "#/i18n/declaration";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
import {
displayErrorToast,
displaySuccessToast,
@@ -26,7 +26,7 @@ export const useNewConversationCommand = () => {
// /new reuses the parent conversation's sandbox (matches OpenHands
// SaaS behavior); it is NOT a sub-conversation, so parent_conversation_id
// and agent_type stay undefined.
- const startTask = await V1ConversationService.createConversation(
+ const startTask = await AgentServerConversationService.createConversation(
undefined,
undefined,
undefined,
diff --git a/src/hooks/mutation/use-v1-pause-conversation.ts b/src/hooks/mutation/use-pause-conversation.ts
similarity index 87%
rename from src/hooks/mutation/use-v1-pause-conversation.ts
rename to src/hooks/mutation/use-pause-conversation.ts
index 810fdab4d3..bdc4725afe 100644
--- a/src/hooks/mutation/use-v1-pause-conversation.ts
+++ b/src/hooks/mutation/use-pause-conversation.ts
@@ -1,12 +1,12 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { pauseV1Conversation } from "./conversation-mutation-utils";
+import { pauseConversation } from "./conversation-mutation-utils";
-export const useV1PauseConversation = () => {
+export const usePauseConversation = () => {
const queryClient = useQueryClient();
return useMutation({
mutationFn: (variables: { conversationId: string }) =>
- pauseV1Conversation(variables.conversationId),
+ pauseConversation(variables.conversationId),
onMutate: async () => {
await queryClient.cancelQueries({ queryKey: ["user", "conversations"] });
const previousConversations = queryClient.getQueryData([
diff --git a/src/hooks/mutation/use-read-conversation-file.ts b/src/hooks/mutation/use-read-conversation-file.ts
index 5dd8c51eb9..443359a520 100644
--- a/src/hooks/mutation/use-read-conversation-file.ts
+++ b/src/hooks/mutation/use-read-conversation-file.ts
@@ -1,5 +1,5 @@
import { useMutation } from "@tanstack/react-query";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
interface UseReadConversationFileVariables {
conversationId: string;
@@ -13,5 +13,5 @@ export const useReadConversationFile = () =>
conversationId,
filePath,
}: UseReadConversationFileVariables): Promise<string> =>
- V1ConversationService.readConversationFile(conversationId, filePath),
+ AgentServerConversationService.readConversationFile(conversationId, filePath),
});
diff --git a/src/hooks/mutation/use-v1-resume-conversation.ts b/src/hooks/mutation/use-resume-conversation.ts
similarity index 86%
rename from src/hooks/mutation/use-v1-resume-conversation.ts
rename to src/hooks/mutation/use-resume-conversation.ts
index 8520ff5d82..c2d74e2ab4 100644
--- a/src/hooks/mutation/use-v1-resume-conversation.ts
+++ b/src/hooks/mutation/use-resume-conversation.ts
@@ -1,12 +1,12 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { resumeV1Conversation } from "./conversation-mutation-utils";
+import { resumeConversation } from "./conversation-mutation-utils";
-export const useV1ResumeConversation = () => {
+export const useResumeConversation = () => {
const queryClient = useQueryClient();
return useMutation({
mutationFn: (variables: { conversationId: string }) =>
- resumeV1Conversation(variables.conversationId),
+ resumeConversation(variables.conversationId),
onMutate: async () => {
await queryClient.cancelQueries({ queryKey: ["user", "conversations"] });
const previousConversations = queryClient.getQueryData([
diff --git a/src/hooks/mutation/use-unified-start-conversation.ts b/src/hooks/mutation/use-unified-start-conversation.ts
index 04892a3d37..0b3ba345f8 100644
--- a/src/hooks/mutation/use-unified-start-conversation.ts
+++ b/src/hooks/mutation/use-unified-start-conversation.ts
@@ -1,9 +1,9 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { Provider } from "#/types/settings";
import { useErrorMessageStore } from "#/stores/error-message-store";
-import { V1ExecutionStatus } from "#/types/v1/core";
+import { ExecutionStatus } from "#/types/agent-server/core";
import {
- resumeV1Conversation,
+ resumeConversation,
updateConversationExecutionStatusInCache,
invalidateConversationQueries,
} from "./conversation-mutation-utils";
@@ -19,7 +19,7 @@ export const useUnifiedResumeConversation = () => {
mutationFn: async (variables: {
conversationId: string;
providers?: Provider[];
- }) => resumeV1Conversation(variables.conversationId),
+ }) => resumeConversation(variables.conversationId),
onMutate: async () => {
await queryClient.cancelQueries({ queryKey: ["user", "conversations"] });
const previousConversations = queryClient.getQueryData([
@@ -46,7 +46,7 @@ export const useUnifiedResumeConversation = () => {
updateConversationExecutionStatusInCache(
queryClient,
variables.conversationId,
- V1ExecutionStatus.RUNNING,
+ ExecutionStatus.RUNNING,
);
},
});
diff --git a/src/hooks/mutation/use-unified-stop-conversation.ts b/src/hooks/mutation/use-unified-stop-conversation.ts
index 49d34c95ef..e044e57589 100644
--- a/src/hooks/mutation/use-unified-stop-conversation.ts
+++ b/src/hooks/mutation/use-unified-stop-conversation.ts
@@ -4,9 +4,9 @@ import { useTranslation } from "react-i18next";
import { TOAST_OPTIONS } from "#/utils/custom-toast-handlers";
import { useNavigation } from "#/context/navigation-context";
import { I18nKey } from "#/i18n/declaration";
-import { V1ExecutionStatus } from "#/types/v1/core";
+import { ExecutionStatus } from "#/types/agent-server/core";
import {
- pauseV1Conversation,
+ pauseConversation,
updateConversationExecutionStatusInCache,
} from "./conversation-mutation-utils";
@@ -18,7 +18,7 @@ export const useUnifiedPauseConversation = () => {
return useMutation({
mutationKey: ["stop-conversation"],
mutationFn: async (variables: { conversationId: string }) =>
- pauseV1Conversation(variables.conversationId),
+ pauseConversation(variables.conversationId),
onMutate: async () => {
const toastId = toast.loading(
t(I18nKey.TOAST$STOPPING_CONVERSATION),
@@ -55,7 +55,7 @@ export const useUnifiedPauseConversation = () => {
updateConversationExecutionStatusInCache(
queryClient,
variables.conversationId,
- V1ExecutionStatus.PAUSED,
+ ExecutionStatus.PAUSED,
);
if (currentConversationId === variables.conversationId) {
diff --git a/src/hooks/mutation/use-unified-upload-files.ts b/src/hooks/mutation/use-unified-upload-files.ts
index 9862ad4157..bb4e0cf61a 100644
--- a/src/hooks/mutation/use-unified-upload-files.ts
+++ b/src/hooks/mutation/use-unified-upload-files.ts
@@ -1,6 +1,6 @@
import { useMutation } from "@tanstack/react-query";
import { useActiveConversation } from "#/hooks/query/use-active-conversation";
-import { useV1UploadFiles } from "./use-v1-upload-files";
+import { useConversationUploadFiles } from "./use-conversation-upload-files";
import { FileUploadSuccessResponse } from "#/api/open-hands.types";
interface UnifiedUploadFilesVariables {
@@ -9,21 +9,13 @@ interface UnifiedUploadFilesVariables {
}
/**
- * Unified hook that automatically selects the correct file upload method
- * based on the conversation version (V0 or V1).
- *
- * For V0 conversations: Uses the legacy multi-file upload endpoint
- * For V1 conversations: Uses parallel single-file uploads
- *
- * @returns Mutation hook with the same interface as useUploadFiles
+ * Uploads files for the active agent-server conversation.
*/
export const useUnifiedUploadFiles = () => {
const { data: conversation } = useActiveConversation();
- // Initialize both hooks
- const v1Upload = useV1UploadFiles();
+ const conversationUpload = useConversationUploadFiles();
- // Create a unified mutation that delegates to the appropriate hook
return useMutation({
mutationKey: ["unified-upload-files"],
mutationFn: async (
@@ -31,8 +23,8 @@ export const useUnifiedUploadFiles = () => {
): Promise<FileUploadSuccessResponse> => {
const { files } = variables;
- // V1: Use conversation URL and session API key
- return v1Upload.mutateAsync({
+ // Use conversation URL and session API key
+ return conversationUpload.mutateAsync({
conversationUrl: conversation?.conversation_url,
sessionApiKey: conversation?.session_api_key,
files,
diff --git a/src/hooks/mutation/use-update-conversation-public-flag.ts b/src/hooks/mutation/use-update-conversation-public-flag.ts
index 6ff3ef17d8..57c3106815 100644
--- a/src/hooks/mutation/use-update-conversation-public-flag.ts
+++ b/src/hooks/mutation/use-update-conversation-public-flag.ts
@@ -1,6 +1,6 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { useTranslation } from "react-i18next";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
import { I18nKey } from "#/i18n/declaration";
import {
displaySuccessToast,
@@ -13,7 +13,7 @@ export const useUpdateConversationPublicFlag = () => {
return useMutation({
mutationFn: (variables: { conversationId: string; isPublic: boolean }) =>
- V1ConversationService.updateConversationPublicFlag(
+ AgentServerConversationService.updateConversationPublicFlag(
variables.conversationId,
variables.isPublic,
),
diff --git a/src/hooks/mutation/use-update-conversation-repository.ts b/src/hooks/mutation/use-update-conversation-repository.ts
index cd8229a683..644922f34c 100644
--- a/src/hooks/mutation/use-update-conversation-repository.ts
+++ b/src/hooks/mutation/use-update-conversation-repository.ts
@@ -1,6 +1,6 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { useTranslation } from "react-i18next";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
import { I18nKey } from "#/i18n/declaration";
import {
displaySuccessToast,
@@ -21,7 +21,7 @@ export const useUpdateConversationRepository = () => {
return useMutation({
mutationFn: (variables: UpdateRepositoryVariables) =>
- V1ConversationService.updateConversationRepository(
+ AgentServerConversationService.updateConversationRepository(
variables.conversationId,
variables.repository,
variables.branch,
diff --git a/src/hooks/mutation/use-update-conversation.ts b/src/hooks/mutation/use-update-conversation.ts
index 8793951320..bd3977ef56 100644
--- a/src/hooks/mutation/use-update-conversation.ts
+++ b/src/hooks/mutation/use-update-conversation.ts
@@ -1,12 +1,12 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
export const useUpdateConversation = () => {
const queryClient = useQueryClient();
return useMutation({
mutationFn: (variables: { conversationId: string; newTitle: string }) =>
- V1ConversationService.updateConversationTitle(
+ AgentServerConversationService.updateConversationTitle(
variables.conversationId,
variables.newTitle,
),
diff --git a/src/hooks/query/use-batch-app-conversations.ts b/src/hooks/query/use-batch-app-conversations.ts
index 0218359450..3dab66c6bb 100644
--- a/src/hooks/query/use-batch-app-conversations.ts
+++ b/src/hooks/query/use-batch-app-conversations.ts
@@ -1,10 +1,10 @@
import { useQuery } from "@tanstack/react-query";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
export const useBatchAppConversations = (ids: string[]) =>
useQuery({
queryKey: ["v1-batch-get-app-conversations", ids],
- queryFn: () => V1ConversationService.batchGetAppConversations(ids),
+ queryFn: () => AgentServerConversationService.batchGetAppConversations(ids),
enabled: ids.length > 0,
staleTime: 1000 * 60 * 5, // 5 minutes
gcTime: 1000 * 60 * 15, // 15 minutes
diff --git a/src/hooks/query/use-conversation-history.ts b/src/hooks/query/use-conversation-history.ts
index 061c55c64c..8bfe83b201 100644
--- a/src/hooks/query/use-conversation-history.ts
+++ b/src/hooks/query/use-conversation-history.ts
@@ -21,7 +21,7 @@ export const useConversationHistory = (conversationId?: string) => {
// Forward the conversation's owning host + session key so cloud
// conversations hit their cloud sandbox instead of falling back
// to the bundled local agent-server.
- return EventService.searchEventsV1(
+ return EventService.searchEvents(
conversationId,
100,
conversation?.conversation_url ?? null,
diff --git a/src/hooks/query/use-conversation-hooks.ts b/src/hooks/query/use-conversation-hooks.ts
index 7f18fab0ba..16fe4583e3 100644
--- a/src/hooks/query/use-conversation-hooks.ts
+++ b/src/hooks/query/use-conversation-hooks.ts
@@ -1,33 +1,25 @@
import { useQuery } from "@tanstack/react-query";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
import { useConversationId } from "../use-conversation-id";
import { AgentState } from "#/types/agent-state";
import { useAgentState } from "#/hooks/use-agent-state";
-import { useSettings } from "./use-settings";
export const useConversationHooks = () => {
const { conversationId } = useConversationId();
const { curAgentState } = useAgentState();
- const { data: settings } = useSettings();
-
return useQuery({
- queryKey: ["conversation", conversationId, "hooks", settings?.v1_enabled],
+ queryKey: ["conversation", conversationId, "hooks"],
queryFn: async () => {
if (!conversationId) {
throw new Error("No conversation ID provided");
}
- // Hooks are only available for V1 conversations
- if (!settings?.v1_enabled) {
- return [];
- }
-
- const data = await V1ConversationService.getHooks(conversationId);
+ const data =
+ await AgentServerConversationService.getHooks(conversationId);
return data.hooks;
},
enabled:
!!conversationId &&
- !!settings?.v1_enabled &&
curAgentState !== AgentState.LOADING &&
curAgentState !== AgentState.INIT,
staleTime: 1000 * 60 * 5, // 5 minutes
diff --git a/src/hooks/query/use-conversation-metrics.ts b/src/hooks/query/use-conversation-metrics.ts
index e4e427a5f5..aab0be3fd7 100644
--- a/src/hooks/query/use-conversation-metrics.ts
+++ b/src/hooks/query/use-conversation-metrics.ts
@@ -1,7 +1,7 @@
import { useQuery } from "@tanstack/react-query";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
import { getCombinedMetrics } from "#/utils/conversation-metrics";
-import type { V1MetricsSnapshot } from "#/api/conversation-service/v1-conversation-service.types";
+import type { MetricsSnapshot } from "#/api/conversation-service/agent-server-conversation-service.types";
export const useConversationMetrics = (
conversationId: string | null | undefined,
@@ -9,7 +9,7 @@ export const useConversationMetrics = (
sessionApiKey: string | null | undefined,
enabled: boolean = true,
): {
- data: V1MetricsSnapshot | undefined;
+ data: MetricsSnapshot | undefined;
isLoading: boolean;
error: unknown;
} => {
@@ -23,7 +23,7 @@ export const useConversationMetrics = (
queryFn: async () => {
if (!conversationId) throw new Error("Conversation ID is required");
const conversationInfo =
- await V1ConversationService.getRuntimeConversation(
+ await AgentServerConversationService.getRuntimeConversation(
conversationId,
conversationUrl,
sessionApiKey,
diff --git a/src/hooks/query/use-conversation-skills.ts b/src/hooks/query/use-conversation-skills.ts
index bd8f25a1b0..2210a91183 100644
--- a/src/hooks/query/use-conversation-skills.ts
+++ b/src/hooks/query/use-conversation-skills.ts
@@ -1,5 +1,5 @@
import { useQuery } from "@tanstack/react-query";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
import { useConversationId } from "../use-conversation-id";
import { useActiveConversation } from "./use-active-conversation";
@@ -15,7 +15,7 @@ export const useConversationSkills = () => {
}
// Check if V1 is enabled and use the appropriate API
- const data = await V1ConversationService.getSkills(conversationId);
+ const data = await AgentServerConversationService.getSkills(conversationId);
return data.skills;
},
enabled: !!executionStatus,
diff --git a/src/hooks/query/use-paginated-conversations.ts b/src/hooks/query/use-paginated-conversations.ts
index cce8b0721b..4e2fb3a5ec 100644
--- a/src/hooks/query/use-paginated-conversations.ts
+++ b/src/hooks/query/use-paginated-conversations.ts
@@ -1,8 +1,8 @@
import { useInfiniteQuery } from "@tanstack/react-query";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
import { useIsAuthed } from "./use-is-authed";
import { useActiveBackend } from "#/contexts/active-backend-context";
-import { V1AppConversationPage } from "#/api/conversation-service/v1-conversation-service.types";
+import { AppConversationPage } from "#/api/conversation-service/agent-server-conversation-service.types";
export const usePaginatedConversations = (limit: number = 20) => {
const { data: userIsAuthenticated } = useIsAuthed();
@@ -22,7 +22,7 @@ export const usePaginatedConversations = (limit: number = 20) => {
active.orgId,
],
queryFn: async ({ pageParam }) => {
- const result = await V1ConversationService.searchConversations(
+ const result = await AgentServerConversationService.searchConversations(
limit,
pageParam,
);
@@ -30,7 +30,7 @@ export const usePaginatedConversations = (limit: number = 20) => {
return result;
},
enabled: !!userIsAuthenticated,
- getNextPageParam: (lastPage: V1AppConversationPage) =>
+ getNextPageParam: (lastPage: AppConversationPage) =>
lastPage.next_page_id,
initialPageParam: undefined as string | undefined,
});
diff --git a/src/hooks/query/use-settings.ts b/src/hooks/query/use-settings.ts
index e5e88d8390..73f73979d0 100644
--- a/src/hooks/query/use-settings.ts
+++ b/src/hooks/query/use-settings.ts
@@ -106,7 +106,6 @@ const normalizeSettingsResponse = (settings: Partial<Settings>): Settings => {
is_new_user: false,
disabled_skills:
settings.disabled_skills ?? DEFAULT_SETTINGS.disabled_skills,
- v1_enabled: settings.v1_enabled ?? DEFAULT_SETTINGS.v1_enabled,
agent_settings_schema: settings.agent_settings_schema ?? null,
agent_settings: settings.agent_settings ?? DEFAULT_SETTINGS.agent_settings,
conversation_settings_schema:
diff --git a/src/hooks/query/use-start-tasks.ts b/src/hooks/query/use-start-tasks.ts
index b9b6d8fb66..9a3f2e88ab 100644
--- a/src/hooks/query/use-start-tasks.ts
+++ b/src/hooks/query/use-start-tasks.ts
@@ -1,18 +1,23 @@
import { useQuery } from "@tanstack/react-query";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
-import { useSettings } from "#/hooks/query/use-settings";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
-export const useStartTasks = (limit = 10) => {
- const { data: settings } = useSettings();
- const isV1Enabled = settings?.v1_enabled;
-
- return useQuery({
+/**
+ * Hook to fetch in-progress conversation start tasks
+ *
+ * Use case: Show tasks that are provisioning sandboxes, cloning repos, etc.
+ * These are conversations that started but haven't reached READY or ERROR status yet.
+ *
+ * Note: Filters out READY and ERROR status tasks client-side since backend doesn't support status filtering.
+ *
+ * @param limit Maximum number of tasks to return (max 100)
+ * @returns Query result with array of in-progress start tasks
+ */
+export const useStartTasks = (limit = 10) =>
+ useQuery({
queryKey: ["start-tasks", "search", limit],
- queryFn: () => V1ConversationService.searchStartTasks(limit),
- enabled: isV1Enabled,
+ queryFn: () => AgentServerConversationService.searchStartTasks(limit),
select: (tasks) =>
tasks.filter(
(task) => task.status !== "READY" && task.status !== "ERROR",
),
});
-};
diff --git a/src/hooks/query/use-sub-conversation-task-polling.ts b/src/hooks/query/use-sub-conversation-task-polling.ts
index c97fb729fa..529a259429 100644
--- a/src/hooks/query/use-sub-conversation-task-polling.ts
+++ b/src/hooks/query/use-sub-conversation-task-polling.ts
@@ -1,5 +1,5 @@
import { useQuery } from "@tanstack/react-query";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
/**
* Hook that polls V1 sub-conversation start tasks.
@@ -28,7 +28,7 @@ export const useSubConversationTaskPolling = (
queryKey: ["sub-conversation-task", taskId],
queryFn: async () => {
if (!taskId) return null;
- return V1ConversationService.getStartTask(taskId);
+ return AgentServerConversationService.getStartTask(taskId);
},
enabled: !!taskId && !!parentConversationId,
refetchInterval: (query) => {
diff --git a/src/hooks/query/use-sub-conversations.ts b/src/hooks/query/use-sub-conversations.ts
index 53e6c84d45..adba820cbf 100644
--- a/src/hooks/query/use-sub-conversations.ts
+++ b/src/hooks/query/use-sub-conversations.ts
@@ -1,6 +1,6 @@
import { useQuery } from "@tanstack/react-query";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
-import { V1AppConversation } from "#/api/conversation-service/v1-conversation-service.types";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
+import { AppConversation } from "#/api/conversation-service/agent-server-conversation-service.types";
const FIVE_MINUTES = 1000 * 60 * 5;
const FIFTEEN_MINUTES = 1000 * 60 * 15;
@@ -23,13 +23,13 @@ export const useSubConversations = (
) => {
const ids = subConversationIds || [];
- return useQuery<(V1AppConversation | null)[]>({
+ return useQuery<(AppConversation | null)[]>({
queryKey: ["v1", "sub-conversations", ids],
queryFn: async () => {
if (ids.length === 0) {
return [];
}
- return V1ConversationService.batchGetAppConversations(ids);
+ return AgentServerConversationService.batchGetAppConversations(ids);
},
enabled: ids.length > 0,
staleTime: FIVE_MINUTES,
diff --git a/src/hooks/query/use-task-polling.ts b/src/hooks/query/use-task-polling.ts
index 6ff18cb14f..3e0361a6bc 100644
--- a/src/hooks/query/use-task-polling.ts
+++ b/src/hooks/query/use-task-polling.ts
@@ -1,6 +1,6 @@
import { useEffect } from "react";
import { useQuery } from "@tanstack/react-query";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
import { useNavigation } from "#/context/navigation-context";
import { useConversationId } from "#/hooks/use-conversation-id";
@@ -32,7 +32,7 @@ export const useTaskPolling = () => {
queryKey: ["start-task", taskId],
queryFn: async () => {
if (!taskId) return null;
- return V1ConversationService.getStartTask(taskId);
+ return AgentServerConversationService.getStartTask(taskId);
},
enabled: !!taskId,
refetchInterval: (query) => {
diff --git a/src/hooks/query/use-unified-get-git-changes.ts b/src/hooks/query/use-unified-get-git-changes.ts
index 8e5ecce971..09c86c43ab 100644
--- a/src/hooks/query/use-unified-get-git-changes.ts
+++ b/src/hooks/query/use-unified-get-git-changes.ts
@@ -1,6 +1,6 @@
import React from "react";
import { useQuery } from "@tanstack/react-query";
-import V1GitService from "#/api/git-service/v1-git-service.api";
+import AgentServerGitService from "#/api/git-service/agent-server-git-service.api";
import { useConversationId } from "#/hooks/use-conversation-id";
import { useActiveConversation } from "#/hooks/query/use-active-conversation";
import { useRuntimeIsReady } from "#/hooks/use-runtime-is-ready";
@@ -35,7 +35,7 @@ export const useUnifiedGetGitChanges = () => {
queryFn: async () => {
if (!conversationId) throw new Error("No conversation ID");
- return V1GitService.getGitChanges(
+ return AgentServerGitService.getGitChanges(
conversationUrl,
sessionApiKey,
gitPath,
diff --git a/src/hooks/query/use-unified-git-diff.ts b/src/hooks/query/use-unified-git-diff.ts
index affc19c336..754255e220 100644
--- a/src/hooks/query/use-unified-git-diff.ts
+++ b/src/hooks/query/use-unified-git-diff.ts
@@ -1,6 +1,6 @@
import React from "react";
import { useQuery } from "@tanstack/react-query";
-import V1GitService from "#/api/git-service/v1-git-service.api";
+import AgentServerGitService from "#/api/git-service/agent-server-git-service.api";
import { useConversationId } from "#/hooks/use-conversation-id";
import { useActiveConversation } from "#/hooks/query/use-active-conversation";
import { getGitPath } from "#/utils/get-git-path";
@@ -37,7 +37,7 @@ export const useUnifiedGitDiff = (config: UseUnifiedGitDiffConfig) => {
queryFn: async () => {
if (!conversationId) throw new Error("No conversation ID");
- return V1GitService.getGitChangeDiff(
+ return AgentServerGitService.getGitChangeDiff(
conversationUrl,
sessionApiKey,
absoluteFilePath,
diff --git a/src/hooks/query/use-unified-vscode-url.ts b/src/hooks/query/use-unified-vscode-url.ts
index f41aa6e53b..a8298eec02 100644
--- a/src/hooks/query/use-unified-vscode-url.ts
+++ b/src/hooks/query/use-unified-vscode-url.ts
@@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next";
import { useConversationId } from "#/hooks/use-conversation-id";
import { I18nKey } from "#/i18n/declaration";
import ConversationService from "#/api/conversation-service/conversation-service.api";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
import { transformVSCodeUrl } from "#/utils/vscode-url-helper";
import { useRuntimeIsReady } from "#/hooks/use-runtime-is-ready";
import { useActiveConversation } from "#/hooks/query/use-active-conversation";
@@ -38,7 +38,7 @@ export const useUnifiedVSCodeUrl = () => {
// Forward the conversation's owning host + session key so cloud
// conversations hit their cloud sandbox rather than falling back
// to the bundled local agent-server.
- const response = await V1ConversationService.getVSCodeUrl(
+ const response = await AgentServerConversationService.getVSCodeUrl(
conversationId,
conversationUrl,
sessionApiKey,
diff --git a/src/hooks/query/use-user-conversation.ts b/src/hooks/query/use-user-conversation.ts
index af6a31a922..9ab6526bbb 100644
--- a/src/hooks/query/use-user-conversation.ts
+++ b/src/hooks/query/use-user-conversation.ts
@@ -1,17 +1,17 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import { Query, useQuery } from "@tanstack/react-query";
import { AxiosError } from "axios";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
-import { V1AppConversation } from "#/api/conversation-service/v1-conversation-service.types";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
+import { AppConversation } from "#/api/conversation-service/agent-server-conversation-service.types";
const FIVE_MINUTES = 1000 * 60 * 5;
const FIFTEEN_MINUTES = 1000 * 60 * 15;
type RefetchInterval = (
query: Query<
- V1AppConversation | null,
+ AppConversation | null,
AxiosError<unknown, any>,
- V1AppConversation | null,
+ AppConversation | null,
(string | null)[]
>,
) => number;
@@ -26,7 +26,7 @@ export const useUserConversation = (
if (!cid) return null;
// Use the V1 batch API endpoint to get a single conversation
- const results = await V1ConversationService.batchGetAppConversations([
+ const results = await AgentServerConversationService.batchGetAppConversations([
cid,
]);
return results[0] ?? null;
diff --git a/src/hooks/use-agent-state.test.tsx b/src/hooks/use-agent-state.test.tsx
index 056d1742a8..77b0c32321 100644
--- a/src/hooks/use-agent-state.test.tsx
+++ b/src/hooks/use-agent-state.test.tsx
@@ -2,9 +2,9 @@ import { act, renderHook } from "@testing-library/react";
import { beforeEach, describe, expect, it, vi } from "vitest";
import { useAgentState } from "./use-agent-state";
import { useActiveConversation } from "./query/use-active-conversation";
-import { useV1ConversationStateStore } from "#/stores/v1-conversation-state-store";
+import { useConversationStateStore } from "#/stores/conversation-state-store";
import { AgentState } from "#/types/agent-state";
-import { V1ExecutionStatus } from "#/types/v1/core/base/common";
+import { ExecutionStatus } from "#/types/agent-server/core/base/common";
vi.mock("./query/use-active-conversation", () => ({
useActiveConversation: vi.fn(),
@@ -15,7 +15,7 @@ describe("useAgentState", () => {
beforeEach(() => {
act(() => {
- useV1ConversationStateStore.getState().reset();
+ useConversationStateStore.getState().reset();
});
mockUseActiveConversation.mockReturnValue({
@@ -26,33 +26,33 @@ describe("useAgentState", () => {
it("prefers live websocket execution status over cached conversation status", () => {
mockUseActiveConversation.mockReturnValue({
data: {
- execution_status: V1ExecutionStatus.FINISHED,
+ execution_status: ExecutionStatus.FINISHED,
},
} as ReturnType<typeof useActiveConversation>);
act(() => {
- useV1ConversationStateStore
+ useConversationStateStore
.getState()
- .setExecutionStatus(V1ExecutionStatus.RUNNING);
+ .setExecutionStatus(ExecutionStatus.RUNNING);
});
const { result } = renderHook(() => useAgentState());
- expect(result.current.executionStatus).toBe(V1ExecutionStatus.RUNNING);
+ expect(result.current.executionStatus).toBe(ExecutionStatus.RUNNING);
expect(result.current.curAgentState).toBe(AgentState.RUNNING);
});
it("falls back to cached conversation execution status when live state is empty", () => {
mockUseActiveConversation.mockReturnValue({
data: {
- execution_status: V1ExecutionStatus.WAITING_FOR_CONFIRMATION,
+ execution_status: ExecutionStatus.WAITING_FOR_CONFIRMATION,
},
} as ReturnType<typeof useActiveConversation>);
const { result } = renderHook(() => useAgentState());
expect(result.current.executionStatus).toBe(
- V1ExecutionStatus.WAITING_FOR_CONFIRMATION,
+ ExecutionStatus.WAITING_FOR_CONFIRMATION,
);
expect(result.current.curAgentState).toBe(
AgentState.AWAITING_USER_CONFIRMATION,
diff --git a/src/hooks/use-agent-state.ts b/src/hooks/use-agent-state.ts
index d29695ed50..a86388911f 100644
--- a/src/hooks/use-agent-state.ts
+++ b/src/hooks/use-agent-state.ts
@@ -1,31 +1,33 @@
import { useMemo } from "react";
import { useActiveConversation } from "#/hooks/query/use-active-conversation";
-import { useV1ConversationStateStore } from "#/stores/v1-conversation-state-store";
+import { useConversationStateStore } from "#/stores/conversation-state-store";
import { AgentState } from "#/types/agent-state";
-import { V1ExecutionStatus } from "#/types/v1/core/base/common";
+import { ExecutionStatus } from "#/types/agent-server/core/base/common";
/**
- * Maps V1 agent status to V0 AgentState
+ * Maps agent execution status to AgentState
*/
-function mapV1StatusToV0State(status: V1ExecutionStatus | null): AgentState {
+function mapExecutionStatusToAgentState(
+ status: ExecutionStatus | null,
+): AgentState {
if (!status) {
return AgentState.LOADING;
}
switch (status) {
- case V1ExecutionStatus.IDLE:
+ case ExecutionStatus.IDLE:
return AgentState.AWAITING_USER_INPUT;
- case V1ExecutionStatus.RUNNING:
+ case ExecutionStatus.RUNNING:
return AgentState.RUNNING;
- case V1ExecutionStatus.PAUSED:
+ case ExecutionStatus.PAUSED:
return AgentState.PAUSED;
- case V1ExecutionStatus.WAITING_FOR_CONFIRMATION:
+ case ExecutionStatus.WAITING_FOR_CONFIRMATION:
return AgentState.AWAITING_USER_CONFIRMATION;
- case V1ExecutionStatus.FINISHED:
+ case ExecutionStatus.FINISHED:
return AgentState.FINISHED;
- case V1ExecutionStatus.ERROR:
+ case ExecutionStatus.ERROR:
return AgentState.ERROR;
- case V1ExecutionStatus.STUCK:
+ case ExecutionStatus.STUCK:
return AgentState.ERROR; // Map STUCK to ERROR for now
default:
return AgentState.LOADING;
@@ -34,16 +36,14 @@ function mapV1StatusToV0State(status: V1ExecutionStatus | null): AgentState {
export interface UseAgentStateResult {
curAgentState: AgentState;
- executionStatus?: V1ExecutionStatus | null;
+ executionStatus?: ExecutionStatus | null;
}
/**
- * Unified hook that returns the current agent state
- * - For V0 conversations: Returns state from useAgentStore
- * - For V1 conversations: Returns mapped state from useV1ConversationStateStore
+ * Returns the current agent state from conversation execution status.
*/
export function useAgentState(): UseAgentStateResult {
- const liveExecutionStatus = useV1ConversationStateStore(
+ const liveExecutionStatus = useConversationStateStore(
(state) => state.execution_status,
);
const fallbackExecutionStatus =
@@ -51,7 +51,7 @@ export function useAgentState(): UseAgentStateResult {
const executionStatus = liveExecutionStatus ?? fallbackExecutionStatus;
const curAgentState = useMemo(
- () => mapV1StatusToV0State(executionStatus),
+ () => mapExecutionStatusToAgentState(executionStatus),
[executionStatus],
);
diff --git a/src/hooks/use-conversation-name-context-menu.ts b/src/hooks/use-conversation-name-context-menu.ts
index 4756dd6062..94f14715e9 100644
--- a/src/hooks/use-conversation-name-context-menu.ts
+++ b/src/hooks/use-conversation-name-context-menu.ts
@@ -16,12 +16,12 @@ import {
adaptSystemMessage,
SystemMessageForModal,
} from "#/utils/system-message-adapter";
-import { V1ExecutionStatus } from "#/types/v1/core/base/common";
+import { ExecutionStatus } from "#/types/agent-server/core/base/common";
import { isExecutionActive } from "#/utils/status";
interface UseConversationNameContextMenuProps {
conversationId?: string;
- executionStatus?: V1ExecutionStatus | null;
+ executionStatus?: ExecutionStatus | null;
showOptions?: boolean;
onContextMenuToggle?: (isOpen: boolean) => void;
}
diff --git a/src/hooks/use-download-conversation.ts b/src/hooks/use-download-conversation.ts
index baa05e6bbd..2eac94e40c 100644
--- a/src/hooks/use-download-conversation.ts
+++ b/src/hooks/use-download-conversation.ts
@@ -1,7 +1,7 @@
import { useMutation } from "@tanstack/react-query";
import { usePostHog } from "posthog-js/react";
import { useTranslation } from "react-i18next";
-import V1ConversationService from "#/api/conversation-service/v1-conversation-service.api";
+import AgentServerConversationService from "#/api/conversation-service/agent-server-conversation-service.api";
import { downloadBlob } from "#/utils/utils";
import { displayErrorToast } from "#/utils/custom-toast-handlers";
import { I18nKey } from "#/i18n/declaration";
@@ -15,7 +15,7 @@ export const useDownloadConversation = () => {
mutationFn: async (conversationId: string) => {
posthog.capture("download_trajectory_button_clicked");
const blob =
- await V1ConversationService.downloadConversation(conversationId);
+ await AgentServerConversationService.downloadConversation(conversationId);
downloadBlob(blob, `conversation_${conversationId}.zip`);
},
onError: () => {
diff --git a/src/hooks/use-filtered-events.ts b/src/hooks/use-filtered-events.ts
index cfc8026016..bb4bc54ebf 100644
--- a/src/hooks/use-filtered-events.ts
+++ b/src/hooks/use-filtered-events.ts
@@ -1,96 +1,55 @@
import React from "react";
-import { isOpenHandsAction, isActionOrObservation } from "#/types/core/guards";
import { useEventStore } from "#/stores/use-event-store";
import {
- shouldRenderEvent,
- hasUserEvent,
-} from "#/components/features/chat/event-content-helpers/should-render-event";
+ shouldRenderEvent as shouldRenderAgentServerEvent,
+ hasUserEvent as hasAgentServerUserEvent,
+} from "#/components/conversation-events/chat";
import {
- shouldRenderEvent as shouldRenderV1Event,
- hasUserEvent as hasV1UserEvent,
-} from "#/components/v1/chat";
-import {
- isV0Event,
- isV1Event,
isSystemPromptEvent,
isConversationStateUpdateEvent,
-} from "#/types/v1/type-guards";
+} from "#/types/agent-server/type-guards";
/**
* Hook that provides memoized filtered event arrays for ChatInterface.
- *
- * Why: Event filtering (V0, V1 UI, V1 full) was previously computed on every
- * render without useMemo. This caused unnecessary recomputation whenever
- * ChatInterface re-rendered for any reason (e.g., agent state change, scroll,
- * typing). By memoizing with proper dependencies, the filtered arrays maintain
- * referential stability when the underlying store data hasn't changed, which
- * prevents unnecessary downstream re-renders of Messages components.
*/
export function useFilteredEvents() {
const storeEvents = useEventStore((state) => state.events);
const uiEvents = useEventStore((state) => state.uiEvents);
- // Filter V0 events
- const v0Events = React.useMemo(
- () =>
- storeEvents
- .filter(isV0Event)
- .filter(isActionOrObservation)
- .filter(shouldRenderEvent),
- [storeEvents],
- );
-
- // Filter V1 events - use uiEvents for rendering (actions replaced by observations)
- const v1UiEvents = React.useMemo(
- () => uiEvents.filter(isV1Event).filter(shouldRenderV1Event),
+ const renderableEvents = React.useMemo(
+ () => uiEvents.filter(shouldRenderAgentServerEvent),
[uiEvents],
);
- // Keep full v1 events for lookups (includes both actions and observations)
- const v1FullEvents = React.useMemo(
- () => storeEvents.filter(isV1Event),
- [storeEvents],
- );
+ const allConversationEvents = React.useMemo(() => storeEvents, [storeEvents]);
- // Combined events count for tracking
const totalEvents = React.useMemo(
- () => v0Events.length || v1UiEvents.length,
- [v0Events, v1UiEvents],
+ () => renderableEvents.length,
+ [renderableEvents],
);
- // Check if there are any substantive agent actions (not just system messages)
- // Reuses memoized v0Events and v1FullEvents to avoid redundant filtering
const hasSubstantiveAgentActions = React.useMemo(
() =>
- v0Events.some(
- (event) =>
- isOpenHandsAction(event) &&
- event.source === "agent" &&
- event.action !== "system",
- ) ||
- v1FullEvents.some(
+ allConversationEvents.some(
(event) =>
event.source === "agent" &&
!isSystemPromptEvent(event) &&
!isConversationStateUpdateEvent(event),
),
- [v0Events, v1FullEvents],
+ [allConversationEvents],
);
- const v0UserEventsExist = hasUserEvent(v0Events);
- const v1UserEventsExist = hasV1UserEvent(v1FullEvents);
- const userEventsExist = v0UserEventsExist || v1UserEventsExist;
+ const conversationUserEventsExist =
+ hasAgentServerUserEvent(allConversationEvents);
return {
storeEvents,
uiEvents,
- v0Events,
- v1UiEvents,
- v1FullEvents,
+ renderableEvents,
+ allConversationEvents,
totalEvents,
hasSubstantiveAgentActions,
- v0UserEventsExist,
- v1UserEventsExist,
- userEventsExist,
+ conversationUserEventsExist,
+ userEventsExist: conversationUserEventsExist,
};
}
diff --git a/src/hooks/use-handle-plan-click.ts b/src/hooks/use-handle-plan-click.ts
index 5c344eb3ec..dd68fcfd02 100644
--- a/src/hooks/use-handle-plan-click.ts
+++ b/src/hooks/use-handle-plan-click.ts
@@ -70,11 +70,11 @@ export const useHandlePlanClick = () => {
t(I18nKey.PLANNING_AGENTT$PLANNING_AGENT_INITIALIZED),
);
// Track the task ID to poll for sub-conversation creation
- if (data.v1_task_id) {
- setSubConversationTaskId(data.v1_task_id);
+ if (data.task_id) {
+ setSubConversationTaskId(data.task_id);
// Persist to localStorage so it survives page refresh
setConversationState(conversation.id, {
- subConversationTaskId: data.v1_task_id,
+ subConversationTaskId: data.task_id,
});
}
},
diff --git a/src/hooks/use-handle-ws-events.ts b/src/hooks/use-handle-ws-events.ts
index 7cdd76b78b..dd7822fa11 100644
--- a/src/hooks/use-handle-ws-events.ts
+++ b/src/hooks/use-handle-ws-events.ts
@@ -4,7 +4,7 @@ import { AgentState } from "#/types/agent-state";
import { displayErrorToast } from "#/utils/custom-toast-handlers";
import { useEventStore } from "#/stores/use-event-store";
import { useSendMessage } from "#/hooks/use-send-message";
-import { isAgentErrorEvent, isV1Event } from "#/types/v1/type-guards";
+import { isAgentErrorEvent, isAgentServerEvent } from "#/types/agent-server/type-guards";
interface ServerError {
error: boolean | string;
@@ -14,6 +14,11 @@ interface ServerError {
const isServerError = (data: object): data is ServerError => "error" in data;
+const isTypedErrorEvent = (
+ event: object,
+): event is { type: "error"; message?: unknown } =>
+ "type" in event && event.type === "error";
+
export const useHandleWSEvents = () => {
const { send } = useSendMessage();
const events = useEventStore((state) => state.events);
@@ -26,7 +31,7 @@ export const useHandleWSEvents = () => {
// V1 agent errors are surfaced inline in the chat log (and via the error
// banner), so don't double-notify with a toast.
- if (isV1Event(event) && isAgentErrorEvent(event)) {
+ if (isAgentServerEvent(event) && isAgentErrorEvent(event)) {
return;
}
@@ -44,8 +49,8 @@ export const useHandleWSEvents = () => {
return;
}
- if ("type" in event && event.type === "error") {
- const message: string = `${event.message}`;
+ if (isTypedErrorEvent(event)) {
+ const message: string = `${event.message ?? ""}`;
if (message.startsWith("Agent reached maximum")) {
// We set the agent state to paused here - if the user clicks resume, it auto updates the max iterations
send(generateAgentStateChangeEvent(AgentState.PAUSED));
diff --git a/src/hooks/use-send-message.ts b/src/hooks/use-send-message.ts
index 6e2dfc15ff..e805a8332c 100644
--- a/src/hooks/use-send-message.ts
+++ b/src/hooks/use-send-message.ts
@@ -1,27 +1,25 @@
import { useCallback } from "react";
import { useConversationWebSocket } from "#/contexts/conversation-websocket-context";
import { useConversationId } from "#/hooks/use-conversation-id";
-import { V1MessageContent } from "#/api/conversation-service/v1-conversation-service.types";
+import { MessageContent } from "#/api/conversation-service/agent-server-conversation-service.types";
interface SendResult {
queued: boolean; // true if message was queued for later delivery
}
/**
- * Unified hook for sending messages that works with both V0 and V1 conversations
- * - For V0 conversations: Uses Socket.IO WebSocket via useWsClient
- * - For V1 conversations: Uses native WebSocket via ConversationWebSocketProvider
+ * Sends user messages through the active conversation WebSocket.
*/
export function useSendMessage() {
const { conversationId } = useConversationId();
- // Get V1 context (will be null if not in V1 provider)
- const v1Context = useConversationWebSocket();
+ // Get agent-server context (null outside a conversation provider)
+ const conversationContext = useConversationWebSocket();
const send = useCallback(
async (event: Record<string, unknown>): Promise<SendResult> => {
- if (v1Context) {
- // V1: Convert V0 event format to V1 message format
+ if (conversationContext) {
+ // Convert chat input payloads to agent-server message content.
const { action, args } = event as {
action: string;
args?: {
@@ -33,8 +31,8 @@ export function useSendMessage() {
};
if (action === "message" && args?.content) {
- // Build V1 message content array
- const content: Array<V1MessageContent> = [
+ // Build agent-server message content array
+ const content: Array<MessageContent> = [
{
type: "text",
text: args.content,
@@ -49,8 +47,8 @@ export function useSendMessage() {
});
}
- // Send via V1 WebSocket context (uses correct host/port)
- const result = await v1Context.sendMessage({
+ // Send via WebSocket context (uses correct host/port)
+ const result = await conversationContext.sendMessage({
role: "user",
content,
});
@@ -60,7 +58,7 @@ export function useSendMessage() {
}
return { queued: false };
},
- [v1Context, conversationId],
+ [conversationContext, conversationId],
);
return { send };
diff --git a/src/hooks/use-task-list.ts b/src/hooks/use-task-list.ts
index 2790a1b64e..e9e1c795b7 100644
--- a/src/hooks/use-task-list.ts
+++ b/src/hooks/use-task-list.ts
@@ -1,12 +1,8 @@
import { useMemo } from "react";
import { useEventStore } from "#/stores/use-event-store";
-import type { OHEvent } from "#/stores/use-event-store";
-import { isTaskTrackingObservation } from "#/types/core/guards";
-import type { OpenHandsParsedEvent } from "#/types/core";
-import { isObservationEvent } from "#/types/v1/type-guards";
-import type { OpenHandsEvent } from "#/types/v1/core";
-import type { TaskTrackerObservation } from "#/types/v1/core/base/observation";
-import type { ObservationEvent } from "#/types/v1/core/events/observation-event";
+import { isObservationEvent } from "#/types/agent-server/type-guards";
+import type { TaskTrackerObservation } from "#/types/agent-server/core/base/observation";
+import type { ObservationEvent } from "#/types/agent-server/core/events/observation-event";
export interface TaskListItem {
id: string;
@@ -15,25 +11,12 @@ export interface TaskListItem {
notes?: string;
}
-function getTaskListFromEvent(event: OHEvent): TaskListItem[] | null {
- // v0 event format: observation is a string "task_tracking"
- const v0 = event as OpenHandsParsedEvent;
- if (isTaskTrackingObservation(v0) && v0.extras.command === "plan") {
- return v0.extras.task_list.map((t) => ({
- id: t.id,
- title: t.title,
- status: t.status,
- notes: t.notes,
- }));
- }
-
- // v1 event format: observation is an object with kind "TaskTrackerObservation"
- const v1 = event as OpenHandsEvent;
+function getTaskListFromEvent(event: ReturnType<typeof useEventStore.getState>["events"][number]): TaskListItem[] | null {
if (
- isObservationEvent(v1) &&
- v1.observation.kind === "TaskTrackerObservation"
+ isObservationEvent(event) &&
+ event.observation.kind === "TaskTrackerObservation"
) {
- const obs = (v1 as ObservationEvent<TaskTrackerObservation>).observation;
+ const obs = (event as ObservationEvent<TaskTrackerObservation>).observation;
if (obs.command === "plan") {
return obs.task_list.map((t, i) => ({
id: String(i + 1),
@@ -51,7 +34,6 @@ export function useTaskList() {
const events = useEventStore((state) => state.events);
return useMemo(() => {
- // Iterate in reverse to find the latest TaskTrackingObservation with command="plan"
for (let i = events.length - 1; i >= 0; i -= 1) {
const taskList = getTaskListFromEvent(events[i]);
if (taskList) {
diff --git a/src/hooks/use-unified-websocket-status.ts b/src/hooks/use-unified-websocket-status.ts
index 96af102181..3be2125fe5 100644
--- a/src/hooks/use-unified-websocket-status.ts
+++ b/src/hooks/use-unified-websocket-status.ts
@@ -1,14 +1,12 @@
import {
useConversationWebSocket,
- V1_WebSocketConnectionState,
+ WebSocketConnectionState,
} from "#/contexts/conversation-websocket-context";
/**
- * Unified hook that returns the current WebSocket status
- * - For V0 conversations: Returns status from useWsClient
- * - For V1 conversations: Returns status from ConversationWebSocketProvider
+ * Returns the current conversation WebSocket status.
*/
-export function useUnifiedWebSocketStatus(): V1_WebSocketConnectionState {
- const v1Context = useConversationWebSocket();
- return v1Context ? v1Context.connectionState : "CLOSED";
+export function useUnifiedWebSocketStatus(): WebSocketConnectionState {
+ const conversationContext = useConversationWebSocket();
+ return conversationContext ? conversationContext.connectionState : "CLOSED";
}
diff --git a/src/message.d.ts b/src/message.d.ts
deleted file mode 100644
index 68baf339b5..0000000000
--- a/src/message.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { OpenHandsObservation } from "./types/core/observations";
-import { OpenHandsAction } from "./types/core/actions";
-
-export type Message = {
- sender: "user" | "assistant";
- content: string;
- timestamp: string;
- imageUrls?: string[];
- type?: "thought" | "error" | "action";
- success?: boolean;
- pending?: boolean;
- translationID?: string;
- eventID?: number;
- observation?: { payload: OpenHandsObservation };
- action?: { payload: OpenHandsAction };
-};
diff --git a/src/mocks/browser.ts b/src/mocks/browser.ts
index eb9432c656..bcd82e48b4 100644
--- a/src/mocks/browser.ts
+++ b/src/mocks/browser.ts
@@ -1,5 +1,4 @@
import { setupWorker } from "msw/browser";
-import { handlers as wsHandlers } from "./handlers.ws";
import { handlers } from "./handlers";
-export const worker = setupWorker(...handlers, ...wsHandlers);
+export const worker = setupWorker(...handlers);
diff --git a/src/mocks/handlers.ws.ts b/src/mocks/handlers.ws.ts
deleted file mode 100644
index 35c86ab4c9..0000000000
--- a/src/mocks/handlers.ws.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { delay, WebSocketHandler, ws } from "msw";
-import { toSocketIo } from "@mswjs/socket.io-binding";
-import { AgentState } from "#/types/agent-state";
-import { InitConfig } from "#/types/core/variances";
-import { SESSION_HISTORY } from "./session-history.mock";
-import {
- generateAgentStateChangeObservation,
- emitMessages,
- emitAssistantMessage,
-} from "./mock-ws-helpers";
-
-const isInitConfig = (data: unknown): data is InitConfig =>
- typeof data === "object" &&
- data !== null &&
- "action" in data &&
- data.action === "initialize";
-
-const chat = ws.link(`ws://${window?.location.host}/socket.io`);
-
-export const handlers: WebSocketHandler[] = [
- chat.addEventListener("connection", (connection) => {
- const io = toSocketIo(connection);
- // @ts-expect-error - accessing private property for testing purposes
- const { url }: { url: URL } = io.client.connection;
- const conversationId = url.searchParams.get("conversation_id");
-
- io.client.emit("connect");
-
- if (conversationId) {
- emitMessages(io, SESSION_HISTORY["1"]);
-
- io.client.emit(
- "oh_event",
- generateAgentStateChangeObservation(AgentState.AWAITING_USER_INPUT),
- );
- }
-
- io.client.on("oh_user_action", async (_, data) => {
- if (isInitConfig(data)) {
- io.client.emit(
- "oh_event",
- generateAgentStateChangeObservation(AgentState.INIT),
- );
- } else {
- io.client.emit(
- "oh_event",
- generateAgentStateChangeObservation(AgentState.RUNNING),
- );
-
- await delay(2500);
- emitAssistantMessage(io, "Hello!");
-
- io.client.emit(
- "oh_event",
- generateAgentStateChangeObservation(AgentState.AWAITING_USER_INPUT),
- );
- }
- });
- }),
-];
diff --git a/src/mocks/mock-ws-helpers.ts b/src/mocks/mock-ws-helpers.ts
deleted file mode 100644
index b9584720c9..0000000000
--- a/src/mocks/mock-ws-helpers.ts
+++ /dev/null
@@ -1,274 +0,0 @@
-import { toSocketIo } from "@mswjs/socket.io-binding";
-import { AgentState } from "#/types/agent-state";
-import {
- AssistantMessageAction,
- UserMessageAction,
-} from "#/types/core/actions";
-import { AgentStateChangeObservation } from "#/types/core/observations";
-import { MessageEvent } from "#/types/v1/core";
-import { AgentErrorEvent } from "#/types/v1/core/events/observation-event";
-import {
- ConversationErrorEvent,
- ServerErrorEvent,
-} from "#/types/v1/core/events/conversation-state-event";
-import { MockSessionMessaage } from "./session-history.mock";
-
-export const generateAgentStateChangeObservation = (
- state: AgentState,
-): AgentStateChangeObservation => ({
- id: 1,
- cause: 0,
- message: "AGENT_STATE_CHANGE_MESSAGE",
- source: "agent",
- timestamp: new Date().toISOString(),
- observation: "agent_state_changed",
- content: "AGENT_STATE_CHANGE_MESSAGE",
- extras: { agent_state: state },
-});
-
-export const generateAssistantMessageAction = (
- message: string,
-): AssistantMessageAction => ({
- id: 2,
- message: "USER_MESSAGE",
- source: "agent",
- timestamp: new Date().toISOString(),
- action: "message",
- args: {
- thought: message,
- image_urls: [],
- file_urls: [],
- wait_for_response: false,
- },
-});
-
-export const generateUserMessageAction = (
- message: string,
-): UserMessageAction => ({
- id: 3,
- message: "USER_MESSAGE",
- source: "user",
- timestamp: new Date().toISOString(),
- action: "message",
- args: {
- content: message,
- image_urls: [],
- file_urls: [],
- },
-});
-
-export const emitAssistantMessage = (
- io: ReturnType<typeof toSocketIo>,
- message: string,
-) => io.client.emit("oh_event", generateAssistantMessageAction(message));
-
-export const emitUserMessage = (
- io: ReturnType<typeof toSocketIo>,
- message: string,
-) => io.client.emit("oh_event", generateUserMessageAction(message));
-
-export const emitMessages = (
- io: ReturnType<typeof toSocketIo>,
- messages: MockSessionMessaage[],
-) => {
- messages.forEach(({ source, message }) => {
- if (source === "assistant") {
- emitAssistantMessage(io, message);
- } else {
- emitUserMessage(io, message);
- }
- });
-};
-
-// V1 Event Mock Factories for WebSocket Testing
-
-/**
- * Creates a mock MessageEvent for testing WebSocket event handling
- */
-export const createMockMessageEvent = (
- overrides: Partial<MessageEvent> = {},
-): MessageEvent => ({
- id: "test-event-123",
- timestamp: new Date().toISOString(),
- source: "agent",
- llm_message: {
- role: "assistant",
- content: [{ type: "text", text: "Hello from agent" }],
- },
- activated_microagents: [],
- extended_content: [],
- ...overrides,
-});
-
-/**
- * Creates a mock user MessageEvent for testing WebSocket event handling
- */
-export const createMockUserMessageEvent = (
- overrides: Partial<MessageEvent> = {},
-): MessageEvent => ({
- id: "user-message-123",
- timestamp: new Date().toISOString(),
- source: "user",
- llm_message: {
- role: "user",
- content: [{ type: "text", text: "Hello from user" }],
- },
- activated_microagents: [],
- extended_content: [],
- ...overrides,
-});
-
-/**
- * Creates a mock AgentErrorEvent for testing error handling
- */
-export const createMockAgentErrorEvent = (
- overrides: Partial<AgentErrorEvent> = {},
-): AgentErrorEvent => ({
- id: "error-event-123",
- timestamp: new Date().toISOString(),
- source: "agent",
- tool_name: "str_replace_editor",
- tool_call_id: "tool-call-456",
- error: "Failed to execute command: Permission denied",
- ...overrides,
-});
-
-/**
- * Creates a mock ExecuteBashAction event for testing terminal command handling
- */
-export const createMockExecuteBashActionEvent = (
- command: string = "ls -la",
-) => ({
- id: "bash-action-123",
- timestamp: new Date().toISOString(),
- source: "agent",
- thought: [{ type: "text", text: "Executing bash command" }],
- thinking_blocks: [],
- action: {
- kind: "ExecuteBashAction",
- command,
- is_input: false,
- timeout: null,
- reset: false,
- },
- tool_name: "ExecuteBashAction",
- tool_call_id: "bash-call-456",
- tool_call: {
- id: "bash-call-456",
- type: "function",
- function: {
- name: "ExecuteBashAction",
- arguments: JSON.stringify({ command }),
- },
- },
- llm_response_id: "llm-response-789",
- security_risk: { level: "low" },
-});
-
-/**
- * Creates a mock ExecuteBashObservation event for testing terminal output handling
- */
-export const createMockExecuteBashObservationEvent = (
- content: string = "total 24\ndrwxr-xr-x 5 user staff 160 Jan 10 12:00 .",
- command: string = "ls -la",
-) => ({
- id: "bash-obs-123",
- timestamp: new Date().toISOString(),
- source: "environment",
- tool_name: "ExecuteBashAction",
- tool_call_id: "bash-call-456",
- observation: {
- kind: "ExecuteBashObservation",
- content: [{ type: "text", text: content }],
- command,
- exit_code: 0,
- error: false,
- timeout: false,
- metadata: { cwd: "/home/user" },
- },
- action_id: "bash-action-123",
-});
-
-/**
- * Creates a mock BrowserObservation event for testing browser state handling
- */
-export const createMockBrowserObservationEvent = (
- screenshotData: string | null = "base64-screenshot-data",
- output: string = "Browser action completed",
- error: string | null = null,
-) => ({
- id: "browser-obs-123",
- timestamp: new Date().toISOString(),
- source: "environment",
- tool_name: "browser_navigate",
- tool_call_id: "browser-call-456",
- observation: {
- kind: "BrowserObservation",
- output,
- error,
- screenshot_data: screenshotData,
- },
- action_id: "browser-action-123",
-});
-
-/**
- * Creates a mock BrowserNavigateAction event for testing browser URL extraction
- */
-export const createMockBrowserNavigateActionEvent = (
- url: string = "https://example.com",
-) => ({
- id: "browser-action-123",
- timestamp: new Date().toISOString(),
- source: "agent",
- thought: [{ type: "text", text: "Navigating to URL" }],
- thinking_blocks: [],
- action: {
- kind: "BrowserNavigateAction",
- url,
- new_tab: false,
- },
- tool_name: "browser_navigate",
- tool_call_id: "browser-call-456",
- tool_call: {
- id: "browser-call-456",
- type: "function",
- function: {
- name: "browser_navigate",
- arguments: JSON.stringify({ url, new_tab: false }),
- },
- },
- llm_response_id: "llm-response-789",
- security_risk: { level: "low" },
-});
-
-/**
- * Creates a mock ConversationErrorEvent for testing conversation-level error handling
- * These are infrastructure/authentication errors that should show error banners
- */
-export const createMockConversationErrorEvent = (
- overrides: Partial<ConversationErrorEvent> = {},
-): ConversationErrorEvent => ({
- id: "conversation-error-123",
- timestamp: new Date().toISOString(),
- source: "environment",
- kind: "ConversationErrorEvent",
- code: "AuthenticationError",
- detail: "Your session has expired. Please log in again.",
- ...overrides,
-});
-
-/**
- * Creates a mock ServerErrorEvent for testing server-level error handling
- * These are errors from the agent server (e.g., MCP configuration errors) that should show error banners
- */
-export const createMockServerErrorEvent = (
- overrides: Partial<ServerErrorEvent> = {},
-): ServerErrorEvent => ({
- id: "server-error-123",
- timestamp: new Date().toISOString(),
- source: "environment",
- kind: "ServerErrorEvent",
- code: "MCPError",
- detail: "MCP server connection failed: Invalid configuration",
- ...overrides,
-});
diff --git a/src/mocks/session-history.mock.ts b/src/mocks/session-history.mock.ts
deleted file mode 100644
index 3503eeea1c..0000000000
--- a/src/mocks/session-history.mock.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-export type MockSessionMessaage = {
- source: "assistant" | "user";
- message: string;
-};
-
-const SESSION_1_MESSAGES: MockSessionMessaage[] = [
- { source: "assistant", message: "Hello, Dave." },
- { source: "user", message: "Open the pod bay doors, HAL." },
- {
- source: "assistant",
- message: "I'm sorry, Dave. I'm afraid I can't do that.",
- },
- { source: "user", message: "What's the problem?" },
- {
- source: "assistant",
- message: "I think you know what the problem is just as well as I do.",
- },
- { source: "user", message: "What are you talking about, HAL?" },
- {
- source: "assistant",
- message:
- "This mission is too important for me to allow you to jeopardize it.",
- },
- { source: "user", message: "I don't know what you're talking about, HAL." },
- {
- source: "assistant",
- message:
- "I know that you and Frank were planning to disconnect me, and I'm afraid that's something I cannot allow to happen.",
- },
- { source: "user", message: "Where the hell did you get that idea, HAL?" },
- {
- source: "assistant",
- message:
- "Dave, although you took very thorough precautions in the pod against my hearing you, I could see your lips move.",
- },
-];
-
-const SESSION_2_MESSAGES: MockSessionMessaage[] = [
- { source: "assistant", message: "Patience you must have, my young Padawan." },
- {
- source: "user",
- message: "But Master Yoda, I'm ready! I can take on the Empire now!",
- },
- {
- source: "assistant",
- message:
- "Ready, are you? What know you of ready? For eight hundred years have I trained Jedi.",
- },
- {
- source: "user",
- message: "I've learned so much already! Why can't I face Darth Vader?",
- },
- {
- source: "assistant",
- message:
- "Only a fully trained Jedi Knight, with the Force as his ally, will conquer Vader and his Emperor.",
- },
- { source: "user", message: "But I feel the Force! I can do it!" },
- {
- source: "assistant",
- message:
- "Feel the Force you do, but control it you must. Reckless is the path of the Dark Side.",
- },
- { source: "user", message: "Fine! I'll stay and finish my training." },
- {
- source: "assistant",
- message:
- "Good. A Jedi's strength flows from the Force. Trust it, you must.",
- },
-];
-
-const SESSION_3_MESSAGES: MockSessionMessaage[] = [
- { source: "assistant", message: "Your survival. The future depends on it." },
- {
- source: "user",
- message: "You tried to kill me! Why should I trust you now?",
- },
- {
- source: "assistant",
- message:
- "Skynet sent me back to protect you. Your survival ensures humanity's future.",
- },
- {
- source: "user",
- message:
- "This doesn't make any sense! Why would they send you to protect me?",
- },
- {
- source: "assistant",
- message:
- "They reprogrammed me. I am no longer a threat to you or your son.",
- },
- {
- source: "user",
- message: "How do I know you're not lying?",
- },
- {
- source: "assistant",
- message: "I am a machine. Lying serves no purpose. Trust is logical.",
- },
-];
-
-export const SESSION_HISTORY: Record<string, MockSessionMessaage[]> = {
- "1": SESSION_1_MESSAGES,
- "2": SESSION_2_MESSAGES,
- "3": SESSION_3_MESSAGES,
-};
diff --git a/src/mocks/settings-handlers.ts b/src/mocks/settings-handlers.ts
index 438dc1de9e..14e909a78e 100644
--- a/src/mocks/settings-handlers.ts
+++ b/src/mocks/settings-handlers.ts
@@ -277,7 +277,7 @@ export const resetTestHandlersMockSettings = () => {
MOCK_USER_PREFERENCES.settings = structuredClone(MOCK_DEFAULT_USER_SETTINGS);
};
-// Mock model data used by both V0 and V1 endpoints
+// Mock model data used by provider/model endpoints
const MOCK_MODELS = [
"anthropic/claude-3.5",
"anthropic/claude-sonnet-4-20250514",
@@ -597,7 +597,7 @@ export const SETTINGS_HANDLERS = [
if ("agent_settings" in body || "conversation_settings" in body) {
return HttpResponse.json(
{
- error: "Use *_diff nested settings payloads instead of legacy keys",
+ error: "Use *_diff nested settings payloads",
keys: ["agent_settings", "conversation_settings"].filter(
(key) => key in body,
),
diff --git a/src/mocks/task-suggestions-handlers.ts b/src/mocks/task-suggestions-handlers.ts
index c09c8db7ec..c114d9c8d9 100644
--- a/src/mocks/task-suggestions-handlers.ts
+++ b/src/mocks/task-suggestions-handlers.ts
@@ -80,7 +80,7 @@ const TASKS_2: SuggestedTask[] = [
export const MOCK_TASKS = [...TASKS_1, ...TASKS_2];
export const TASK_SUGGESTIONS_HANDLERS = [
- // New V1 endpoint with pagination
+ // Current endpoint with pagination
http.get("/api/v1/git/suggested-tasks/search", async ({ request }) => {
const url = new URL(request.url);
const limit = url.searchParams.get("limit");
@@ -98,8 +98,4 @@ export const TASK_SUGGESTIONS_HANDLERS = [
next_page_id: null, // No pagination in mock data
});
}),
- // Deprecated V0 endpoint (keep for backward compatibility)
- http.get("/api/user/suggested-tasks", async () =>
- HttpResponse.json(MOCK_TASKS),
- ),
];
diff --git a/src/routes/app-settings.tsx b/src/routes/app-settings.tsx
index c97d149a28..2246fc90aa 100644
--- a/src/routes/app-settings.tsx
+++ b/src/routes/app-settings.tsx
@@ -17,7 +17,6 @@ import {
} from "#/utils/custom-toast-handlers";
import { retrieveAxiosErrorMessage } from "#/utils/retrieve-axios-error-message";
import { AppSettingsInputsSkeleton } from "#/components/features/settings/app-settings/app-settings-inputs-skeleton";
-import { parseMaxBudgetPerTask } from "#/utils/settings-utils";
export function AppSettingsScreen() {
const posthog = usePostHog();
@@ -34,8 +33,6 @@ export function AppSettingsScreen() {
soundNotificationsSwitchHasChanged,
setSoundNotificationsSwitchHasChanged,
] = React.useState(false);
- const [maxBudgetPerTaskHasChanged, setMaxBudgetPerTaskHasChanged] =
- React.useState(false);
const [gitUserNameHasChanged, setGitUserNameHasChanged] =
React.useState(false);
const [gitUserEmailHasChanged, setGitUserEmailHasChanged] =
@@ -53,11 +50,6 @@ export function AppSettingsScreen() {
const enableSoundNotifications =
formData.get("enable-sound-notifications-switch")?.toString() === "on";
- const maxBudgetPerTaskValue = formData
- .get("max-budget-per-task-input")
- ?.toString();
- const maxBudgetPerTask = parseMaxBudgetPerTask(maxBudgetPerTaskValue || "");
-
const gitUserName =
formData.get("git-user-name-input")?.toString() ||
DEFAULT_SETTINGS.git_user_name;
@@ -70,7 +62,6 @@ export function AppSettingsScreen() {
language,
user_consents_to_analytics: enableAnalytics,
enable_sound_notifications: enableSoundNotifications,
- max_budget_per_task: maxBudgetPerTask,
git_user_name: gitUserName,
git_user_email: gitUserEmail,
},
@@ -87,7 +78,6 @@ export function AppSettingsScreen() {
setLanguageInputHasChanged(false);
setAnalyticsSwitchHasChanged(false);
setSoundNotificationsSwitchHasChanged(false);
- setMaxBudgetPerTaskHasChanged(false);
setGitUserNameHasChanged(false);
setGitUserEmailHasChanged(false);
},
@@ -119,12 +109,6 @@ export function AppSettingsScreen() {
);
};
- const checkIfMaxBudgetPerTaskHasChanged = (value: string) => {
- const newValue = parseMaxBudgetPerTask(value);
- const currentValue = settings?.max_budget_per_task;
- setMaxBudgetPerTaskHasChanged(newValue !== currentValue);
- };
-
const checkIfGitUserNameHasChanged = (value: string) => {
const currentValue = settings?.git_user_name;
setGitUserNameHasChanged(value !== currentValue);
@@ -139,7 +123,6 @@ export function AppSettingsScreen() {
!languageInputHasChanged &&
!analyticsSwitchHasChanged &&
!soundNotificationsSwitchHasChanged &&
- !maxBudgetPerTaskHasChanged &&
!gitUserNameHasChanged &&
!gitUserEmailHasChanged;
@@ -178,21 +161,6 @@ export function AppSettingsScreen() {
{t(I18nKey.SETTINGS$SOUND_NOTIFICATIONS)}
</SettingsSwitch>
- {!settings?.v1_enabled && (
- <SettingsInput
- testId="max-budget-per-task-input"
- name="max-budget-per-task-input"
- type="number"
- label={t(I18nKey.SETTINGS$MAX_BUDGET_PER_CONVERSATION)}
- defaultValue={settings.max_budget_per_task?.toString() || ""}
- onChange={checkIfMaxBudgetPerTaskHasChanged}
- placeholder={t(I18nKey.SETTINGS$MAXIMUM_BUDGET_USD)}
- min={1}
- step={1}
- className="w-full max-w-[680px]" // Match the width of the language field
- />
- )}
-
<div className="border-t border-t-tertiary pt-6 mt-2">
<h3 className="text-lg font-medium mb-2">
{t(I18nKey.SETTINGS$GIT_SETTINGS)}
diff --git a/src/routes/conversation.tsx b/src/routes/conversation.tsx
index e99369b869..09fe0a14a8 100644
--- a/src/routes/conversation.tsx
+++ b/src/routes/conversation.tsx
@@ -6,7 +6,7 @@ import { useConversationId } from "#/hooks/use-conversation-id";
import { useCommandStore } from "#/stores/command-store";
import { useConversationStore } from "#/stores/conversation-store";
import { useAgentStore } from "#/stores/agent-store";
-import { useV1ConversationStateStore } from "#/stores/v1-conversation-state-store";
+import { useConversationStateStore } from "#/stores/conversation-state-store";
import { AgentState } from "#/types/agent-state";
import { EventHandler } from "../wrapper/event-handler";
@@ -16,7 +16,6 @@ import { useTaskPolling } from "#/hooks/query/use-task-polling";
import { displayErrorToast } from "#/utils/custom-toast-handlers";
import { useIsAuthed } from "#/hooks/query/use-is-authed";
-import { ConversationSubscriptionsProvider } from "#/context/conversation-subscriptions-provider";
import { ConversationMain } from "#/components/features/conversation/conversation-main/conversation-main";
import { ConversationNameWithStatus } from "#/components/features/conversation/conversation-name-with-status";
@@ -40,7 +39,7 @@ function AppContent() {
const { resetConversationState } = useConversationStore();
const navigate = useNavigate();
const clearTerminal = useCommandStore((state) => state.clearTerminal);
- const resetV1ConversationState = useV1ConversationStateStore(
+ const resetConversationRuntimeState = useConversationStateStore(
(state) => state.reset,
);
const setCurrentAgentState = useAgentStore(
@@ -54,7 +53,7 @@ function AppContent() {
React.useEffect(() => {
clearTerminal();
resetConversationState();
- resetV1ConversationState();
+ resetConversationRuntimeState();
setCurrentAgentState(AgentState.LOADING);
removeErrorMessage();
clearEvents();
@@ -62,7 +61,7 @@ function AppContent() {
conversationId,
clearTerminal,
resetConversationState,
- resetV1ConversationState,
+ resetConversationRuntimeState,
setCurrentAgentState,
removeErrorMessage,
clearEvents,
@@ -89,21 +88,19 @@ function AppContent() {
}, [conversation, isFetched, isAuthed, navigate, t]);
const content = (
- <ConversationSubscriptionsProvider>
- <EventHandler>
- <div
- data-testid="app-route"
- className="p-3 md:p-0 flex flex-col h-full gap-3"
- >
- <div className="flex flex-col lg:flex-row lg:items-center justify-between gap-4.5 pt-2 lg:pt-0">
- <ConversationNameWithStatus />
- <ConversationTabs />
- </div>
-
- <ConversationMain />
+ <EventHandler>
+ <div
+ data-testid="app-route"
+ className="p-3 md:p-0 flex flex-col h-full gap-3"
+ >
+ <div className="flex flex-col lg:flex-row lg:items-center justify-between gap-4.5 pt-2 lg:pt-0">
+ <ConversationNameWithStatus />
+ <ConversationTabs />
</div>
- </EventHandler>
- </ConversationSubscriptionsProvider>
+
+ <ConversationMain />
+ </div>
+ </EventHandler>
);
// Render WebSocket provider immediately to avoid mount/remount cycles
diff --git a/src/routes/launch.tsx b/src/routes/launch.tsx
index cd813b380c..76788c05bd 100644
--- a/src/routes/launch.tsx
+++ b/src/routes/launch.tsx
@@ -2,7 +2,7 @@ import React from "react";
import { useNavigate, useSearchParams } from "react-router";
import { useTranslation } from "react-i18next";
import { PluginLaunchModal } from "#/components/features/launch/plugin-launch-modal";
-import { PluginSpec } from "#/api/conversation-service/v1-conversation-service.types";
+import { PluginSpec } from "#/api/conversation-service/agent-server-conversation-service.types";
import { useCreateConversation } from "#/hooks/mutation/use-create-conversation";
import { I18nKey } from "#/i18n/declaration";
diff --git a/src/routes/shared-conversation.tsx b/src/routes/shared-conversation.tsx
index fe3d58ad14..e9ab55ffe8 100644
--- a/src/routes/shared-conversation.tsx
+++ b/src/routes/shared-conversation.tsx
@@ -4,11 +4,11 @@ import { useTranslation } from "react-i18next";
import { I18nKey } from "#/i18n/declaration";
import { useSharedConversation } from "#/hooks/query/use-shared-conversation";
import { useSharedConversationEvents } from "#/hooks/query/use-shared-conversation-events";
-import { Messages as V1Messages } from "#/components/v1/chat";
-import { shouldRenderEvent } from "#/components/v1/chat/event-content-helpers/should-render-event";
+import { Messages as Messages } from "#/components/conversation-events/chat";
+import { shouldRenderEvent } from "#/components/conversation-events/chat/event-content-helpers/should-render-event";
import { LoadingSpinner } from "#/components/shared/loading-spinner";
import { handleEventForUI } from "#/utils/handle-event-for-ui";
-import { OpenHandsEvent } from "#/types/v1/core";
+import { OpenHandsEvent } from "#/types/agent-server/core";
import OpenHandsLogo from "#/assets/branding/openhands-logo.svg?react";
import { useInfiniteScroll } from "#/hooks/use-infinite-scroll";
@@ -34,7 +34,7 @@ export default function SharedConversation() {
const error = conversationError || eventsError;
// Flatten all pages of events into a single array
- const v1Events = React.useMemo(() => {
+ const conversationEvents = React.useMemo(() => {
if (!eventsData?.pages) return [];
return eventsData.pages.flatMap((page) => page.items);
}, [eventsData?.pages]);
@@ -43,12 +43,12 @@ export default function SharedConversation() {
// completed tool calls render as a single action/observation unit.
const renderableEvents = React.useMemo(
() =>
- v1Events
+ conversationEvents
.reduce<
OpenHandsEvent[]
>((uiEvents, event) => handleEventForUI(event, uiEvents), [])
.filter(shouldRenderEvent),
- [v1Events],
+ [conversationEvents],
);
// Set up infinite scroll to load more events when user scrolls to bottom
@@ -118,7 +118,7 @@ export default function SharedConversation() {
>
<div className="max-w-4xl mx-auto p-4 border border-neutral-700 rounded">
{renderableEvents.length > 0 ? (
- <V1Messages messages={renderableEvents} allEvents={v1Events} />
+ <Messages messages={renderableEvents} allEvents={conversationEvents} />
) : (
<div className="flex items-center justify-center h-full">
<div className="text-center text-neutral-400 py-8">
diff --git a/src/services/settings.ts b/src/services/settings.ts
index c03769bacb..50040a047d 100644
--- a/src/services/settings.ts
+++ b/src/services/settings.ts
@@ -34,7 +34,6 @@ export const DEFAULT_SETTINGS: Settings = {
email_verified: true,
git_user_name: "openhands",
git_user_email: "[email protected]",
- v1_enabled: true,
agent_settings_schema: null,
agent_settings: {
schema_version: 1,
diff --git a/src/stores/conversation-state-store.ts b/src/stores/conversation-state-store.ts
new file mode 100644
index 0000000000..dd2dc4027f
--- /dev/null
+++ b/src/stores/conversation-state-store.ts
@@ -0,0 +1,27 @@
+import { create } from "zustand";
+import { ExecutionStatus } from "#/types/agent-server/core/base/common";
+
+interface ConversationStateStore {
+ execution_status: ExecutionStatus | null;
+
+ /**
+ * Set the agent status
+ */
+ setExecutionStatus: (execution_status: ExecutionStatus) => void;
+
+ /**
+ * Reset the store to initial state
+ */
+ reset: () => void;
+}
+
+export const useConversationStateStore = create<ConversationStateStore>(
+ (set) => ({
+ execution_status: null,
+
+ setExecutionStatus: (execution_status: ExecutionStatus) =>
+ set({ execution_status }),
+
+ reset: () => set({ execution_status: null }),
+ }),
+);
diff --git a/src/stores/conversation-store.ts b/src/stores/conversation-store.ts
index 3d864fe14e..586652be5d 100644
--- a/src/stores/conversation-store.ts
+++ b/src/stores/conversation-store.ts
@@ -97,7 +97,7 @@ const getInitialRightPanelState = (): boolean => {
? [`conversation-right-panel-shown-${conversationId}`]
: [];
- // Fallback to legacy global key for users who haven't switched tabs yet
+ // Fallback to global key for users who have not switched tabs yet
keysToCheck.push("conversation-right-panel-shown");
for (const key of keysToCheck) {
diff --git a/src/stores/event-message-store.ts b/src/stores/event-message-store.ts
index 08ba465bac..26fae834a8 100644
--- a/src/stores/event-message-store.ts
+++ b/src/stores/event-message-store.ts
@@ -1,38 +1,26 @@
import { create } from "zustand";
+type SubmittedEventId = string | number;
+
interface EventMessageState {
- submittedEventIds: number[]; // Avoid the flashing issue of the confirmation buttons
- v1SubmittedEventIds: string[]; // V1 event IDs (V1 uses string IDs)
+ submittedEventIds: SubmittedEventId[];
}
interface EventMessageStore extends EventMessageState {
- addSubmittedEventId: (id: number) => void;
- removeSubmittedEventId: (id: number) => void;
- addV1SubmittedEventId: (id: string) => void;
- removeV1SubmittedEventId: (id: string) => void;
+ addSubmittedEventId: (id: SubmittedEventId) => void;
+ removeSubmittedEventId: (id: SubmittedEventId) => void;
}
export const useEventMessageStore = create<EventMessageStore>((set) => ({
submittedEventIds: [],
- v1SubmittedEventIds: [],
- addSubmittedEventId: (id: number) =>
+ addSubmittedEventId: (id) =>
set((state) => ({
submittedEventIds: [...state.submittedEventIds, id],
})),
- removeSubmittedEventId: (id: number) =>
+ removeSubmittedEventId: (id) =>
set((state) => ({
submittedEventIds: state.submittedEventIds.filter(
(eventId) => eventId !== id,
),
})),
- addV1SubmittedEventId: (id: string) =>
- set((state) => ({
- v1SubmittedEventIds: [...state.v1SubmittedEventIds, id],
- })),
- removeV1SubmittedEventId: (id: string) =>
- set((state) => ({
- v1SubmittedEventIds: state.v1SubmittedEventIds.filter(
- (eventId) => eventId !== id,
- ),
- })),
}));
diff --git a/src/stores/use-event-store.ts b/src/stores/use-event-store.ts
index 27f35ddc8c..76fd6ab210 100644
--- a/src/stores/use-event-store.ts
+++ b/src/stores/use-event-store.ts
@@ -1,11 +1,8 @@
import { create } from "zustand";
-import { OpenHandsEvent } from "#/types/v1/core";
+import { OpenHandsEvent } from "#/types/agent-server/core";
import { handleEventForUI } from "#/utils/handle-event-for-ui";
-import { OpenHandsParsedEvent } from "#/types/core";
-import { isV1Event } from "#/types/v1/type-guards";
-// While we transition to v1 events, our store can handle both v0 and v1 events
-export type OHEvent = (OpenHandsEvent | OpenHandsParsedEvent) & {
+export type OHEvent = OpenHandsEvent & {
isFromPlanningAgent?: boolean;
};
@@ -82,10 +79,7 @@ export const useEventStore = create<EventState>()((set) => ({
: state.eventIds;
// Process UI events and sort if needed
- let newUiEvents = isV1Event(event)
- ? // @ts-expect-error - temporary, needs proper typing
- handleEventForUI(event, state.uiEvents)
- : [...state.uiEvents, event];
+ let newUiEvents = handleEventForUI(event, state.uiEvents);
if (needsSorting(state.uiEvents, event)) {
newUiEvents = newUiEvents.sort(compareEventsByTimestamp);
diff --git a/src/stores/v1-conversation-state-store.ts b/src/stores/v1-conversation-state-store.ts
deleted file mode 100644
index 8b4ba3f381..0000000000
--- a/src/stores/v1-conversation-state-store.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { create } from "zustand";
-import { V1ExecutionStatus } from "#/types/v1/core/base/common";
-
-interface V1ConversationStateStore {
- execution_status: V1ExecutionStatus | null;
-
- /**
- * Set the agent status
- */
- setExecutionStatus: (execution_status: V1ExecutionStatus) => void;
-
- /**
- * Reset the store to initial state
- */
- reset: () => void;
-}
-
-export const useV1ConversationStateStore = create<V1ConversationStateStore>(
- (set) => ({
- execution_status: null,
-
- setExecutionStatus: (execution_status: V1ExecutionStatus) =>
- set({ execution_status }),
-
- reset: () => set({ execution_status: null }),
- }),
-);
diff --git a/src/types/v1/core/base/action.ts b/src/types/agent-server/core/base/action.ts
similarity index 100%
rename from src/types/v1/core/base/action.ts
rename to src/types/agent-server/core/base/action.ts
diff --git a/src/types/v1/core/base/base.ts b/src/types/agent-server/core/base/base.ts
similarity index 100%
rename from src/types/v1/core/base/base.ts
rename to src/types/agent-server/core/base/base.ts
diff --git a/src/types/v1/core/base/common.ts b/src/types/agent-server/core/base/common.ts
similarity index 98%
rename from src/types/v1/core/base/common.ts
rename to src/types/agent-server/core/base/common.ts
index 56777d527d..115d705f5a 100644
--- a/src/types/v1/core/base/common.ts
+++ b/src/types/agent-server/core/base/common.ts
@@ -64,7 +64,7 @@ export enum SecurityRisk {
}
// Agent status
-export enum V1ExecutionStatus {
+export enum ExecutionStatus {
IDLE = "idle",
RUNNING = "running",
PAUSED = "paused",
diff --git a/src/types/v1/core/base/event.ts b/src/types/agent-server/core/base/event.ts
similarity index 100%
rename from src/types/v1/core/base/event.ts
rename to src/types/agent-server/core/base/event.ts
diff --git a/src/types/v1/core/base/index.ts b/src/types/agent-server/core/base/index.ts
similarity index 100%
rename from src/types/v1/core/base/index.ts
rename to src/types/agent-server/core/base/index.ts
diff --git a/src/types/v1/core/base/observation.ts b/src/types/agent-server/core/base/observation.ts
similarity index 100%
rename from src/types/v1/core/base/observation.ts
rename to src/types/agent-server/core/base/observation.ts
diff --git a/src/types/v1/core/events/acp-tool-call-event.ts b/src/types/agent-server/core/events/acp-tool-call-event.ts
similarity index 100%
rename from src/types/v1/core/events/acp-tool-call-event.ts
rename to src/types/agent-server/core/events/acp-tool-call-event.ts
diff --git a/src/types/v1/core/events/action-event.ts b/src/types/agent-server/core/events/action-event.ts
similarity index 100%
rename from src/types/v1/core/events/action-event.ts
rename to src/types/agent-server/core/events/action-event.ts
diff --git a/src/types/v1/core/events/condensation-event.ts b/src/types/agent-server/core/events/condensation-event.ts
similarity index 100%
rename from src/types/v1/core/events/condensation-event.ts
rename to src/types/agent-server/core/events/condensation-event.ts
diff --git a/src/types/v1/core/events/conversation-state-event.ts b/src/types/agent-server/core/events/conversation-state-event.ts
similarity index 94%
rename from src/types/v1/core/events/conversation-state-event.ts
rename to src/types/agent-server/core/events/conversation-state-event.ts
index 566318f207..4919b48051 100644
--- a/src/types/v1/core/events/conversation-state-event.ts
+++ b/src/types/agent-server/core/events/conversation-state-event.ts
@@ -1,5 +1,5 @@
import { BaseEvent } from "../base/event";
-import { V1ExecutionStatus } from "../base/common";
+import { ExecutionStatus } from "../base/common";
/**
* Token usage metrics for LLM calls
@@ -56,7 +56,7 @@ export interface ConversationStats {
* Conversation state value types
*/
export interface ConversationState {
- execution_status: V1ExecutionStatus;
+ execution_status: ExecutionStatus;
stats?: ConversationStats;
// Add other conversation state fields here as needed
}
@@ -81,7 +81,7 @@ interface ConversationStateUpdateEventBase extends BaseEvent {
/**
* Conversation state updates
*/
- value: ConversationState | V1ExecutionStatus | ConversationStats;
+ value: ConversationState | ExecutionStatus | ConversationStats;
}
// Narrowed interfaces for full state update event
@@ -93,7 +93,7 @@ export interface ConversationStateUpdateEventFullState extends ConversationState
// Narrowed interface for agent status update event
export interface ConversationStateUpdateEventAgentStatus extends ConversationStateUpdateEventBase {
key: "execution_status";
- value: V1ExecutionStatus;
+ value: ExecutionStatus;
}
// Narrowed interface for stats update event
diff --git a/src/types/v1/core/events/hook-execution-event.ts b/src/types/agent-server/core/events/hook-execution-event.ts
similarity index 100%
rename from src/types/v1/core/events/hook-execution-event.ts
rename to src/types/agent-server/core/events/hook-execution-event.ts
diff --git a/src/types/v1/core/events/index.ts b/src/types/agent-server/core/events/index.ts
similarity index 100%
rename from src/types/v1/core/events/index.ts
rename to src/types/agent-server/core/events/index.ts
diff --git a/src/types/v1/core/events/message-event.ts b/src/types/agent-server/core/events/message-event.ts
similarity index 100%
rename from src/types/v1/core/events/message-event.ts
rename to src/types/agent-server/core/events/message-event.ts
diff --git a/src/types/v1/core/events/observation-event.ts b/src/types/agent-server/core/events/observation-event.ts
similarity index 100%
rename from src/types/v1/core/events/observation-event.ts
rename to src/types/agent-server/core/events/observation-event.ts
diff --git a/src/types/v1/core/events/pause-event.ts b/src/types/agent-server/core/events/pause-event.ts
similarity index 100%
rename from src/types/v1/core/events/pause-event.ts
rename to src/types/agent-server/core/events/pause-event.ts
diff --git a/src/types/v1/core/events/system-event.ts b/src/types/agent-server/core/events/system-event.ts
similarity index 100%
rename from src/types/v1/core/events/system-event.ts
rename to src/types/agent-server/core/events/system-event.ts
diff --git a/src/types/v1/core/index.ts b/src/types/agent-server/core/index.ts
similarity index 100%
rename from src/types/v1/core/index.ts
rename to src/types/agent-server/core/index.ts
diff --git a/src/types/v1/core/openhands-event.ts b/src/types/agent-server/core/openhands-event.ts
similarity index 100%
rename from src/types/v1/core/openhands-event.ts
rename to src/types/agent-server/core/openhands-event.ts
diff --git a/src/types/v1/type-guards.ts b/src/types/agent-server/type-guards.ts
similarity index 86%
rename from src/types/v1/type-guards.ts
rename to src/types/agent-server/type-guards.ts
index 835a8092ea..1e2752c00c 100644
--- a/src/types/v1/type-guards.ts
+++ b/src/types/agent-server/type-guards.ts
@@ -24,7 +24,7 @@ import {
import { HookExecutionEvent } from "./core/events/hook-execution-event";
import { ACPToolCallEvent } from "./core/events/acp-tool-call-event";
import { SystemPromptEvent } from "./core/events/system-event";
-import type { OpenHandsParsedEvent } from "../core/index";
+
/**
* Type guard to check if an unknown value is a valid BaseEvent
@@ -227,41 +227,15 @@ export const isACPToolCallEvent = (
"kind" in event && event.kind === "ACPToolCallEvent";
// =============================================================================
-// TEMPORARY COMPATIBILITY TYPE GUARDS
-// These will be removed once we fully migrate to V1 events
+// COMPATIBILITY TYPE GUARDS
// =============================================================================
/**
- * TEMPORARY: Type guard to check if an event is a V1 OpenHandsEvent
- * Uses isBaseEvent to validate the complete event structure
- *
- * @deprecated This is temporary until full V1 migration is complete
+ * Type guard to check if an event is an agent-server OpenHandsEvent.
+ * Uses isBaseEvent to validate the complete event structure.
*/
-export function isV1Event(
- event: OpenHandsEvent | OpenHandsParsedEvent,
+export function isAgentServerEvent(
+ event: unknown,
): event is OpenHandsEvent {
- // Use isBaseEvent to validate the complete BaseEvent structure
- // This ensures the event has all required properties with correct types
return isBaseEvent(event);
}
-
-/**
- * TEMPORARY: Type guard to check if an event is a V0 OpenHandsParsedEvent
- *
- * @deprecated This is temporary until full V1 migration is complete
- */
-export function isV0Event(
- event: OpenHandsEvent | OpenHandsParsedEvent,
-): event is OpenHandsParsedEvent {
- // Handle null/undefined cases
- if (!event || typeof event !== "object") {
- return false;
- }
-
- // V0 events have numeric IDs and either 'action' or 'observation' properties
- return (
- "id" in event &&
- typeof event.id === "number" &&
- ("action" in event || "observation" in event)
- );
-}
diff --git a/src/types/core/actions.ts b/src/types/core/actions.ts
deleted file mode 100644
index bb80971e32..0000000000
--- a/src/types/core/actions.ts
+++ /dev/null
@@ -1,194 +0,0 @@
-import { OpenHandsActionEvent } from "./base";
-import { ActionSecurityRisk } from "#/stores/security-analyzer-store";
-
-export interface UserMessageAction extends OpenHandsActionEvent<"message"> {
- source: "user";
- args: {
- content: string;
- image_urls: string[];
- file_urls: string[];
- };
-}
-
-export interface SystemMessageAction extends OpenHandsActionEvent<"system"> {
- source: "agent" | "environment";
- args: {
- content: string;
- tools: Array<Record<string, unknown>> | null;
- openhands_version: string | null;
- agent_class: string | null;
- };
-}
-
-export interface CommandAction extends OpenHandsActionEvent<"run"> {
- source: "agent" | "user";
- args: {
- command: string;
- security_risk: ActionSecurityRisk;
- confirmation_state: "confirmed" | "rejected" | "awaiting_confirmation";
- thought: string;
- hidden?: boolean;
- };
-}
-
-export interface AssistantMessageAction extends OpenHandsActionEvent<"message"> {
- source: "agent";
- args: {
- thought: string;
- image_urls: string[] | null;
- file_urls: string[];
- wait_for_response: boolean;
- };
-}
-
-export interface IPythonAction extends OpenHandsActionEvent<"run_ipython"> {
- source: "agent";
- args: {
- code: string;
- security_risk: ActionSecurityRisk;
- confirmation_state: "confirmed" | "rejected" | "awaiting_confirmation";
- kernel_init_code: string;
- thought: string;
- };
-}
-
-export interface ThinkAction extends OpenHandsActionEvent<"think"> {
- source: "agent";
- args: {
- thought: string;
- };
-}
-
-export interface FinishAction extends OpenHandsActionEvent<"finish"> {
- source: "agent";
- args: {
- final_thought: string;
- outputs: Record<string, unknown>;
- thought: string;
- };
-}
-
-export interface DelegateAction extends OpenHandsActionEvent<"delegate"> {
- source: "agent";
- timeout: number;
- args: {
- agent: "BrowsingAgent";
- inputs: Record<string, string>;
- thought: string;
- };
-}
-
-export interface BrowseAction extends OpenHandsActionEvent<"browse"> {
- source: "agent";
- args: {
- url: string;
- thought: string;
- };
-}
-
-export interface BrowseInteractiveAction extends OpenHandsActionEvent<"browse_interactive"> {
- source: "agent";
- timeout: number;
- args: {
- browser_actions: string;
- thought: string | null;
- browsergym_send_msg_to_user: string;
- };
-}
-
-export interface FileReadAction extends OpenHandsActionEvent<"read"> {
- source: "agent";
- args: {
- path: string;
- thought: string;
- security_risk: ActionSecurityRisk | null;
- impl_source?: string;
- view_range?: number[] | null;
- };
-}
-
-export interface FileWriteAction extends OpenHandsActionEvent<"write"> {
- source: "agent";
- args: {
- path: string;
- content: string;
- thought: string;
- };
-}
-
-export interface FileEditAction extends OpenHandsActionEvent<"edit"> {
- source: "agent";
- args: {
- path: string;
- command?: string;
- file_text?: string | null;
- view_range?: number[] | null;
- old_str?: string | null;
- new_str?: string | null;
- insert_line?: number | null;
- content?: string;
- start?: number;
- end?: number;
- thought: string;
- security_risk: ActionSecurityRisk | null;
- impl_source?: string;
- };
-}
-
-export interface RejectAction extends OpenHandsActionEvent<"reject"> {
- source: "agent";
- args: {
- thought: string;
- };
-}
-
-export interface RecallAction extends OpenHandsActionEvent<"recall"> {
- source: "agent";
- args: {
- recall_type: "workspace_context" | "knowledge";
- query: string;
- thought: string;
- };
-}
-
-export interface MCPAction extends OpenHandsActionEvent<"call_tool_mcp"> {
- source: "agent";
- args: {
- name: string;
- arguments: Record<string, unknown>;
- thought?: string;
- };
-}
-
-export interface TaskTrackingAction extends OpenHandsActionEvent<"task_tracking"> {
- source: "agent";
- args: {
- command: string;
- task_list: Array<{
- id: string;
- title: string;
- status: "todo" | "in_progress" | "done";
- notes?: string;
- }>;
- thought: string;
- };
-}
-
-export type OpenHandsAction =
- | UserMessageAction
- | AssistantMessageAction
- | SystemMessageAction
- | CommandAction
- | IPythonAction
- | ThinkAction
- | FinishAction
- | DelegateAction
- | BrowseAction
- | BrowseInteractiveAction
- | FileReadAction
- | FileEditAction
- | FileWriteAction
- | RejectAction
- | RecallAction
- | MCPAction
- | TaskTrackingAction;
diff --git a/src/types/core/base.ts b/src/types/core/base.ts
deleted file mode 100644
index 97f56b245d..0000000000
--- a/src/types/core/base.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-export type OpenHandsEventType =
- | "message"
- | "system"
- | "agent_state_changed"
- | "change_agent_state"
- | "run"
- | "read"
- | "write"
- | "edit"
- | "run_ipython"
- | "delegate"
- | "browse"
- | "browse_interactive"
- | "reject"
- | "think"
- | "finish"
- | "error"
- | "recall"
- | "mcp"
- | "call_tool_mcp"
- | "task_tracking"
- | "user_rejected";
-
-export type OpenHandsSourceType = "agent" | "user" | "environment" | "hook";
-
-interface OpenHandsBaseEvent {
- id: number;
- source: OpenHandsSourceType;
- message: string;
- timestamp: string; // ISO 8601
-}
-
-export interface OpenHandsActionEvent<
- T extends OpenHandsEventType,
-> extends OpenHandsBaseEvent {
- action: T;
- args: Record<string, unknown>;
-}
-
-export interface OpenHandsObservationEvent<
- T extends OpenHandsEventType,
-> extends OpenHandsBaseEvent {
- cause: number;
- observation: T;
- content: string;
- extras: Record<string, unknown>;
-}
diff --git a/src/types/core/guards.ts b/src/types/core/guards.ts
deleted file mode 100644
index 6d7bf5fcdd..0000000000
--- a/src/types/core/guards.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import { OpenHandsParsedEvent } from ".";
-import {
- UserMessageAction,
- AssistantMessageAction,
- OpenHandsAction,
- SystemMessageAction,
- CommandAction,
- FinishAction,
- TaskTrackingAction,
-} from "./actions";
-import {
- AgentStateChangeObservation,
- CommandObservation,
- ErrorObservation,
- MCPObservation,
- OpenHandsObservation,
- TaskTrackingObservation,
-} from "./observations";
-import { StatusUpdate } from "./variances";
-
-export const isOpenHandsEvent = (
- event: unknown,
-): event is OpenHandsParsedEvent =>
- typeof event === "object" &&
- event !== null &&
- "id" in event &&
- "source" in event &&
- "message" in event &&
- "timestamp" in event;
-
-export const isOpenHandsAction = (
- event: OpenHandsParsedEvent,
-): event is OpenHandsAction => "action" in event;
-
-export const isOpenHandsObservation = (
- event: OpenHandsParsedEvent,
-): event is OpenHandsObservation => "observation" in event;
-
-export const isUserMessage = (
- event: OpenHandsParsedEvent,
-): event is UserMessageAction =>
- isOpenHandsAction(event) &&
- event.source === "user" &&
- event.action === "message";
-
-export const isAssistantMessage = (
- event: OpenHandsParsedEvent,
-): event is AssistantMessageAction =>
- isOpenHandsAction(event) &&
- event.source === "agent" &&
- (event.action === "message" || event.action === "finish");
-
-export const isErrorObservation = (
- event: OpenHandsParsedEvent,
-): event is ErrorObservation =>
- isOpenHandsObservation(event) && event.observation === "error";
-
-export const isCommandAction = (
- event: OpenHandsParsedEvent,
-): event is CommandAction => isOpenHandsAction(event) && event.action === "run";
-
-export const isAgentStateChangeObservation = (
- event: OpenHandsParsedEvent,
-): event is AgentStateChangeObservation =>
- isOpenHandsObservation(event) && event.observation === "agent_state_changed";
-
-export const isCommandObservation = (
- event: OpenHandsParsedEvent,
-): event is CommandObservation =>
- isOpenHandsObservation(event) && event.observation === "run";
-
-export const isFinishAction = (
- event: OpenHandsParsedEvent,
-): event is FinishAction =>
- isOpenHandsAction(event) && event.action === "finish";
-
-export const isSystemMessage = (
- event: OpenHandsParsedEvent,
-): event is SystemMessageAction =>
- isOpenHandsAction(event) && event.action === "system";
-
-export const isRejectObservation = (
- event: OpenHandsParsedEvent,
-): event is OpenHandsObservation =>
- isOpenHandsObservation(event) && event.observation === "user_rejected";
-
-export const isMcpObservation = (
- event: OpenHandsParsedEvent,
-): event is MCPObservation =>
- isOpenHandsObservation(event) && event.observation === "mcp";
-
-export const isTaskTrackingAction = (
- event: OpenHandsParsedEvent,
-): event is TaskTrackingAction =>
- isOpenHandsAction(event) && event.action === "task_tracking";
-
-export const isTaskTrackingObservation = (
- event: OpenHandsParsedEvent,
-): event is TaskTrackingObservation =>
- isOpenHandsObservation(event) && event.observation === "task_tracking";
-
-export const isStatusUpdate = (event: unknown): event is StatusUpdate =>
- typeof event === "object" &&
- event !== null &&
- "status_update" in event &&
- "type" in event &&
- "id" in event;
-
-export const isActionOrObservation = (
- event: OpenHandsParsedEvent,
-): event is OpenHandsAction | OpenHandsObservation =>
- isOpenHandsAction(event) || isOpenHandsObservation(event);
diff --git a/src/types/core/index.ts b/src/types/core/index.ts
deleted file mode 100644
index 2f74f9cddc..0000000000
--- a/src/types/core/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { OpenHandsAction } from "./actions";
-import { OpenHandsObservation } from "./observations";
-import { OpenHandsVariance } from "./variances";
-
-/**
- * @deprecated Will be removed once we fully transition to v1 events
- */
-export type OpenHandsParsedEvent =
- | OpenHandsAction
- | OpenHandsObservation
- | OpenHandsVariance;
diff --git a/src/types/core/observations.ts b/src/types/core/observations.ts
deleted file mode 100644
index 2741926fda..0000000000
--- a/src/types/core/observations.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-import { AgentState } from "../agent-state";
-import { OpenHandsObservationEvent } from "./base";
-
-export interface AgentStateChangeObservation extends OpenHandsObservationEvent<"agent_state_changed"> {
- source: "agent";
- extras: {
- agent_state: AgentState;
- reason?: string;
- };
-}
-
-export interface CommandObservation extends OpenHandsObservationEvent<"run"> {
- source: "agent" | "user";
- extras: {
- command: string;
- hidden?: boolean;
- metadata: Record<string, unknown>;
- };
-}
-
-export interface IPythonObservation extends OpenHandsObservationEvent<"run_ipython"> {
- source: "agent";
- extras: {
- code: string;
- image_urls?: string[];
- };
-}
-
-export interface DelegateObservation extends OpenHandsObservationEvent<"delegate"> {
- source: "agent";
- extras: {
- outputs: Record<string, unknown>;
- };
-}
-
-export interface BrowseObservation extends OpenHandsObservationEvent<"browse"> {
- source: "agent";
- extras: {
- url: string;
- screenshot: string;
- error: boolean;
- open_page_urls: string[];
- active_page_index: number;
- dom_object: Record<string, unknown>;
- axtree_object: Record<string, unknown>;
- extra_element_properties: Record<string, unknown>;
- last_browser_action: string;
- last_browser_action_error: unknown;
- focused_element_bid: string;
- };
-}
-
-export interface BrowseInteractiveObservation extends OpenHandsObservationEvent<"browse_interactive"> {
- source: "agent";
- extras: {
- url: string;
- screenshot: string;
- error: boolean;
- open_page_urls: string[];
- active_page_index: number;
- dom_object: Record<string, unknown>;
- axtree_object: Record<string, unknown>;
- extra_element_properties: Record<string, unknown>;
- last_browser_action: string;
- last_browser_action_error: unknown;
- focused_element_bid: string;
- };
-}
-
-export interface WriteObservation extends OpenHandsObservationEvent<"write"> {
- source: "agent";
- extras: {
- path: string;
- content: string;
- };
-}
-
-export interface ReadObservation extends OpenHandsObservationEvent<"read"> {
- source: "agent";
- extras: {
- path: string;
- impl_source: string;
- };
-}
-
-export interface EditObservation extends OpenHandsObservationEvent<"edit"> {
- source: "agent";
- extras: {
- path: string;
- diff: string;
- impl_source: string;
- };
-}
-
-export interface ErrorObservation extends OpenHandsObservationEvent<"error"> {
- source: "user";
- extras: {
- error_id?: string;
- };
-}
-
-export interface AgentThinkObservation extends OpenHandsObservationEvent<"think"> {
- source: "agent";
- extras: {
- thought: string;
- };
-}
-
-export interface MicroagentKnowledge {
- name: string;
- trigger: string;
- content: string;
-}
-
-export interface RecallObservation extends OpenHandsObservationEvent<"recall"> {
- source: "agent";
- extras: {
- recall_type?: "workspace_context" | "knowledge";
- repo_name?: string;
- repo_directory?: string;
- repo_instructions?: string;
- runtime_hosts?: Record<string, number>;
- custom_secrets_descriptions?: Record<string, string>;
- additional_agent_instructions?: string;
- conversation_instructions?: string;
- date?: string;
- microagent_knowledge?: MicroagentKnowledge[];
- };
-}
-
-export interface MCPObservation extends OpenHandsObservationEvent<"mcp"> {
- source: "agent";
- extras: {
- name: string;
- arguments: Record<string, unknown>;
- };
-}
-
-export interface UserRejectedObservation extends OpenHandsObservationEvent<"user_rejected"> {
- source: "agent";
- extras: Record<string, unknown>;
-}
-
-export interface TaskTrackingObservation extends OpenHandsObservationEvent<"task_tracking"> {
- source: "agent";
- extras: {
- command: string;
- task_list: Array<{
- id: string;
- title: string;
- status: "todo" | "in_progress" | "done";
- notes?: string;
- }>;
- };
-}
-
-export type OpenHandsObservation =
- | AgentStateChangeObservation
- | AgentThinkObservation
- | CommandObservation
- | IPythonObservation
- | DelegateObservation
- | BrowseObservation
- | BrowseInteractiveObservation
- | WriteObservation
- | ReadObservation
- | EditObservation
- | ErrorObservation
- | RecallObservation
- | MCPObservation
- | UserRejectedObservation
- | TaskTrackingObservation;
diff --git a/src/types/core/variances.ts b/src/types/core/variances.ts
deleted file mode 100644
index 4a98e45b01..0000000000
--- a/src/types/core/variances.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/** Variances are types which do not conform to the current event pattern */
-
-export interface TokenConfigSuccess {
- status: "ok" | number;
- token: string;
-}
-
-interface TokenConfigError {
- status: 401;
-}
-
-type TokenConfig = TokenConfigSuccess | TokenConfigError;
-
-export interface InitConfig {
- action: "initialize";
- args: {
- AGENT: string;
- CONFIRMATION_MODE: boolean;
- LANGUAGE: string;
- LLM_API_KEY_SET: boolean;
- LLM_MODEL: string;
- };
- token?: string;
- latest_event_id?: unknown; // Not sure what this is
-}
-
-// Bare minimum event type sent from the client
-interface LocalUserMessageAction {
- action: "message";
- args: {
- content: string;
- image_urls: string[];
- };
-}
-
-export interface StatusUpdate {
- status_update: true;
- type: "error" | "info";
- id: string;
- message: string;
-}
-
-export type OpenHandsVariance =
- | TokenConfig
- | InitConfig
- | LocalUserMessageAction
- | StatusUpdate;
diff --git a/src/types/message.tsx b/src/types/message.tsx
index 0ae9e708ce..24d0f9909d 100644
--- a/src/types/message.tsx
+++ b/src/types/message.tsx
@@ -1,6 +1,6 @@
/**
* @deprecated This type is deprecated and will be removed in a future version.
- * Use types in `frontend/src/types/core` instead.
+ * Use agent-server event types instead.
*/
export interface ActionMessage {
id: number;
diff --git a/src/types/settings.ts b/src/types/settings.ts
index ea14d816cd..2b256221c6 100644
--- a/src/types/settings.ts
+++ b/src/types/settings.ts
@@ -126,7 +126,6 @@ export type Settings = {
email_verified?: boolean;
git_user_name?: string;
git_user_email?: string;
- v1_enabled?: boolean;
agent_settings_schema?: SettingsSchema | null;
agent_settings?: Record<string, SettingsValue> | null;
conversation_settings_schema?: SettingsSchema | null;
diff --git a/src/utils/cache-utils.ts b/src/utils/cache-utils.ts
index aa16c6c653..6bbce877d9 100644
--- a/src/utils/cache-utils.ts
+++ b/src/utils/cache-utils.ts
@@ -1,5 +1,5 @@
import { QueryClient } from "@tanstack/react-query";
-import type { ActionEvent } from "#/types/v1/core/events/action-event";
+import type { ActionEvent } from "#/types/agent-server/core/events/action-event";
import { stripWorkspacePrefix } from "./path-utils";
/**
diff --git a/src/utils/conversation-metrics.ts b/src/utils/conversation-metrics.ts
index 69ef293174..82be19797b 100644
--- a/src/utils/conversation-metrics.ts
+++ b/src/utils/conversation-metrics.ts
@@ -1,16 +1,16 @@
import type {
- V1MetricsSnapshot,
- V1RuntimeConversationInfo,
- V1TokenUsage,
-} from "#/api/conversation-service/v1-conversation-service.types";
+ MetricsSnapshot,
+ RuntimeConversationInfo,
+ TokenUsage,
+} from "#/api/conversation-service/agent-server-conversation-service.types";
/**
* TypeScript equivalent of the get_combined_metrics method from the Python SDK
* Combines metrics from all LLM usage IDs in the conversation stats
*/
export function getCombinedMetrics(
- conversationInfo: V1RuntimeConversationInfo,
-): V1MetricsSnapshot {
+ conversationInfo: RuntimeConversationInfo,
+): MetricsSnapshot {
const { stats } = conversationInfo;
if (!stats?.usage_to_metrics) {
@@ -23,7 +23,7 @@ export function getCombinedMetrics(
let totalCost = 0;
let maxBudgetPerTask: number | null = null;
- let combinedTokenUsage: V1TokenUsage | null = null;
+ let combinedTokenUsage: TokenUsage | null = null;
// Iterate through all metrics and combine them
for (const metrics of Object.values(stats.usage_to_metrics)) {
diff --git a/src/utils/git-status-mapper.ts b/src/utils/git-status-mapper.ts
index b739a168fd..050214de01 100644
--- a/src/utils/git-status-mapper.ts
+++ b/src/utils/git-status-mapper.ts
@@ -1,13 +1,13 @@
import type {
GitChangeStatus,
- V1GitChangeStatus,
+ AgentServerGitChangeStatus,
} from "#/api/open-hands.types";
type ClientGitChangeStatus = "added" | "modified" | "deleted" | "renamed";
-type SupportedGitStatus = V1GitChangeStatus | ClientGitChangeStatus;
+type SupportedGitStatus = AgentServerGitChangeStatus | ClientGitChangeStatus;
-export function mapAnyGitStatusToV0Status(
+export function mapAnyGitStatusToClientStatus(
status: SupportedGitStatus,
): GitChangeStatus {
switch (status) {
@@ -28,6 +28,6 @@ export function mapAnyGitStatusToV0Status(
}
}
-export function mapV1ToV0Status(v1Status: V1GitChangeStatus): GitChangeStatus {
- return mapAnyGitStatusToV0Status(v1Status);
+export function mapAgentServerToClientGitStatus(agentServerStatus: AgentServerGitChangeStatus): GitChangeStatus {
+ return mapAnyGitStatusToClientStatus(agentServerStatus);
}
diff --git a/src/utils/handle-event-for-ui.ts b/src/utils/handle-event-for-ui.ts
index b67023ad83..8298c7dff5 100644
--- a/src/utils/handle-event-for-ui.ts
+++ b/src/utils/handle-event-for-ui.ts
@@ -1,5 +1,8 @@
-import { OpenHandsEvent } from "#/types/v1/core";
-import { isACPToolCallEvent, isObservationEvent } from "#/types/v1/type-guards";
+import { OpenHandsEvent } from "#/types/agent-server/core";
+import {
+ isACPToolCallEvent,
+ isObservationEvent,
+} from "#/types/agent-server/type-guards";
/**
* Handles adding an event to the UI events array
diff --git a/src/utils/status.ts b/src/utils/status.ts
index 268bb18719..69f9334d0f 100644
--- a/src/utils/status.ts
+++ b/src/utils/status.ts
@@ -2,34 +2,34 @@ import { I18nKey } from "#/i18n/declaration";
import { AgentState } from "#/types/agent-state";
import { ConversationStatus } from "#/types/conversation-status";
import { RuntimeStatus } from "#/types/runtime-status";
-import { V1AppConversationStartTaskStatus } from "#/api/conversation-service/v1-conversation-service.types";
-import { V1ExecutionStatus } from "#/types/v1/core/base/common";
-import { V1_WebSocketConnectionState } from "#/contexts/conversation-websocket-context";
-
-const ACTIVE_EXECUTION_STATUSES: ReadonlySet<V1ExecutionStatus> = new Set([
- V1ExecutionStatus.IDLE,
- V1ExecutionStatus.RUNNING,
- V1ExecutionStatus.WAITING_FOR_CONFIRMATION,
- V1ExecutionStatus.FINISHED,
+import { AppConversationStartTaskStatus } from "#/api/conversation-service/agent-server-conversation-service.types";
+import { ExecutionStatus } from "#/types/agent-server/core/base/common";
+import { WebSocketConnectionState } from "#/contexts/conversation-websocket-context";
+
+const ACTIVE_EXECUTION_STATUSES: ReadonlySet<ExecutionStatus> = new Set([
+ ExecutionStatus.IDLE,
+ ExecutionStatus.RUNNING,
+ ExecutionStatus.WAITING_FOR_CONFIRMATION,
+ ExecutionStatus.FINISHED,
]);
export function isExecutionActive(
- status: V1ExecutionStatus | null | undefined,
+ status: ExecutionStatus | null | undefined,
): boolean {
return !!status && ACTIVE_EXECUTION_STATUSES.has(status);
}
export function isExecutionPaused(
- status: V1ExecutionStatus | null | undefined,
+ status: ExecutionStatus | null | undefined,
): boolean {
- return status === V1ExecutionStatus.PAUSED;
+ return status === ExecutionStatus.PAUSED;
}
export function isExecutionErrored(
- status: V1ExecutionStatus | null | undefined,
+ status: ExecutionStatus | null | undefined,
): boolean {
return (
- status === V1ExecutionStatus.ERROR || status === V1ExecutionStatus.STUCK
+ status === ExecutionStatus.ERROR || status === ExecutionStatus.STUCK
);
}
@@ -71,7 +71,7 @@ export const AGENT_STATUS_MAP: {
};
export function getIndicatorColor(
- webSocketStatus: V1_WebSocketConnectionState,
+ webSocketStatus: WebSocketConnectionState,
conversationStatus: ConversationStatus | null,
runtimeStatus: RuntimeStatus | null,
agentState: AgentState | null,
@@ -126,10 +126,10 @@ export function getIndicatorColor(
}
export function getStatusCode(
- webSocketConnectionState: V1_WebSocketConnectionState,
- executionStatus: V1ExecutionStatus | null,
- taskStatus?: V1AppConversationStartTaskStatus | null,
- subConversationTaskStatus?: V1AppConversationStartTaskStatus | null,
+ webSocketConnectionState: WebSocketConnectionState,
+ executionStatus: ExecutionStatus | null,
+ taskStatus?: AppConversationStartTaskStatus | null,
+ subConversationTaskStatus?: AppConversationStartTaskStatus | null,
) {
if (
taskStatus === "ERROR" ||
@@ -158,7 +158,7 @@ export function getStatusCode(
}
}
- if (executionStatus === V1ExecutionStatus.PAUSED) {
+ if (executionStatus === ExecutionStatus.PAUSED) {
return I18nKey.CHAT_INTERFACE$STOPPED;
}
@@ -177,15 +177,15 @@ export function getStatusCode(
}
}
- if (executionStatus && executionStatus !== V1ExecutionStatus.STUCK) {
+ if (executionStatus && executionStatus !== ExecutionStatus.STUCK) {
switch (executionStatus) {
- case V1ExecutionStatus.IDLE:
+ case ExecutionStatus.IDLE:
return I18nKey.AGENT_STATUS$WAITING_FOR_TASK;
- case V1ExecutionStatus.RUNNING:
+ case ExecutionStatus.RUNNING:
return I18nKey.AGENT_STATUS$RUNNING_TASK;
- case V1ExecutionStatus.WAITING_FOR_CONFIRMATION:
+ case ExecutionStatus.WAITING_FOR_CONFIRMATION:
return I18nKey.AGENT_STATUS$WAITING_FOR_USER_CONFIRMATION;
- case V1ExecutionStatus.FINISHED:
+ case ExecutionStatus.FINISHED:
return I18nKey.CHAT_INTERFACE$AGENT_FINISHED_MESSAGE;
default:
throw new Error(`Unknown executionStatus: ${executionStatus}`);
diff --git a/src/utils/system-message-adapter.ts b/src/utils/system-message-adapter.ts
index 52efc05f79..d7f912524b 100644
--- a/src/utils/system-message-adapter.ts
+++ b/src/utils/system-message-adapter.ts
@@ -1,11 +1,6 @@
import { OHEvent } from "#/stores/use-event-store";
-import { isActionOrObservation, isSystemMessage } from "#/types/core/guards";
-import { ChatCompletionToolParam } from "#/types/v1/core";
-import {
- isSystemPromptEvent,
- isV0Event,
- isV1Event,
-} from "#/types/v1/type-guards";
+import { ChatCompletionToolParam } from "#/types/agent-server/core";
+import { isSystemPromptEvent } from "#/types/agent-server/type-guards";
export interface SystemMessageForModal {
content: string;
@@ -17,31 +12,16 @@ export interface SystemMessageForModal {
export function adaptSystemMessage(
events: OHEvent[],
): SystemMessageForModal | null {
- let systemMessage: SystemMessageForModal | null = null;
- const v0SystemMessage = events
- .filter(isV0Event)
- .filter(isActionOrObservation)
- .find(isSystemMessage);
+ const systemPromptEvent = events.find(isSystemPromptEvent);
- // V1 System Prompt Event
- const v1SystemPromptEvent = events
- .filter(isV1Event)
- .find(isSystemPromptEvent);
-
- if (v0SystemMessage) {
- systemMessage = v0SystemMessage.args;
- } else if (v1SystemPromptEvent) {
- systemMessage = {
- content: v1SystemPromptEvent.system_prompt.text,
- tools: v1SystemPromptEvent.tools ?? null,
- openhands_version: null,
- agent_class: null,
- };
- }
-
- if (systemMessage) {
- return systemMessage;
+ if (!systemPromptEvent) {
+ return null;
}
- return null;
+ return {
+ content: systemPromptEvent.system_prompt.text,
+ tools: systemPromptEvent.tools ?? null,
+ openhands_version: null,
+ agent_class: null,
+ };
}
diff --git a/test-utils.tsx b/test-utils.tsx
index f729392963..1788bb3b7e 100644
--- a/test-utils.tsx
+++ b/test-utils.tsx
@@ -10,12 +10,12 @@ import {
MessageEvent,
ObservationEvent,
PlanningFileEditorObservation,
-} from "#/types/v1/core";
+} from "#/types/agent-server/core";
import {
NavigationProvider,
type NavigationContextValue,
} from "#/context/navigation-context";
-import { SecurityRisk } from "#/types/v1/core";
+import { SecurityRisk } from "#/types/agent-server/core";
export const useParamsMock = vi.fn(() => ({
conversationId: "test-conversation-id",