("1h");
const detail = useQuery({ ...nodeDetailQuery(node.id, range), placeholderData: keepPreviousData, refetchInterval: 30_000, refetchIntervalInBackground: false });
@@ -51,7 +53,7 @@ export function NodeHost({ node, reporting }: { node: SandboxNode; reporting: bo
{t("Free disk")}{reporting ? formatBytes(node.available_disk_bytes) : MISSING}
{current ?
- : detail.isError ? {t("Host history could not be read. {{reason}}", { reason: detail.error instanceof Error ? detail.error.message : "" })}
+ : detail.isError ? {t("Host history could not be read. {{reason}}", { reason: coreError(detail.error, tCommon) })}
: }
);
diff --git a/apps/web/src/features/sessions/ExecutorCredentialsSection.tsx b/apps/web/src/features/sessions/ExecutorCredentialsSection.tsx
index 6ce5664a3..b668a1599 100644
--- a/apps/web/src/features/sessions/ExecutorCredentialsSection.tsx
+++ b/apps/web/src/features/sessions/ExecutorCredentialsSection.tsx
@@ -11,6 +11,7 @@ import { CopyableId, RowActions } from "../../components/list-ui";
import { Modal } from "../../components/Modal";
import { TableSkeleton } from "../../components/Skeleton";
import { failedLast, useFailureToast, useToast } from "../../components/Toast";
+import { coreError } from "../../lib/core-error";
import { useDeleteFlow } from "../../lib/delete-flow";
import { epochSeconds, formatDateTime, shortId } from "../../lib/format";
import { admin, useProjects } from "../../lib/projects";
@@ -34,22 +35,16 @@ function newKeyId(): string {
}
/**
- * A write either failed before Core acted ("rejected", with Core's reason) or
+ * A write either failed before Core acted ("rejected", with Core's error) or
* has an unknown outcome: no answer, a timeout, a 5xx or an unreadable reply.
*/
-type WriteFailure = { kind: "rejected"; message: string; code: string | null } | { kind: "uncertain" };
+type WriteFailure = { kind: "rejected"; cause: AgentCoreError } | { kind: "uncertain" };
function writeFailure(error: unknown): WriteFailure {
- if (error instanceof AgentCoreError && error.status >= 400 && error.status < 500 && error.status !== 408) {
- return { kind: "rejected", message: error.message, code: error.code ?? null };
- }
+ if (error instanceof AgentCoreError && error.status >= 400 && error.status < 500 && error.status !== 408) return { kind: "rejected", cause: error };
return { kind: "uncertain" };
}
-function message(error: unknown): string {
- return error instanceof Error ? error.message : String(error ?? "");
-}
-
function sameKey(a: string, b: string): boolean {
return a.toLowerCase() === b.toLowerCase();
}
@@ -71,6 +66,7 @@ function sameKey(a: string, b: string): boolean {
*/
export function ExecutorCredentialsSection({ projectId, sessionId, environmentId }: { projectId: string; sessionId: string; environmentId: string; remoteUrl: string; workspaceDirectory?: string }) {
const { t, i18n } = useTranslation("sessions");
+ const { t: tCommon } = useTranslation("common");
const locale = i18n.resolvedLanguage;
const toast = useToast();
const { byId, refresh: refreshProjects } = useProjects();
@@ -83,7 +79,7 @@ export function ExecutorCredentialsSection({ projectId, sessionId, environmentId
const boundCredential = boundExecutorCredential(query.data);
const { refetch } = query;
const reread = () => { void refetch(); };
- useFailureToast(credentials && failedLast(query) ? message(query.error) : null, t("executor.refreshFailed"), "executor-credentials-read");
+ useFailureToast(credentials && failedLast(query) ? coreError(query.error, tCommon) : null, t("executor.refreshFailed"), "executor-credentials-read");
// The key ID of an issuance in flight or with an unknown outcome; the next Issue sends it again unless it is listed.
const [kept, setKept] = useState(null);
@@ -154,20 +150,20 @@ export function ExecutorCredentialsSection({ projectId, sessionId, environmentId
return;
}
setKept(null);
- if (failure.code === "executor_credential_exists") {
+ if (failure.cause.code === "executor_credential_exists") {
// An earlier attempt with this key ID may have been issued after all, its secret lost.
const found = await findListed(keyId);
if (!found || !recoverLost(found)) {
- toast.show(t("executor.issueRejected"), { tone: "error", detail: found?.revoked_at ? t("executor.existsRevoked", { id: shortId(keyId) }) : failure.message });
+ toast.show(t("executor.issueRejected"), { tone: "error", detail: found?.revoked_at ? t("executor.existsRevoked", { id: shortId(keyId) }) : coreError(failure.cause, tCommon) });
}
return;
}
- if (failure.code === "project_archived") {
+ if (failure.cause.code === "project_archived") {
// Archived meanwhile: read the project again so issuing and rotating disappear.
toast.show(t("executor.issueRejected"), { tone: "error", detail: t("executor.archived") });
refreshProjects();
} else {
- toast.show(t("executor.issueRejected"), { tone: "error", detail: failure.message });
+ toast.show(t("executor.issueRejected"), { tone: "error", detail: coreError(failure.cause, tCommon) });
}
reread();
} finally {
@@ -198,11 +194,11 @@ export function ExecutorCredentialsSection({ projectId, sessionId, environmentId
setShown({ credential, open: true, done: false });
} catch (error) {
const failure = writeFailure(error);
- if (failure.kind === "rejected" && failure.code === "project_archived") {
+ if (failure.kind === "rejected" && failure.cause.code === "project_archived") {
setRotationError(t("executor.archived"));
refreshProjects();
} else {
- setRotationError(failure.kind === "uncertain" ? t("executor.rotateDialog.uncertain") : t("executor.rotateDialog.rejected", { reason: failure.message }));
+ setRotationError(failure.kind === "uncertain" ? t("executor.rotateDialog.uncertain") : t("executor.rotateDialog.rejected", { reason: coreError(failure.cause, tCommon) }));
}
} finally {
setRotating(false);
@@ -219,7 +215,7 @@ export function ExecutorCredentialsSection({ projectId, sessionId, environmentId
let body;
if (!credentials) {
body = query.isError
- ?
+ ?
: ;
} else if (!credentials.length) {
body = ;
diff --git a/apps/web/src/features/sessions/SessionDeleteDialog.tsx b/apps/web/src/features/sessions/SessionDeleteDialog.tsx
index 52a6ce180..a4dbba0e6 100644
--- a/apps/web/src/features/sessions/SessionDeleteDialog.tsx
+++ b/apps/web/src/features/sessions/SessionDeleteDialog.tsx
@@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next";
import { ConfirmDialog } from "../../components/ConfirmDialog";
import { useToast } from "../../components/Toast";
+import { coreError } from "../../lib/core-error";
import { projectClient } from "../../lib/projects";
import { shortId } from "../../lib/format";
@@ -17,7 +18,7 @@ export type SessionDeleteOutcome =
| { kind: "missing" }
/** Core refused: the Session has work in flight. */
| { kind: "not-idle" }
- | { kind: "rejected"; reason: string }
+ | { kind: "rejected"; cause: AgentCoreError }
/** No answer from Core; the Session may or may not be gone. Never retried automatically. */
| { kind: "uncertain" };
@@ -34,7 +35,7 @@ export async function deleteSession(target: SessionDeleteTarget): Promise= 400 && error.status < 500) return { kind: "rejected", reason: error.message };
+ if (error instanceof AgentCoreError && error.status >= 400 && error.status < 500) return { kind: "rejected", cause: error };
return { kind: "uncertain" };
}
@@ -56,6 +57,7 @@ export function SessionDeleteDialog({
onUncertain: () => void;
}) {
const { t } = useTranslation("sessions");
+ const { t: tCommon } = useTranslation("common");
const toast = useToast();
const [busy, setBusy] = useState(false);
const [problem, setProblem] = useState(null);
@@ -78,7 +80,7 @@ export function SessionDeleteDialog({
return;
}
if (outcome.kind === "uncertain") onUncertain();
- setProblem(outcome.kind === "not-idle" ? t("delete.notIdle") : outcome.kind === "rejected" ? t("delete.rejected", { reason: outcome.reason }) : t("delete.uncertain"));
+ setProblem(outcome.kind === "not-idle" ? t("delete.notIdle") : outcome.kind === "rejected" ? t("delete.rejected", { reason: coreError(outcome.cause, tCommon) }) : t("delete.uncertain"));
};
return (
diff --git a/apps/web/src/features/sessions/SessionPage.tsx b/apps/web/src/features/sessions/SessionPage.tsx
index 9e8bf4a7a..4187e3ddb 100644
--- a/apps/web/src/features/sessions/SessionPage.tsx
+++ b/apps/web/src/features/sessions/SessionPage.tsx
@@ -4,6 +4,7 @@ import { useEffect, useMemo, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { useFailureToast } from "../../components/Toast";
+import { coreError } from "../../lib/core-error";
import { DetailSkeleton } from "../../components/Skeleton";
import { EmptyState, Kpi, KpiStrip, PageBody, PageHeader, RefreshButton, revealInPageBody, Section, SegmentedControl } from "../../components/console-ui";
import { CopyableId } from "../../components/list-ui";
@@ -30,10 +31,6 @@ import "./sessions.css";
type HistoryView = "conversation" | "trace" | "turns";
-function errorText(error: unknown): string {
- return error instanceof Error ? error.message : String(error ?? "");
-}
-
/**
* Monitor › Session log › one Session: its facts, usage, conversation, trace,
* Turns and (for hosted sandboxes) runtime, read-only; a self-hosted Session's
@@ -86,10 +83,10 @@ export function SessionPage() {
if (projectId && sessionId) void queryClient.invalidateQueries({ queryKey: [...sessionKey(projectId, sessionId), "executor-credentials"] });
};
const time = loadedAt ? formatClock(loadedAt, locale) : MISSING;
- const itemsError = session ? history.history?.itemsError ?? null : null;
- const turnsError = session ? history.history?.turnsError ?? null : null;
+ const itemsError = session && history.history?.itemsError ? coreError(history.history.itemsError, tCommon) : null;
+ const turnsError = session && history.history?.turnsError ? coreError(history.history.turnsError, tCommon) : null;
// Failed reads that leave the last history on screen are reported in toasts.
- useFailureToast(session !== null && !history.gone && history.error ? errorText(history.error) : null, t("detail.stale"), "session-refresh");
+ useFailureToast(session !== null && !history.gone && history.error ? coreError(history.error, tCommon) : null, t("detail.stale"), "session-refresh");
useFailureToast(Boolean(itemsError), t("history.itemsFailed", { reason: itemsError ?? "" }), "session-items");
useFailureToast(Boolean(turnsError), t("history.turnsFailed", { reason: turnsError ?? "" }), "session-turns");
@@ -101,7 +98,7 @@ export function SessionPage() {
} else if (!session) {
if (history.phase === "loading") body = ;
else if (isNotFound(history.error)) body = {t("detail.back")}} />;
- else body = {t("detail.retry")}} />;
+ else body = {t("detail.retry")}} />;
} else {
const items = history.history?.items ?? [];
const turns = history.history?.turns ?? [];
diff --git a/apps/web/src/features/sessions/SessionRuntimeSection.tsx b/apps/web/src/features/sessions/SessionRuntimeSection.tsx
index f5a663aca..ba871fce9 100644
--- a/apps/web/src/features/sessions/SessionRuntimeSection.tsx
+++ b/apps/web/src/features/sessions/SessionRuntimeSection.tsx
@@ -23,10 +23,6 @@ function sampleSpacing(samples: readonly RuntimeTrendSample[]): number {
const HISTORY_REFRESH_MS = 30_000;
-function message(error: unknown): string {
- return error instanceof Error ? error.message : String(error);
-}
-
/** Runs `action` whenever `value` changes after the first render. */
function useOnChange(value: unknown, action: () => void) {
const seen = useRef(value);
@@ -66,7 +62,7 @@ export function SessionRuntimeSection({
const observationRead = useQuery(sessionObservationQuery(projectId, session.id));
useOnChange(revision, observationRead.refetch);
const observation = observationRead.data ?? null;
- const observationError = observationRead.isError ? message(observationRead.error) : null;
+ const observationError = observationRead.isError ? coreError(observationRead.error, tCommon) : null;
// The Session object changes on every poll; its ID and the range decide what to read.
const historyRead = useQuery({
diff --git a/apps/web/src/features/sessions/executor-credential-ownership.test.tsx b/apps/web/src/features/sessions/executor-credential-ownership.test.tsx
index 92034e579..09874e001 100644
--- a/apps/web/src/features/sessions/executor-credential-ownership.test.tsx
+++ b/apps/web/src/features/sessions/executor-credential-ownership.test.tsx
@@ -1,4 +1,4 @@
-import type { ExecutorCredentialList } from "@oac/agents-client";
+import { AgentCoreError, type ExecutorCredentialList } from "@oac/agents-client";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { renderToStaticMarkup } from "react-dom/server";
import { afterEach, describe, expect, it, vi } from "vitest";
@@ -32,7 +32,7 @@ function render(value: ExecutorCredentialList | null, failed = false) {
const options = executorConnectionQuery("project", "session", "environment");
if (value) client.setQueryData(options.queryKey, value);
else client.getQueryCache().build(client, { queryKey: options.queryKey });
- if (failed) client.getQueryCache().find({ queryKey: options.queryKey })!.setState({ status: "error", error: new Error("unavailable"), errorUpdatedAt: Date.now() + 1_000 });
+ if (failed) client.getQueryCache().find({ queryKey: options.queryKey })!.setState({ status: "error", error: new AgentCoreError("Credential store unavailable.", 503, "credential_store_unavailable"), errorUpdatedAt: Date.now() + 1_000 });
const html = renderToStaticMarkup();
client.clear();
return html;
@@ -80,5 +80,9 @@ describe("executor credential display ownership", () => {
expect(html.match(/aria-label="轮换以恢复"/g)).toHaveLength(1);
expect(html).toContain("刷新 · 主机连接");
expect(html).toContain('data-host-connected="false"');
+ // Core's messages are English: a failed read names its code instead.
+ const failed = render(null, true);
+ expect(failed).toContain("Core 请求失败（credential_store_unavailable）。");
+ expect(failed).not.toContain("Credential store unavailable.");
});
});
diff --git a/apps/web/src/features/sessions/session-history.test.ts b/apps/web/src/features/sessions/session-history.test.ts
index 5e53c273c..f6157646d 100644
--- a/apps/web/src/features/sessions/session-history.test.ts
+++ b/apps/web/src/features/sessions/session-history.test.ts
@@ -83,7 +83,7 @@ describe("Incremental history reads", () => {
const history = await loadSessionHistory(client, "session", previous, { incremental: true });
expect(history.session?.status).toBe("idle");
expect(history.items).toBe(previous.items);
- expect(history.itemsError).toBe("Items unavailable");
+ expect(history.itemsError).toBeInstanceOf(AgentCoreError);
expect(history.turns.map((value) => value.status)).toEqual(["completed"]);
expect(history.sessionError).toBeNull();
});
@@ -120,7 +120,8 @@ describe("Session deletion and runtime answers", () => {
it("tells a busy Session, a missing one, a refusal and an unconfirmed deletion apart", () => {
expect(classifyDeleteError(new AgentCoreError("busy", 409, "conflict_error"))).toEqual({ kind: "not-idle" });
expect(classifyDeleteError(new AgentCoreError("missing", 404))).toEqual({ kind: "missing" });
- expect(classifyDeleteError(new AgentCoreError("nope", 403))).toEqual({ kind: "rejected", reason: "nope" });
+ const refusal = new AgentCoreError("nope", 403);
+ expect(classifyDeleteError(refusal)).toEqual({ kind: "rejected", cause: refusal });
expect(classifyDeleteError(new AgentCoreError("down", 503))).toEqual({ kind: "uncertain" });
expect(classifyDeleteError(new TypeError("Failed to fetch"))).toEqual({ kind: "uncertain" });
});
diff --git a/apps/web/src/features/sessions/session-history.ts b/apps/web/src/features/sessions/session-history.ts
index ec41ec12c..ec717b9df 100644
--- a/apps/web/src/features/sessions/session-history.ts
+++ b/apps/web/src/features/sessions/session-history.ts
@@ -83,17 +83,13 @@ export interface SessionHistory {
turns: AgentTurn[];
/** Why the Session itself could not be read; earlier data stays shown. */
sessionError: unknown;
- itemsError: string | null;
- turnsError: string | null;
+ itemsError: unknown;
+ turnsError: unknown;
loadedAt: number;
}
type HistoryReader = Pick;
-function message(error: unknown): string {
- return error instanceof Error ? error.message : String(error);
-}
-
/**
* Reads the Session, its Items and its Turns in parallel. With `incremental`
* only the part of each list after its settled prefix is read again; each part
@@ -117,8 +113,8 @@ export async function loadSessionHistory(
items: items.status === "fulfilled" ? items.value : previous?.items ?? [],
turns: turns.status === "fulfilled" ? turns.value : previous?.turns ?? [],
sessionError: session.status === "rejected" ? session.reason : null,
- itemsError: items.status === "rejected" ? message(items.reason) : null,
- turnsError: turns.status === "rejected" ? message(turns.reason) : null,
+ itemsError: items.status === "rejected" ? items.reason : null,
+ turnsError: turns.status === "rejected" ? turns.reason : null,
loadedAt: Date.now(),
};
}
diff --git a/apps/web/src/features/skills/SkillDetail.tsx b/apps/web/src/features/skills/SkillDetail.tsx
index cf504ad38..7768f7717 100644
--- a/apps/web/src/features/skills/SkillDetail.tsx
+++ b/apps/web/src/features/skills/SkillDetail.tsx
@@ -13,10 +13,10 @@ import { EmptyState, PageBody, PageHeader, RefreshButton, Section, StatusDot } f
import { Modal } from "../../components/Modal";
import { DetailSkeleton, TableSkeleton } from "../../components/Skeleton";
import { useFailureToast, useToast } from "../../components/Toast";
+import { coreError } from "../../lib/core-error";
import { formatDateTime, MISSING } from "../../lib/format";
import { CopyableId, LatestVersion } from "./skill-parts";
import {
- coreErrorMessage,
downloadSkillArchive,
isDefaultVersionConflict,
readSkillVersionsPage,
@@ -287,7 +287,7 @@ export function SkillDetail({ core, projectId, skillId, initialSkill, onBack, on
const skill = skillRead.data ?? null;
const skillError = skillRead.isError ? skillRead.error : null;
const status: SkillLoadStatus = isNotFound(skillError) ? "missing" : skillError ? "failed" : skill ? "ready" : "loading";
- const error = skillError ? coreErrorMessage(skillError) : null;
+ const error = skillError ? coreError(skillError, tCommon) : null;
const freshSkill = skillRead.isPlaceholderData ? undefined : skillRead.data;
useEffect(() => {
@@ -299,7 +299,7 @@ export function SkillDetail({ core, projectId, skillId, initialSkill, onBack, on
status: !versionsData && versionsRead.isFetching ? "loading" : versionsRead.isError ? "failed" : versionsData ? "ready" : "loading",
items: versionsData?.values ?? [],
nextAfter: versionsData?.nextAfter ?? null,
- error: versionsRead.isError ? coreErrorMessage(versionsRead.error) : null,
+ error: versionsRead.isError ? coreError(versionsRead.error, tCommon) : null,
loadingMore: more.loading,
moreError: more.error,
};
@@ -333,7 +333,7 @@ export function SkillDetail({ core, projectId, skillId, initialSkill, onBack, on
setMore({ loading: false, error: null });
} catch (reason) {
if (!mounted.current) return;
- setMore({ loading: false, error: coreErrorMessage(reason) });
+ setMore({ loading: false, error: coreError(reason, tCommon) });
}
};
@@ -343,7 +343,7 @@ export function SkillDetail({ core, projectId, skillId, initialSkill, onBack, on
try {
await downloadSkillArchive(core, skill, version);
} catch (reason) {
- if (mounted.current) toast.show(t("detail.downloadFailed", { reason: coreErrorMessage(reason) }), { tone: "error" });
+ if (mounted.current) toast.show(t("detail.downloadFailed", { reason: coreError(reason, tCommon) }), { tone: "error" });
} finally {
if (mounted.current) setDownloading(null);
}
@@ -380,7 +380,7 @@ export function SkillDetail({ core, projectId, skillId, initialSkill, onBack, on
listChanged();
load();
} else {
- setDialogError(t("detail.actionFailed", { reason: coreErrorMessage(reason) }));
+ setDialogError(t("detail.actionFailed", { reason: coreError(reason, tCommon) }));
}
} finally {
dialogBusyRef.current = false;
diff --git a/apps/web/src/features/skills/skill-operations.ts b/apps/web/src/features/skills/skill-operations.ts
index 5bb0fa45d..52fd7a2c1 100644
--- a/apps/web/src/features/skills/skill-operations.ts
+++ b/apps/web/src/features/skills/skill-operations.ts
@@ -24,19 +24,6 @@ export function classifySkillsError(error: unknown): Exclude { void queryClient.invalidateQueries({ queryKey: harnessesQuery.queryKey }); }, [queryClient]);
- useFailureToast(harnesses && failedLast(query) ? message(query.error) : null, t("models.refreshFailed"), "harnesses-read");
+ useFailureToast(harnesses && failedLast(query) ? coreError(query.error, tCommon) : null, t("models.refreshFailed"), "harnesses-read");
// From Getting started: bring the default harness's Set or Replace into view and focus.
useConsoleIntent("default-model", harnesses ? "ready" : query.isError ? "unavailable" : "wait", () => {
window.requestAnimationFrame(() => {
@@ -63,7 +61,7 @@ export function DefaultModelsSection() {
let body: ReactNode;
if (!harnesses) {
body = query.isError && !query.isFetching
- ? { void query.refetch(); }} />
+ ? { void query.refetch(); }} />
: ;
} else if (!harnesses.length) {
body = ;
diff --git a/apps/web/src/features/vaults/VaultsPage.tsx b/apps/web/src/features/vaults/VaultsPage.tsx
index decc7ea9d..516cd90e8 100644
--- a/apps/web/src/features/vaults/VaultsPage.tsx
+++ b/apps/web/src/features/vaults/VaultsPage.tsx
@@ -8,6 +8,7 @@ import { ConfirmDialog } from "../../components/ConfirmDialog";
import { ApiEmptyState, EmptyState, HelpTip, PageBody, PageHeader, RefreshButton, Section } from "../../components/console-ui";
import { CopyableId, ListToolbar, listSummary, NameCell, RowActions, SearchField } from "../../components/list-ui";
import { useConsoleNavigation } from "../../lib/console-navigation";
+import { coreError } from "../../lib/core-error";
import { useDeleteFlow } from "../../lib/delete-flow";
import { formatDateTime } from "../../lib/format";
import { CreatorCell, CreatorHeading, forgetCreators, ProjectFilter, ProjectName, projectClient, readAllPages, useCreators, useProjectCollection, useProjects, type Owned } from "../../lib/projects";
@@ -16,10 +17,6 @@ import { collections } from "../../lib/queries";
import { DetailSkeleton, TableSkeleton } from "../../components/Skeleton";
import { useVaultDetail } from "../resources/detail-queries";
-function errorText(error: unknown): string {
- return error instanceof Error ? error.message : String(error);
-}
-
/**
* Resources › Vault: every project's Vaults and their Credential metadata.
* Tokens are write-only and never reach the console; administrators view and
@@ -177,8 +174,8 @@ function VaultDetail({ projectId, vaultId }: { projectId: string; vaultId: strin
);
const vault = read.data ?? null;
- const failure = read.isError ? errorText(read.error) : null;
- const credentialsFailure = credentialsRead.isError ? errorText(credentialsRead.error) : null;
+ const failure = read.isError ? coreError(read.error, tCommon) : null;
+ const credentialsFailure = credentialsRead.isError ? coreError(credentialsRead.error, tCommon) : null;
// Detail reads are not polled: each failed read was asked for and is reported.
useFailureToast(vault !== null ? failure : null, t("refreshFailed"), "vault-refresh", read.errorUpdatedAt);
useFailureToast(credentialsRead.data ? credentialsFailure : null, t("refreshFailed"), "vault-credentials-refresh", credentialsRead.errorUpdatedAt);
diff --git a/apps/web/src/i18n/locales/en/files.ts b/apps/web/src/i18n/locales/en/files.ts
index 8ddb6175e..bf426cc53 100644
--- a/apps/web/src/i18n/locales/en/files.ts
+++ b/apps/web/src/i18n/locales/en/files.ts
@@ -48,10 +48,4 @@ export const files = {
rejected: "Core rejected the deletion: {{reason}}",
uncertain: "The deletion of {{name}} was not confirmed. Refresh the list to check before trying again.",
},
- errors: {
- transport: "The request did not reach Core or its response was lost.",
- unauthorized: "Core rejected the connection credentials.",
- tooLarge: "The file is larger than Core accepts.",
- invalidResponse: "Core returned a response this console does not recognize.",
- },
} as const;
diff --git a/apps/web/src/i18n/locales/zh-CN/files.ts b/apps/web/src/i18n/locales/zh-CN/files.ts
index f816833cd..ec42f72bd 100644
--- a/apps/web/src/i18n/locales/zh-CN/files.ts
+++ b/apps/web/src/i18n/locales/zh-CN/files.ts
@@ -52,10 +52,4 @@ export const files: TranslationShape = {
rejected: "Core 拒绝删除：{{reason}}",
uncertain: "未能确认 {{name}} 是否已删除。请先刷新列表确认，再决定是否重试。",
},
- errors: {
- transport: "请求未到达 Core，或响应已丢失。",
- unauthorized: "Core 拒绝了当前连接凭据。",
- tooLarge: "文件超过 Core 的大小上限。",
- invalidResponse: "Core 返回了控制台无法识别的响应。",
- },
};
diff --git a/apps/web/src/i18n/locales/zh-CN/sandbox.ts b/apps/web/src/i18n/locales/zh-CN/sandbox.ts
index 14a73871b..882058a1c 100644
--- a/apps/web/src/i18n/locales/zh-CN/sandbox.ts
+++ b/apps/web/src/i18n/locales/zh-CN/sandbox.ts
@@ -233,7 +233,6 @@ export const sandbox = {
"Core rejected the sandbox change": "Core 拒绝了此次沙箱更改",
"Core rejected the sandbox configuration.": "Core 拒绝了这个沙箱配置。",
"The console configuration could not be read. Refresh to try again.": "无法读取控制台配置。请刷新重试。",
- "The sandbox request was rejected. Refresh to check the current state.": "沙箱请求被拒绝。请刷新并检查当前状态。",
"The sandbox service is unavailable. Refresh to check the current state.": "沙箱服务不可用。请刷新并检查当前状态。",
"Disabled": "已禁用",
"Waking": "唤醒中",
diff --git a/apps/web/src/lib/delete-flow.ts b/apps/web/src/lib/delete-flow.ts
index 31261f34c..44f0b7faa 100644
--- a/apps/web/src/lib/delete-flow.ts
+++ b/apps/web/src/lib/delete-flow.ts
@@ -1,5 +1,8 @@
import { AgentCoreError } from "@oac/agents-client";
import { useCallback, useState } from "react";
+import { useTranslation } from "react-i18next";
+
+import { coreError } from "./core-error";
export interface DeleteFlow {
target: T | null;
@@ -12,7 +15,7 @@ export interface DeleteFlow {
/**
* Confirmed deletion through the Web API. A definite rejection keeps the dialog
- * open with Core's reason. An unconfirmed outcome is never retried silently: the
+ * open with Core's reason in the console's language. An unconfirmed outcome is never retried silently: the
* dialog stays open with the uncertain message while the view is re-read
* (`messages.reread`, or `onSettled` where settling only refreshes a list), so a
* detail page does not navigate away as if the deletion had succeeded.
@@ -22,6 +25,7 @@ export function useDeleteFlow(
onSettled: () => void,
messages: { uncertain: string; reread?: () => void },
): DeleteFlow {
+ const { t } = useTranslation("common");
const [target, setTarget] = useState(null);
const [busy, setBusy] = useState(false);
const [error, setError] = useState(null);
@@ -39,7 +43,7 @@ export function useDeleteFlow(
setTarget(null);
onSettled();
} else if (caught instanceof AgentCoreError && caught.status >= 400 && caught.status < 500) {
- setError(caught.message);
+ setError(coreError(caught, t));
} else {
setError(messages.uncertain);
(messages.reread ?? onSettled)();
@@ -47,7 +51,7 @@ export function useDeleteFlow(
} finally {
setBusy(false);
}
- }, [busy, messages, onSettled, run, target]);
+ }, [busy, messages, onSettled, run, t, target]);
return {
target,
busy,
diff --git a/apps/web/src/lib/locale.test.ts b/apps/web/src/lib/locale.test.ts
index ad570bde6..38278a9ad 100644
--- a/apps/web/src/lib/locale.test.ts
+++ b/apps/web/src/lib/locale.test.ts
@@ -20,12 +20,13 @@ describe("sandbox localization", () => {
}
expect(sandboxDiagnosticMessage("", "zh-CN")).toBeNull();
});
- it("shows Core's reason for a refusal and keeps other failures to the console's words", () => {
+ it("shows a refusal in the console's language and keeps other failures to the console's words", () => {
// A code with one exact meaning keeps the console's localized words.
expect(sandboxRequestError(new AgentCoreError("Node node-edge still has allocations.", 409, "runtime_node_in_use"), "zh-CN")).toBe("节点仍有活跃分配或保留资源。请先清理资源分配、快照、预留资源和待清理项，再移除节点。");
- // A refusal is Core's to explain: one code, such as a 409 conflict, covers several reasons.
- expect(sandboxRequestError(new AgentCoreError("This console is read-only.", 403), "zh-CN")).toBe("This console is read-only.");
- expect(sandboxRequestError(new AgentCoreError("The session is busy.", 409, "conflict_error"), "zh-CN")).toBe("The session is busy.");
+ // Core's messages are English: Chinese names the code or the status instead.
+ expect(sandboxRequestError(new AgentCoreError("This console is read-only.", 403), "zh-CN")).toBe("Core 请求失败（403）。");
+ expect(sandboxRequestError(new AgentCoreError("The session is busy.", 409, "conflict_error"), "zh-CN")).toBe("Core 请求失败（conflict_error）。");
+ expect(sandboxRequestError(new AgentCoreError("The session is busy.", 409, "conflict_error"), "en")).toBe("The session is busy.");
// A sandbox refusal whose reason the client withheld is named without it.
expect(sandboxRequestError(new AgentCoreError("withheld", 400, "sandbox_configuration_unconfirmed"), "zh-CN")).toBe("Core 拒绝了这个沙箱配置。");
expect(sandboxRequestError(new AgentCoreError("raw secret", 502), "zh-CN")).not.toContain("raw secret");
diff --git a/apps/web/src/lib/sandbox-labels.ts b/apps/web/src/lib/sandbox-labels.ts
index d537c6106..b852464b1 100644
--- a/apps/web/src/lib/sandbox-labels.ts
+++ b/apps/web/src/lib/sandbox-labels.ts
@@ -1,6 +1,6 @@
import { AgentCoreError, sandboxConfigurationUnconfirmed, type SandboxProvider } from "@oac/agents-client";
import i18n, { type SupportedLanguage } from "../i18n";
-import { knownCoreError } from "./core-error";
+import { coreError, knownCoreError } from "./core-error";
import type { ParseKeys } from "i18next";
const states: Record> = {
@@ -11,18 +11,17 @@ const states: Record> = {
export function sandboxStateLabel(state: string, locale: SupportedLanguage): string {
return i18n.getFixedT(locale, "sandbox")(Object.hasOwn(states, state) ? states[state]! : "Unknown state");
}
-/** Localized catalog errors first; unknown refusals retain Core’s message. */
+/** Localized catalog errors first; other refusals follow coreError. */
export function sandboxRequestError(error: unknown, locale: SupportedLanguage): string {
- const known = knownCoreError(error, i18n.getFixedT(locale, "common"), "bytes");
+ const common = i18n.getFixedT(locale, "common");
+ const known = knownCoreError(error, common, "bytes");
if (known) return known;
let key: ParseKeys<"sandbox"> = "The sandbox request failed. Refresh to check the current state before trying again.";
if (error instanceof AgentCoreError) {
const refused = !sandboxWriteUncertain(error);
if (error.code === sandboxConfigurationUnconfirmed) { if (refused) key = "Core rejected the sandbox configuration."; else if (error.status >= 500) key = "The sandbox service is unavailable. Refresh to check the current state."; }
- else if (refused) {
- if (error.message) return error.message;
- key = "The sandbox request was rejected. Refresh to check the current state.";
- } else if (error.status >= 500) key = "The sandbox service is unavailable. Refresh to check the current state.";
+ else if (refused) return coreError(error, common);
+ else if (error.status >= 500) key = "The sandbox service is unavailable. Refresh to check the current state.";
} else if (error instanceof Error && error.message === "removal_unconfirmed") key = "Core did not confirm node removal. Refresh to check its state.";
return i18n.getFixedT(locale, "sandbox")(key);
}
@@ -40,16 +39,12 @@ export function sandboxWriteUncertain(error: unknown): boolean {
}
/**
- * Core's own reason when it rejects a deployment configuration it cannot serve,
- * such as E2B with a loopback public_url; null for any other failure. Nothing
- * was saved, so the administrator corrects the cause and saves again.
+ * The reason for a refused deployment configuration whose code the console
+ * explains, such as E2B with a loopback public_url; null for any other failure.
+ * Nothing was saved, so the administrator corrects the cause and saves again.
*/
export function sandboxConfigurationRejection(error: unknown, locale: SupportedLanguage = "en"): string | null {
- if (error instanceof AgentCoreError && !sandboxWriteUncertain(error) && error.code) {
- const known = knownCoreError(error, i18n.getFixedT(locale, "common"));
- if (known) return known;
- }
- return error instanceof AgentCoreError && error.status === 409 && error.code === "sandbox_configuration_error" && error.message ? error.message : null;
+ return sandboxWriteUncertain(error) ? null : knownCoreError(error, i18n.getFixedT(locale, "common"));
}
export function sandboxProviderLabel(provider: SandboxProvider | "", locale: SupportedLanguage): string {