Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(models): align Orca automation switching and localize failures

Chrisa3c069ac7fc5
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/scheduledModelSelection.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/scheduledModelSelection.test.ts
index e68182e145..e5b7ceb2c5 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/scheduledModelSelection.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/scheduledModelSelection.test.ts
@@ -239,7 +239,7 @@ describe('saved effort uses the selected provider and Harness catalog copy', ()
});
describe('bound target Harness capability', () => {
- it.each([{ remoteHostId: 'ssh-host' }, { orcaRole: 'lead' }, { orcaRole: 'worker' }])(
+ it.each([{ remoteHostId: 'ssh-host' }, { remoteHostId: 'ssh-host', orcaRole: 'lead' }])(
'rejects cross-Harness overrides on %j while preserving same-Harness and follow modes', (restriction) => {
const target = { agentKind: 'codex' as const, status: 'active', ...restriction };
expect(() => assertScheduledHarnessSupported(target, 'pi')).toThrow('current Harness');
@@ -247,6 +247,37 @@ describe('bound target Harness capability', () => {
expect(() => assertScheduledHarnessSupported(target, undefined)).not.toThrow();
},
);
+ // Regression: ordinary Orca switching supports all three Harnesses, but the
+ // scheduled guard blocked both the override and the next manual send's restore.
+ // Unit tier: enter a persisted scope, switch, reload it and restore via the real
+ // selection entry; the old guard fails before any model can be applied.
+ it.each(['lead', 'worker'])('applies and restores a cross-Harness override for an Orca %s', async (orcaRole) => {
+ let profile: ScheduledModelSelection = { ...selection, agentKind: 'codex', model: 'owner-model' };
+ const original = { ...profile };
+ let baseline: string | null = null;
+ const apply = async (_id: string, choice: ScheduledModelSelection) => {
+ await applyScheduledModelSelection(choice, {
+ getTarget: async () => ({ agentKind: profile.agentKind, status: 'active', orcaRole }),
+ isBusy: () => false,
+ resolveSelection: async (value) => value,
+ switchHarness: async (value) => { profile = { ...profile, agentKind: value.agentKind }; return { engineReady: true }; },
+ applyModel: async (value) => { profile = { ...value }; },
+ });
+ };
+ const deps = {
+ createId: () => 'scope', isBusy: () => false,
+ read: async () => ({ profile, baseline }),
+ write: async (_id: string, value: unknown) => { baseline = value ? JSON.stringify(value) : null; },
+ apply,
+ };
+ expect(() => assertScheduledHarnessSupported({ agentKind: 'codex', status: 'active', orcaRole }, 'pi')).not.toThrow();
+ await createScheduledModelScope(deps).begin('task');
+ await apply('task', selection);
+ expect(profile).toEqual(selection);
+ await createScheduledModelScope(deps).restore('task');
+ expect(profile).toMatchObject(original);
+ expect(baseline).toBeNull();
+ });
it('preserves ordinary local cross-Harness selection and archived-target recovery', () => {
expect(() => assertScheduledHarnessSupported({ agentKind: 'codex', status: 'active' }, 'pi')).not.toThrow();
expect(() => assertScheduledHarnessSupported({ agentKind: 'codex', status: 'archived', remoteHostId: 'ssh-host' }, 'pi')).not.toThrow();
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/sessionAgentSwitchHandler.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/sessionAgentSwitchHandler.test.ts
index 5e4e8f48e6..210437c165 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/sessionAgentSwitchHandler.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/sessionAgentSwitchHandler.test.ts
@@ -475,7 +475,7 @@ describe('performSessionAgentSwitch', () => {
it('远程会话仍拒绝切换,Orca Lead/Worker 复用跨引擎交接事务', async () => {
const remote = makeDeps({ getSessionRow: vi.fn(async () => makeRow({ remoteHostId: 'host-1' })) });
- await expect(performSessionAgentSwitch(remote.deps, validParams)).rejects.toThrow(/UNSUPPORTED_CAPABILITY/);
+ await expect(performSessionAgentSwitch(remote.deps, validParams)).rejects.toThrow(/SSH_HARNESS_SWITCH_UNSUPPORTED/);
const orca = makeDeps({ getSessionRow: vi.fn(async () => makeRow({ orcaRole: 'lead' })) });
await expect(performSessionAgentSwitch(orca.deps, validParams)).resolves.toMatchObject({
switched: true,
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/sessionRuntimeHarnessSelection.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/sessionRuntimeHarnessSelection.test.ts
index b637403439..5aa93a930e 100644
--- a/apps/desktop/src/main/maker-ipc/__tests__/sessionRuntimeHarnessSelection.test.ts
+++ b/apps/desktop/src/main/maker-ipc/__tests__/sessionRuntimeHarnessSelection.test.ts
@@ -279,7 +279,10 @@ describe('runtime harness selection', () => {
h.pending.set('s1', previous);
const read = h.switchDeps.getSessionRow;
h.switchDeps.getSessionRow = async (id) => ({ ...(await read(id))!, ...overrides });
- expect(await setSessionRuntimeHarness(h.deps, request)).toMatchObject({ ok: false });
+ expect(await setSessionRuntimeHarness(h.deps, request)).toMatchObject({
+ ok: false,
+ errorCode: overrides.status === 'deleted' ? 'NOT_FOUND' : 'ROUTE_UNAVAILABLE',
+ });
expect(h.pending.get('s1')).toBe(previous);
expect(h.close).not.toHaveBeenCalled();
});
diff --git a/apps/desktop/src/main/maker-ipc/scheduledModelSelection.ts b/apps/desktop/src/main/maker-ipc/scheduledModelSelection.ts
index a265cd0f24..5652e90244 100644
--- a/apps/desktop/src/main/maker-ipc/scheduledModelSelection.ts
+++ b/apps/desktop/src/main/maker-ipc/scheduledModelSelection.ts
@@ -2,6 +2,7 @@ import type { AgentKind, Effort } from '@cindy/maker-core';
import { effectiveSourceIdForModel, findCatalogModel, type ProviderView } from '@cindy/model-providers';
import { resolveCompatibleSessionRuntimeEffort } from './sessionRuntimeControl';
import { parseScheduledModelBaseline, type ScheduledModelBaseline } from '../../shared/scheduledModelBaseline';
+import { throwIpcError } from '../utils/ipcValidate';
/** A saved automation choice, applied only while its target's send lock is held. */
export interface ScheduledModelSelection {
@@ -76,8 +77,10 @@ export function assertScheduledHarnessSupported(
agentKind: AgentKind | undefined,
): void {
if (target?.status !== 'active' || !agentKind || target.agentKind === agentKind) return;
- if (target.remoteHostId || target.orcaRole) {
- throw new Error('SSH and Orca automation targets must keep their current Harness');
+ // Orca Lead/Worker use the ordinary handoff transaction, including restoration
+ // before the next manual send. Only SSH still lacks cross-Harness handoff.
+ if (target.remoteHostId) {
+ throwIpcError('SSH_HARNESS_SWITCH_UNSUPPORTED', 'SSH automation targets must keep their current Harness');
}
}
@@ -91,7 +94,7 @@ export function resolveScheduledModelSelection(
const provider = providers.find((candidate) => candidate.id === providerId);
const model = findCatalogModel(provider, selection.model, selection.agentKind, { exact: true });
if (!provider?.connected || !model) {
- throw new Error(`Scheduled model "${selection.model}" is unavailable from provider "${providerId ?? 'default'}"`);
+ throwIpcError('MODEL_SELECTION_UNAVAILABLE', `Scheduled model "${selection.model}" is unavailable from provider "${providerId ?? 'default'}"`);
}
return {
...selection,
@@ -125,7 +128,7 @@ export async function applyScheduledModelSelection(
const resolved = await deps.resolveSelection(selection);
if (target.agentKind !== resolved.agentKind) {
const result = await deps.switchHarness(resolved);
- if (!result.engineReady || result.retryPending) throw new Error('Scheduled Harness switch did not become ready');
+ if (!result.engineReady || result.retryPending) throwIpcError('HARNESS_SWITCH_NOT_READY', 'Scheduled Harness switch did not become ready');
}
await deps.applyModel(resolved);
return resolved;
diff --git a/apps/desktop/src/main/maker-ipc/sessionAgentSwitchHandler.ts b/apps/desktop/src/main/maker-ipc/sessionAgentSwitchHandler.ts
index d6505ea18d..918c0e4ba8 100644
--- a/apps/desktop/src/main/maker-ipc/sessionAgentSwitchHandler.ts
+++ b/apps/desktop/src/main/maker-ipc/sessionAgentSwitchHandler.ts
@@ -692,8 +692,8 @@ export async function performSessionAgentSwitch(
throwIpcError('UNSUPPORTED_CAPABILITY', 'Review task settings are fixed to the source task');
}
if (row.remoteHostId) {
- // SSH 远程会话:agent 进程在远端机器,cc-manager 链路仅覆盖 Claude,v1 不支持切换。
- throwIpcError('UNSUPPORTED_CAPABILITY', 'agent switch is not supported for remote sessions');
+ // SSH can run all three Harnesses, but cannot hand off an existing task between them.
+ throwIpcError('SSH_HARNESS_SWITCH_UNSUPPORTED', 'agent switch is not supported for remote sessions');
}
// Orca Lead / Worker tasks live on this computer, so moving their Agent works like
// a normal task (2026-10-16). An execution-device Worker's task lives on that device;
@@ -1310,7 +1310,7 @@ export function applyPendingAgentSwitchIfIdle(
signal: opts?.signal,
});
if (result.retryPending && intent.runtimeSource === 'agent') {
- throw new Error('Harness switch recovery is pending; retry the send after recovery');
+ throwIpcError('HARNESS_SWITCH_NOT_READY', 'Harness switch recovery is pending; retry the send after recovery');
}
// CAS 语义:执行期间用户可能又选了另一个目标,不能把新意图一起清掉。
if (!result.retryPending) {
diff --git a/apps/desktop/src/main/maker-ipc/sessionRuntimeHarnessSelection.ts b/apps/desktop/src/main/maker-ipc/sessionRuntimeHarnessSelection.ts
index c2efba989c..29f7144feb 100644
--- a/apps/desktop/src/main/maker-ipc/sessionRuntimeHarnessSelection.ts
+++ b/apps/desktop/src/main/maker-ipc/sessionRuntimeHarnessSelection.ts
@@ -133,6 +133,7 @@ export async function setSessionRuntimeHarness(
code === 'NOT_FOUND' ||
code === 'INVALID_PARAMS' ||
code === 'UNSUPPORTED_CAPABILITY' ||
+ code === 'SSH_HARNESS_SWITCH_UNSUPPORTED' ||
code === 'CREDENTIAL_SWITCH_BUSY'
) {
return {
diff --git a/apps/desktop/src/renderer/components/chat/__tests__/ErrorLocalization.test.tsx b/apps/desktop/src/renderer/components/chat/__tests__/ErrorLocalization.test.tsx
index e36f326b0c..9b603a09e0 100644
--- a/apps/desktop/src/renderer/components/chat/__tests__/ErrorLocalization.test.tsx
+++ b/apps/desktop/src/renderer/components/chat/__tests__/ErrorLocalization.test.tsx
@@ -84,7 +84,7 @@ describe.each(SUPPORTED_LOCALES)('error presentation in %s', locale => {
expect(screen.queryByText(locales[locale].chat.errorBanner.networkShowRaw)).toBeNull();
});
- it.each(['REMOTE_LOCAL_ONLY_PROVIDER', 'DEVICE_LINK_MEDIA_TRANSFER_FAILED', 'DEVICE_LINK_BUSY', 'MCP_APPROVAL_CONFIRMATION_TIMEOUT'])('preserves curated %s guidance and follows language changes', async code => {
+ it.each(['REMOTE_LOCAL_ONLY_PROVIDER', 'DEVICE_LINK_MEDIA_TRANSFER_FAILED', 'DEVICE_LINK_BUSY', 'MCP_APPROVAL_CONFIRMATION_TIMEOUT', 'SSH_HARNESS_SWITCH_UNSUPPORTED', 'MODEL_SELECTION_UNAVAILABLE', 'HARNESS_SWITCH_NOT_READY'])('preserves curated %s guidance and follows language changes', async code => {
const i18n = createInstance();
await i18n.init({ lng: locale, fallbackLng: 'en', resources: Object.fromEntries(Object.entries(locales).map(([lng, common]) => [lng, { translation: common }])) });
const message = `Error invoking remote method device-link:invoke: Error: [${code}] upstream fallback api_key=private-test-value`;
diff --git a/apps/desktop/src/renderer/features/scheduler/components/RunHistoryCard.tsx b/apps/desktop/src/renderer/features/scheduler/components/RunHistoryCard.tsx
index 992c32dbf6..f9fc1e657a 100644
--- a/apps/desktop/src/renderer/features/scheduler/components/RunHistoryCard.tsx
+++ b/apps/desktop/src/renderer/features/scheduler/components/RunHistoryCard.tsx
@@ -20,6 +20,8 @@ import { useTranslation } from 'react-i18next';
import { cn } from '@/lib/utils';
import * as sessionService from '@/lib/sessionService';
import { toast } from '@/lib/toast';
+import { ErrorNotice } from '@/components/ui/error-notice';
+import { parseAgentErrorCode } from '@cindy/maker-shared/error-redaction';
import type { AgentKind, RunStatus, ScheduleRun } from '@cindy/maker-scheduler';
import type { SessionReference } from '../../../../shared/sessionReference';
import {
@@ -143,7 +145,9 @@ export function RunHistoryCard({
onRestart,
sessionReference,
}: Props) {
- const { t } = useTranslation();
+ const { t, i18n } = useTranslation();
+ const errorCode = run.errorMsg ? parseAgentErrorCode(run.errorMsg)?.code : undefined;
+ const errorKey = errorCode ? `chat.remoteError.${errorCode}` : undefined;
const navigate = useNavigate();
const isLegacySessionRun = run.id.startsWith(LEGACY_SESSION_RUN_ID_PREFIX);
const showError =
@@ -353,7 +357,9 @@ export function RunHistoryCard({
)}
</div>
- {showError && (
+ {showError && (errorKey && i18n.exists(errorKey) ? (
+ <ErrorNotice message={t(errorKey)} details={run.errorMsg!} />
+ ) : (
<p
className={cn(
'rounded-[8px] border px-2 py-1.5 font-mono text-11 break-words',
@@ -362,7 +368,7 @@ export function RunHistoryCard({
>
{run.errorMsg}
</p>
- )}
+ ))}
{/* skipped:展示前置检查摘要(exit code / 耗时 / stdout 首行),灰阶弱化 —— 让
"为什么这轮没跑"在历史里可追溯,与调度器故障区分。 */}
diff --git a/apps/desktop/src/renderer/features/scheduler/components/ScheduleFormDialog.tsx b/apps/desktop/src/renderer/features/scheduler/components/ScheduleFormDialog.tsx
index 2f915b711b..6deb249d91 100644
--- a/apps/desktop/src/renderer/features/scheduler/components/ScheduleFormDialog.tsx
+++ b/apps/desktop/src/renderer/features/scheduler/components/ScheduleFormDialog.tsx
@@ -10,6 +10,7 @@ import { cn } from '@/lib/utils';
import { toast } from '@/lib/toast';
import * as sessionService from '@/lib/sessionService';
import { extractIpcError } from '@/utils/ipcError';
+import { parseAgentErrorCode } from '@cindy/maker-shared/error-redaction';
import { Tip } from '@/components/ui/tooltip';
import { Button } from '@/components/ui/button';
import { useAgentCapabilities } from '@/hooks/useAgentCapabilities';
@@ -132,7 +133,7 @@ export function ScheduleFormDialog({
editProjectSchedule = false,
requestedByGhostName = null,
}: Props) {
- const { t } = useTranslation();
+ const { t, i18n } = useTranslation();
const formApi = useScheduleForm(initial);
const { form, setField, selectModelConfiguration, setDestination, setRunMode, selectBoundSession, applyTemplateAgentFields, reset, toInput, validate } = formApi;
// "运行会话"三态(fresh / persistent / bound)与心跳形态派生值。
@@ -159,6 +160,14 @@ export function ScheduleFormDialog({
const modelCatalogReady = (!isBound || !!boundSessionReference) && !caps.loading && !providersLoading;
const hideWorkspaceFields = runMode === 'bound' || isBound;
const [submitting, setSubmitting] = useState(false);
+ const [submitError, setSubmitError] = useState<string | null>(null);
+ useEffect(() => { setSubmitError(null); }, [open, initial]);
+ const showSubmitError = (error: unknown) => {
+ const message = error instanceof Error ? error.message : String(error);
+ const code = parseAgentErrorCode(message)?.code;
+ if (code && i18n.exists(`chat.remoteError.${code}`)) setSubmitError(message);
+ else toast.error(message);
+ };
const [mode, setMode] = useState<'gallery' | 'form'>('form');
// 前置检查「测试运行」状态:结果只在弹窗内展示,不落任何记录。
const [hookTesting, setHookTesting] = useState(false);
@@ -512,6 +521,7 @@ export function ScheduleFormDialog({
}, [modelCatalogReady, form.modelAgentKind, providers.length, form.fastMode, showFastModeToggle, setField]);
const handleSubmit = async () => {
+ setSubmitError(null);
const err = validate();
if (err) {
toast.warning(t(err.key, err.values));
@@ -550,7 +560,7 @@ export function ScheduleFormDialog({
// (文案含项目名 + 增删改数量),此处不要再弹通用 toast,否则保存一次会出现两条提示。
onOpenChange(false);
} catch (e) {
- toast.error(e instanceof Error ? e.message : String(e));
+ showSubmitError(e);
} finally {
setSubmitting(false);
}
@@ -579,7 +589,7 @@ export function ScheduleFormDialog({
if (!isEdit) rememberScheduleFormPrefs(form);
onOpenChange(false);
} catch (e) {
- toast.error(e instanceof Error ? e.message : String(e));
+ showSubmitError(e);
} finally {
setSubmitting(false);
}
@@ -671,6 +681,12 @@ export function ScheduleFormDialog({
// overflow-y-auto:内容超过弹窗 max-h 时整体滚动;
// 提示词编辑框是固定高度,不会被可展开区块挤压。
<div className="flex min-h-0 flex-1 flex-col gap-[18px] overflow-y-auto pt-[18px] pr-6 pb-[22px] pl-6">
+ {submitError && (
+ <ErrorNotice
+ message={t(`chat.remoteError.${parseAgentErrorCode(submitError)?.code}`)}
+ details={submitError}
+ />
+ )}
<div className="flex flex-col gap-2">
<label className="text-xs leading-[1.33] text-[var(--cmd-palette-item-meta)] dark:text-[var(--settings-section-desc)]">{t('scheduler.editor.fields.title')}</label>
<div className="flex h-11 items-center rounded-full border border-[var(--settings-input-border)] bg-[var(--settings-input-bg)] px-4">
diff --git a/apps/desktop/src/renderer/features/scheduler/components/__tests__/RunHistoryCard.test.tsx b/apps/desktop/src/renderer/features/scheduler/components/__tests__/RunHistoryCard.test.tsx
index b9b0d329be..03fb6af53c 100644
--- a/apps/desktop/src/renderer/features/scheduler/components/__tests__/RunHistoryCard.test.tsx
+++ b/apps/desktop/src/renderer/features/scheduler/components/__tests__/RunHistoryCard.test.tsx
@@ -1,6 +1,6 @@
// @vitest-environment jsdom
-import { cleanup, render, screen } from '@testing-library/react';
+import { cleanup, fireEvent, render, screen } from '@testing-library/react';
import { MemoryRouter } from 'react-router-dom';
import { afterEach, describe, expect, it, vi } from 'vitest';
import type { ScheduleRun } from '@cindy/maker-scheduler';
@@ -9,7 +9,7 @@ import type { SessionReference } from '../../../../../shared/sessionReference';
import { RunHistoryCard } from '../RunHistoryCard';
vi.mock('react-i18next', () => ({
- useTranslation: () => ({ t: (key: string) => key }),
+ useTranslation: () => ({ t: (key: string) => key, i18n: { exists: () => true } }),
}));
afterEach(cleanup);
@@ -49,6 +49,17 @@ describe('RunHistoryCard 会话引用状态', () => {
});
describe('RunHistoryCard 前置检查结果', () => {
+ // A failed model selection is persisted in errorMsg, not an agent message.
+ // Verify this separate consumer also hides technical text behind details.
+ it('shows switch guidance with expandable diagnostics in failed run history', () => {
+ renderRun({ id: 'run-selection', scheduleId: 'schedule-1', firedAt: 1,
+ finishedAt: 2, status: 'failed', readAt: 2,
+ errorMsg: '[MODEL_SELECTION_UNAVAILABLE] Scheduled model test is unavailable' });
+ expect(screen.getByText('chat.remoteError.MODEL_SELECTION_UNAVAILABLE')).toBeTruthy();
+ expect(screen.queryByText(/Scheduled model test/)).toBeNull();
+ fireEvent.click(screen.getByText('chat.errorBanner.networkShowRaw'));
+ expect(screen.getByText(/Scheduled model test/)).toBeTruthy();
+ });
it('通过结果显示摘要且默认折叠', () => {
const { container } = renderRun({
id: 'run-passed',
diff --git a/apps/desktop/src/renderer/features/scheduler/components/__tests__/ScheduleFormDialog.test.tsx b/apps/desktop/src/renderer/features/scheduler/components/__tests__/ScheduleFormDialog.test.tsx
index c3d83ef188..bf424b74c6 100644
--- a/apps/desktop/src/renderer/features/scheduler/components/__tests__/ScheduleFormDialog.test.tsx
+++ b/apps/desktop/src/renderer/features/scheduler/components/__tests__/ScheduleFormDialog.test.tsx
@@ -20,7 +20,7 @@ const state = vi.hoisted(() => ({
],
}));
vi.mock('react-router-dom', () => ({ useNavigate: () => vi.fn() }));
-vi.mock('react-i18next', () => ({ useTranslation: () => ({ t: (key: string) => key }) }));
+vi.mock('react-i18next', () => ({ useTranslation: () => ({ t: (key: string) => key, i18n: { exists: () => true } }) }));
vi.mock('@/lib/toast', () => ({ toast: { warning: state.warning, success: vi.fn(), error: vi.fn() } }));
vi.mock('@/hooks/useAgentCapabilities', () => ({
getCachedCapabilities: () => null,
@@ -73,6 +73,23 @@ function mount(initial: Schedule) {
return { onSubmit, refresh: () => view.rerender(element()),
save: () => fireEvent.click(screen.getByRole('button', { name: 'scheduler.editor.promptDialog.saveAria' })) };
}
+
+// Saving an SSH override used to expose an English exception in a transient toast.
+// Exercise the real submit rejection: curated guidance stays visible, diagnostic
+// details are available on demand and the form remains editable. Unit/jsdom tier.
+it('keeps localized switch guidance and redacted diagnostics after a rejected save', async () => {
+ const h = mount(schedule());
+ h.onSubmit.mockRejectedValueOnce(new Error('[SSH_HARNESS_SWITCH_UNSUPPORTED] technical diagnostic api_key=private-value'));
+ h.save();
+ await waitFor(() => expect(screen.getByText('chat.remoteError.SSH_HARNESS_SWITCH_UNSUPPORTED')).toBeTruthy());
+ expect(screen.queryByText(/technical diagnostic/)).toBeNull();
+ fireEvent.click(screen.getByText('chat.errorBanner.networkShowRaw'));
+ expect(screen.getByText(/technical diagnostic/).textContent).toContain('[REDACTED]');
+ expect(screen.queryByText(/private-value/)).toBeNull();
+ h.save();
+ await waitFor(() => expect(h.onSubmit).toHaveBeenCalledTimes(2));
+ expect(screen.queryByText('chat.remoteError.SSH_HARNESS_SWITCH_UNSUPPORTED')).toBeNull();
+});
beforeEach(() => {
vi.clearAllMocks();
state.references.clear();
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index 374c9835b6..0f1077e075 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -978,6 +978,9 @@
"handoffWindow": "Input handoff · {{app}}"
},
"ipcError": {
+ "SSH_HARNESS_SWITCH_UNSUPPORTED": "This SSH task cannot switch Harness. Choose a model in its current Harness, or create a new SSH task with the Harness you need.",
+ "MODEL_SELECTION_UNAVAILABLE": "The selected model is no longer available from its provider. Check the connection in Settings or choose another available model.",
+ "HARNESS_SWITCH_NOT_READY": "The Harness switch is not ready. Check the error details and retry after the Harness is ready.",
"DEVICE_LINK_BUSY": "The remote computer is busy. Please try again shortly.",
"INVALID_PARAMS": "Invalid input. Please check and try again.",
"PRECONDITION_FAILED": "This action is unavailable in the current state. Please try again.",
@@ -12305,6 +12308,9 @@
"daemonNotReady": "{{manager}} upgraded, but the remote daemon hasn't started yet — please resend your message manually"
},
"remoteError": {
+ "SSH_HARNESS_SWITCH_UNSUPPORTED": "This SSH task cannot switch Harness. Choose a model in its current Harness, or create a new SSH task with the Harness you need.",
+ "MODEL_SELECTION_UNAVAILABLE": "The selected model is no longer available from its provider. Check the connection in Settings or choose another available model.",
+ "HARNESS_SWITCH_NOT_READY": "The Harness switch is not ready. Check the error details and retry after the Harness is ready.",
"DEVICE_LINK_BUSY": "The remote computer is busy. Please try again shortly.",
"REMOTE_DAEMON_CLOSED": "The remote connection dropped, possibly during an update. This turn has ended. Send the message again.",
"REMOTE_LOCAL_ATTACHMENT_UNSUPPORTED": "Local file/image attachments aren't accessible in remote sessions. Paste the content directly instead.",
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index 301bf3f133..eabc961d00 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -966,6 +966,9 @@
"handoffWindow": "代理入力 · {{app}}"
},
"ipcError": {
+ "SSH_HARNESS_SWITCH_UNSUPPORTED": "この SSH タスクでは Harness を切り替えられません。現在の Harness のモデルを選ぶか、必要な Harness で新しい SSH タスクを作成してください。",
+ "MODEL_SELECTION_UNAVAILABLE": "選択したプロバイダーのモデルは利用できなくなりました。設定で接続を確認するか、利用可能なモデルを選び直してください。",
+ "HARNESS_SWITCH_NOT_READY": "Harness の切り替えが完了していません。エラーの詳細を確認し、Harness の準備ができてから再試行してください。",
"DEVICE_LINK_BUSY": "接続先のコンピュータが混み合っています。しばらくしてから再試行してください。",
"INVALID_PARAMS": "パラメータが無効です。確認して再試行してください。",
"PRECONDITION_FAILED": "現在の状態ではこの操作を実行できません。しばらくしてから再試行してください。",
@@ -12266,6 +12269,9 @@
"daemonNotReady": "{{manager}} のアップグレードは完了しましたが、リモート daemon がまだ起動していません — メッセージを手動で再送信してください"
},
"remoteError": {
+ "SSH_HARNESS_SWITCH_UNSUPPORTED": "この SSH タスクでは Harness を切り替えられません。現在の Harness のモデルを選ぶか、必要な Harness で新しい SSH タスクを作成してください。",
+ "MODEL_SELECTION_UNAVAILABLE": "選択したプロバイダーのモデルは利用できなくなりました。設定で接続を確認するか、利用可能なモデルを選び直してください。",
+ "HARNESS_SWITCH_NOT_READY": "Harness の切り替えが完了していません。エラーの詳細を確認し、Harness の準備ができてから再試行してください。",
"DEVICE_LINK_BUSY": "接続先のコンピュータが混み合っています。しばらくしてから再試行してください。",
"REMOTE_DAEMON_CLOSED": "リモート接続が切れました。更新中の可能性があります。このターンは終了したので、もう一度送信してください。",
"REMOTE_LOCAL_ATTACHMENT_UNSUPPORTED": "リモートセッションではローカルのファイル/画像の添付にアクセスできません。内容を直接貼り付けてください。",
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index 4abdb5395e..49b637faf0 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -966,6 +966,9 @@
"handoffWindow": "대리 입력 · {{app}}"
},
"ipcError": {
+ "SSH_HARNESS_SWITCH_UNSUPPORTED": "이 SSH 작업에서는 Harness를 전환할 수 없습니다. 현재 Harness의 모델을 선택하거나 필요한 Harness로 새 SSH 작업을 만드세요.",
+ "MODEL_SELECTION_UNAVAILABLE": "선택한 제공자의 모델을 더 이상 사용할 수 없습니다. 설정에서 연결을 확인하거나 사용 가능한 모델을 다시 선택하세요.",
+ "HARNESS_SWITCH_NOT_READY": "Harness 전환이 완료되지 않았습니다. 오류 세부 정보를 확인하고 Harness가 준비되면 다시 시도하세요.",
"DEVICE_LINK_BUSY": "원격 컴퓨터가 사용 중입니다. 잠시 후 다시 시도해 주세요.",
"INVALID_PARAMS": "매개변수가 잘못되었습니다. 확인 후 다시 시도하세요.",
"PRECONDITION_FAILED": "현재 상태에서는 이 작업을 수행할 수 없습니다. 잠시 후 다시 시도하세요.",
@@ -12266,6 +12269,9 @@
"daemonNotReady": "{{manager}} 업그레이드가 완료되었지만 원격 daemon이 아직 시작되지 않았습니다 — 메시지를 수동으로 다시 전송하세요"
},
"remoteError": {
+ "SSH_HARNESS_SWITCH_UNSUPPORTED": "이 SSH 작업에서는 Harness를 전환할 수 없습니다. 현재 Harness의 모델을 선택하거나 필요한 Harness로 새 SSH 작업을 만드세요.",
+ "MODEL_SELECTION_UNAVAILABLE": "선택한 제공자의 모델을 더 이상 사용할 수 없습니다. 설정에서 연결을 확인하거나 사용 가능한 모델을 다시 선택하세요.",
+ "HARNESS_SWITCH_NOT_READY": "Harness 전환이 완료되지 않았습니다. 오류 세부 정보를 확인하고 Harness가 준비되면 다시 시도하세요.",
"DEVICE_LINK_BUSY": "원격 컴퓨터가 사용 중입니다. 잠시 후 다시 시도해 주세요.",
"REMOTE_DAEMON_CLOSED": "원격 연결이 끊겼습니다. 업데이트 중일 수 있습니다. 이번 차례는 끝났으니 다시 보내 주세요.",
"REMOTE_LOCAL_ATTACHMENT_UNSUPPORTED": "원격 세션에서는 로컬 파일/이미지 첨부에 접근할 수 없습니다. 내용을 직접 붙여넣으세요.",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
index 3ac53e0a20..42a3093b6a 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -966,6 +966,9 @@
"handoffWindow": "代输入 · {{app}}"
},
"ipcError": {
+ "SSH_HARNESS_SWITCH_UNSUPPORTED": "此 SSH 任务暂不支持切换 Harness。请选择当前 Harness 下的模型,或使用所需 Harness 新建 SSH 任务。",
+ "MODEL_SELECTION_UNAVAILABLE": "所选模型在该供应商下已不可用。请在设置中检查连接,或重新选择可用模型。",
+ "HARNESS_SWITCH_NOT_READY": "Harness 尚未完成切换。请查看错误详情,待 Harness 就绪后重试。",
"DEVICE_LINK_BUSY": "远端繁忙,请稍后重试。",
"INVALID_PARAMS": "参数无效,请检查后重试。",
"PRECONDITION_FAILED": "当前状态下无法执行此操作,请稍后重试。",
@@ -12266,6 +12269,9 @@
"daemonNotReady": "{{manager}} 升级完成,但远端 daemon 暂未启动 — 请手动重新发送消息"
},
"remoteError": {
+ "SSH_HARNESS_SWITCH_UNSUPPORTED": "此 SSH 任务暂不支持切换 Harness。请选择当前 Harness 下的模型,或使用所需 Harness 新建 SSH 任务。",
+ "MODEL_SELECTION_UNAVAILABLE": "所选模型在该供应商下已不可用。请在设置中检查连接,或重新选择可用模型。",
+ "HARNESS_SWITCH_NOT_READY": "Harness 尚未完成切换。请查看错误详情,待 Harness 就绪后重试。",
"DEVICE_LINK_BUSY": "远端繁忙,请稍后重试。",
"REMOTE_DAEMON_CLOSED": "远端连接中断了,可能正在更新。这一轮已经结束,请重新发送。",
"REMOTE_LOCAL_ATTACHMENT_UNSUPPORTED": "远端任务无法访问本地文件/图片附件。请直接粘贴内容。",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
index 98dea0f174..9f3cb6bf5d 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -966,6 +966,9 @@
"handoffWindow": "代輸入 · {{app}}"
},
"ipcError": {
+ "SSH_HARNESS_SWITCH_UNSUPPORTED": "此 SSH 任務暫不支援切換 Harness。請選擇目前 Harness 下的模型,或使用所需 Harness 建立新的 SSH 任務。",
+ "MODEL_SELECTION_UNAVAILABLE": "所選模型在該供應商下已無法使用。請在設定中檢查連線,或重新選擇可用模型。",
+ "HARNESS_SWITCH_NOT_READY": "Harness 尚未完成切換。請查看錯誤詳細資訊,待 Harness 就緒後重試。",
"DEVICE_LINK_BUSY": "遠端忙碌中,請稍後再試。",
"INVALID_PARAMS": "引數無效,請檢查後重試。",
"PRECONDITION_FAILED": "目前狀態下無法執行此操作,請稍後再試。",
@@ -12265,6 +12268,9 @@
"daemonNotReady": "{{manager}} 升級完成,但遠端 daemon 暫未啟動 — 請手動重新傳送訊息"
},
"remoteError": {
+ "SSH_HARNESS_SWITCH_UNSUPPORTED": "此 SSH 任務暫不支援切換 Harness。請選擇目前 Harness 下的模型,或使用所需 Harness 建立新的 SSH 任務。",
+ "MODEL_SELECTION_UNAVAILABLE": "所選模型在該供應商下已無法使用。請在設定中檢查連線,或重新選擇可用模型。",
+ "HARNESS_SWITCH_NOT_READY": "Harness 尚未完成切換。請查看錯誤詳細資訊,待 Harness 就緒後重試。",
"DEVICE_LINK_BUSY": "遠端忙碌中,請稍後再試。",
"REMOTE_DAEMON_CLOSED": "遠端連線中斷了,可能正在更新。這一輪已經結束,請重新傳送。",
"REMOTE_LOCAL_ATTACHMENT_UNSUPPORTED": "遠端任務無法訪問本地檔案/圖片附件。請直接貼上內容。",
diff --git a/apps/desktop/src/shared/ipc-errors.ts b/apps/desktop/src/shared/ipc-errors.ts
index 28ada4f986..73f19b0f38 100644
--- a/apps/desktop/src/shared/ipc-errors.ts
+++ b/apps/desktop/src/shared/ipc-errors.ts
@@ -100,6 +100,9 @@ export type IpcErrorCode =
| 'SCHEDULER_NOT_READY'
| 'PERMISSION_DENIED'
| 'UNSUPPORTED_CAPABILITY'
+ | 'SSH_HARNESS_SWITCH_UNSUPPORTED'
+ | 'MODEL_SELECTION_UNAVAILABLE'
+ | 'HARNESS_SWITCH_NOT_READY'
| 'SHARED_TASK_HOST_LIMIT'
| 'SHARED_TASK_JOIN_LIMIT'
| 'SHARED_TASK_GUEST_LIMIT'
@@ -358,6 +361,9 @@ const IPC_ERROR_CODES: ReadonlySet<IpcErrorCode> = new Set<IpcErrorCode>([
'SCHEDULER_NOT_READY',
'PERMISSION_DENIED',
'UNSUPPORTED_CAPABILITY',
+ 'SSH_HARNESS_SWITCH_UNSUPPORTED',
+ 'MODEL_SELECTION_UNAVAILABLE',
+ 'HARNESS_SWITCH_NOT_READY',
'SHARED_TASK_HOST_LIMIT',
'SHARED_TASK_JOIN_LIMIT',
'SHARED_TASK_GUEST_LIMIT',
diff --git a/apps/mobile/src/__tests__/AgentErrorLocalization.test.tsx b/apps/mobile/src/__tests__/AgentErrorLocalization.test.tsx
index 14668ce100..dfba1ee996 100644
--- a/apps/mobile/src/__tests__/AgentErrorLocalization.test.tsx
+++ b/apps/mobile/src/__tests__/AgentErrorLocalization.test.tsx
@@ -175,7 +175,7 @@ describe.each(SUPPORTED_LOCALES)('known mobile remote errors in %s', locale => {
expect(unclassifiedAgentErrorI18nKey('[CUSTOM_ERROR] private diagnostic')).toBe('session.tail.replyFailed');
});
- it.each(['REMOTE_LOCAL_ONLY_PROVIDER', 'DEVICE_LINK_MEDIA_TRANSFER_FAILED', 'MCP_APPROVAL_CONFIRMATION_TIMEOUT'])(
+ it.each(['REMOTE_LOCAL_ONLY_PROVIDER', 'DEVICE_LINK_MEDIA_TRANSFER_FAILED', 'MCP_APPROVAL_CONFIRMATION_TIMEOUT', 'SSH_HARNESS_SWITCH_UNSUPPORTED', 'MODEL_SELECTION_UNAVAILABLE', 'HARNESS_SWITCH_NOT_READY'])(
'preserves %s guidance across history, live and tail, including language changes', async code => {
await i18n.changeLanguage(locale);
const message = `Error invoking remote method 'maker:send': Error: [${code}] upstream diagnostic; api_key=private-test-value`;
diff --git a/apps/mobile/src/__tests__/remoteStatus.test.ts b/apps/mobile/src/__tests__/remoteStatus.test.ts
index bf0d71da0a..bdf2799a2b 100644
--- a/apps/mobile/src/__tests__/remoteStatus.test.ts
+++ b/apps/mobile/src/__tests__/remoteStatus.test.ts
@@ -20,6 +20,21 @@ beforeAll(async () => {
});
describe('remoteStatus', () => {
+ // A switch refusal reaches mobile inside the device-link IPC_ERROR envelope.
+ // Verify the real alert/toast formatter, which differs from chat rendering.
+ it('localizes nested Harness errors without exposing the technical fallback', async () => {
+ const previousLanguage = i18n.language;
+ try {
+ for (const locale of ['zh-CN', 'zh-TW', 'en', 'ja', 'ko']) {
+ await i18n.changeLanguage(locale);
+ const error = new DeviceLinkError('IPC_ERROR' as never, '[SSH_HARNESS_SWITCH_UNSUPPORTED] SSH diagnostic');
+ expect(humanizeRemoteError(error)).toBe(i18n.t('session.remoteError.SSH_HARNESS_SWITCH_UNSUPPORTED'));
+ expect(formatRemoteError(error)).toContain('SSH diagnostic');
+ }
+ } finally {
+ await i18n.changeLanguage(previousLanguage);
+ }
+ });
it('backs repeated connection recovery syncs off and caps the delay', () => {
expect([0, 1, 2, 3, 4, 5, 6].map(connectionRecoverySyncRetryDelayMs))
.toEqual([900, 1_800, 3_600, 7_200, 14_400, 28_800, 30_000]);
diff --git a/apps/mobile/src/device-link/remoteStatus.ts b/apps/mobile/src/device-link/remoteStatus.ts
index c5901b2e75..b2e1ec60f9 100644
--- a/apps/mobile/src/device-link/remoteStatus.ts
+++ b/apps/mobile/src/device-link/remoteStatus.ts
@@ -6,6 +6,7 @@ import {
import type { DeviceLinkConnectionIssue, DeviceLinkConnectionIssueKind, DeviceLinkStatus } from '@cindy/device-link';
import type { LocalNetworkStatus } from '@/device-link/localNetworkStatus';
import { i18n } from '@/i18n';
+import { parseAgentErrorCode } from '@cindy/maker-shared/error-redaction';
export {
formatRemoteError,
@@ -104,9 +105,11 @@ export function describeAgentAuthError(error: string | null | undefined): string
});
}
-/** 自动恢复类连接错误保留结构化 marker 做状态分类,展示文案则复用 Mobile i18n。 */
-function localizedConnectionRecoveryCopy(error: unknown): string | null {
+/** 结构化运行错误保留 marker 做状态分类,展示文案复用 Mobile i18n。 */
+function localizedRuntimeErrorCopy(error: unknown): string | null {
const formatted = typeof error === 'string' ? error : formatRemoteErrorShared(error);
+ const agentCode = parseAgentErrorCode(formatted)?.code;
+ if (agentCode && i18n.exists(`session.remoteError.${agentCode}`)) return i18n.t(`session.remoteError.${agentCode}`);
if (formatted.includes('DEVICE_OFFLINE')) return i18n.t('session.menu.aiRenameOffline');
if (formatted.includes('NOT_CONNECTED')) return i18n.t('session.screen.networkReconnecting');
return null;
@@ -121,7 +124,7 @@ export function humanizeRemoteError(error: unknown): string {
if (isDeviceUnresponsiveRemoteError(error)) {
return i18n.t('deviceLink.deviceUnresponsiveHint');
}
- const recoveryCopy = localizedConnectionRecoveryCopy(error);
+ const recoveryCopy = localizedRuntimeErrorCopy(error);
if (recoveryCopy) return recoveryCopy;
const formatted = typeof error === 'string' ? error : formatRemoteErrorShared(error);
const localized = localizedStableRemoteError(formatted);
@@ -169,7 +172,7 @@ export function describeRemoteError(error: string | null): string | null {
if (error.includes('DEVICE_UNRESPONSIVE')) {
return i18n.t('deviceLink.deviceUnresponsiveHint');
}
- const recoveryCopy = localizedConnectionRecoveryCopy(error);
+ const recoveryCopy = localizedRuntimeErrorCopy(error);
if (recoveryCopy) return recoveryCopy;
const agentAuth = describeAgentAuthError(error);
if (agentAuth) return agentAuth;
diff --git a/apps/mobile/src/i18n/locales/en/session.json b/apps/mobile/src/i18n/locales/en/session.json
index 6a6482e555..a1a667195f 100644
--- a/apps/mobile/src/i18n/locales/en/session.json
+++ b/apps/mobile/src/i18n/locales/en/session.json
@@ -585,6 +585,9 @@
"taskAlreadyCreated": "This task already exists on the computer. Its saved messages will resume there."
},
"remoteError": {
+ "SSH_HARNESS_SWITCH_UNSUPPORTED": "This SSH task cannot switch Harness. Choose a model in its current Harness, or create a new SSH task with the Harness you need.",
+ "MODEL_SELECTION_UNAVAILABLE": "The selected model is no longer available from its provider. Check the connection in Settings or choose another available model.",
+ "HARNESS_SWITCH_NOT_READY": "The Harness switch is not ready. Check the error details and retry after the Harness is ready.",
"REMOTE_AGENT_GROUP_USAGE_LIMIT": "The available accounts for this model have reached their usage limit. Switch models or continue when the quota resets.",
"REMOTE_AGENT_GROUP_UNAVAILABLE": "No computer in the provider group can run this task right now. They may be offline, paused, cooling down, or missing this model. Check the group on this provider’s Remote & Sharing page on the computer.",
"REMOTE_DAEMON_CLOSED": "The remote connection dropped, possibly during an update. This turn has ended. Send the message again.",
diff --git a/apps/mobile/src/i18n/locales/ja/session.json b/apps/mobile/src/i18n/locales/ja/session.json
index 68e0db8e21..82121080f1 100644
--- a/apps/mobile/src/i18n/locales/ja/session.json
+++ b/apps/mobile/src/i18n/locales/ja/session.json
@@ -585,6 +585,9 @@
"taskAlreadyCreated": "このセッションはコンピューターに作成済みです。保存されたメッセージは元のセッションで送信を再開します。"
},
"remoteError": {
+ "SSH_HARNESS_SWITCH_UNSUPPORTED": "この SSH タスクでは Harness を切り替えられません。現在の Harness のモデルを選ぶか、必要な Harness で新しい SSH タスクを作成してください。",
+ "MODEL_SELECTION_UNAVAILABLE": "選択したプロバイダーのモデルは利用できなくなりました。設定で接続を確認するか、利用可能なモデルを選び直してください。",
+ "HARNESS_SWITCH_NOT_READY": "Harness の切り替えが完了していません。エラーの詳細を確認し、Harness の準備ができてから再試行してください。",
"REMOTE_AGENT_GROUP_USAGE_LIMIT": "このモデルを利用できるアカウントの使用量が上限に達しました。別のモデルに切り替えるか、上限のリセット後に続行できます。",
"REMOTE_AGENT_GROUP_UNAVAILABLE": "プロバイダーグループ内のパソコンは現在このセッションを実行できません。オフライン、割り当て停止中、クールダウン中、またはこのモデルがない可能性があります。パソコンでこのプロバイダーの「リモートと共有」ページを確認してください。",
"REMOTE_DAEMON_CLOSED": "リモート接続が切れました。更新中の可能性があります。このターンは終了したので、もう一度送信してください。",
diff --git a/apps/mobile/src/i18n/locales/ko/session.json b/apps/mobile/src/i18n/locales/ko/session.json
index 2762e89bad..d861d3fb6c 100644
--- a/apps/mobile/src/i18n/locales/ko/session.json
+++ b/apps/mobile/src/i18n/locales/ko/session.json
@@ -581,6 +581,9 @@
"taskAlreadyCreated": "이 세션은 컴퓨터에 이미 생성되어 있습니다. 저장된 메시지는 기존 세션에서 전송을 재개합니다."
},
"remoteError": {
+ "SSH_HARNESS_SWITCH_UNSUPPORTED": "이 SSH 작업에서는 Harness를 전환할 수 없습니다. 현재 Harness의 모델을 선택하거나 필요한 Harness로 새 SSH 작업을 만드세요.",
+ "MODEL_SELECTION_UNAVAILABLE": "선택한 제공자의 모델을 더 이상 사용할 수 없습니다. 설정에서 연결을 확인하거나 사용 가능한 모델을 다시 선택하세요.",
+ "HARNESS_SWITCH_NOT_READY": "Harness 전환이 완료되지 않았습니다. 오류 세부 정보를 확인하고 Harness가 준비되면 다시 시도하세요.",
"REMOTE_AGENT_GROUP_USAGE_LIMIT": "이 모델을 사용할 수 있는 계정의 사용량이 한도에 도달했습니다. 다른 모델로 전환하거나 한도가 초기화된 후 계속하세요.",
"REMOTE_AGENT_GROUP_UNAVAILABLE": "제공자 그룹의 컴퓨터가 지금 이 세션을 실행할 수 없습니다. 모두 오프라인이거나, 배정이 일시 중지되었거나, 대기 중이거나, 이 모델이 없을 수 있습니다. 컴퓨터에서 이 제공자의 원격 및 공유 페이지를 확인하세요.",
"REMOTE_DAEMON_CLOSED": "원격 연결이 끊겼습니다. 업데이트 중일 수 있습니다. 이번 차례는 끝났으니 다시 보내 주세요.",
diff --git a/apps/mobile/src/i18n/locales/zh-CN/session.json b/apps/mobile/src/i18n/locales/zh-CN/session.json
index 032cbf2047..92ae324ec6 100644
--- a/apps/mobile/src/i18n/locales/zh-CN/session.json
+++ b/apps/mobile/src/i18n/locales/zh-CN/session.json
@@ -581,6 +581,9 @@
"taskAlreadyCreated": "电脑上已创建这个任务,已保存的消息会在原任务中继续发送。"
},
"remoteError": {
+ "SSH_HARNESS_SWITCH_UNSUPPORTED": "此 SSH 任务暂不支持切换 Harness。请选择当前 Harness 下的模型,或使用所需 Harness 新建 SSH 任务。",
+ "MODEL_SELECTION_UNAVAILABLE": "所选模型在该供应商下已不可用。请在设置中检查连接,或重新选择可用模型。",
+ "HARNESS_SWITCH_NOT_READY": "Harness 尚未完成切换。请查看错误详情,待 Harness 就绪后重试。",
"REMOTE_AGENT_GROUP_USAGE_LIMIT": "此模型的可用账号已达到用量上限。可换用其他模型,或等配额重置后继续。",
"REMOTE_AGENT_GROUP_UNAVAILABLE": "供应商组里的电脑现在都不能运行这个任务:可能都不在线、已暂停分配、正在冷却,或没有这个模型。可以在电脑上这个供应商的「远程与分享」页查看组内电脑。",
"REMOTE_DAEMON_CLOSED": "远程连接中断了,可能正在更新。这一轮已经结束,请重新发送。",
diff --git a/apps/mobile/src/i18n/locales/zh-TW/session.json b/apps/mobile/src/i18n/locales/zh-TW/session.json
index 2beee6a54d..3479ab4794 100644
--- a/apps/mobile/src/i18n/locales/zh-TW/session.json
+++ b/apps/mobile/src/i18n/locales/zh-TW/session.json
@@ -585,6 +585,9 @@
"taskAlreadyCreated": "電腦上已建立這個任務,已保存的訊息會在原任務中繼續傳送。"
},
"remoteError": {
+ "SSH_HARNESS_SWITCH_UNSUPPORTED": "此 SSH 任務暫不支援切換 Harness。請選擇目前 Harness 下的模型,或使用所需 Harness 建立新的 SSH 任務。",
+ "MODEL_SELECTION_UNAVAILABLE": "所選模型在該供應商下已無法使用。請在設定中檢查連線,或重新選擇可用模型。",
+ "HARNESS_SWITCH_NOT_READY": "Harness 尚未完成切換。請查看錯誤詳細資訊,待 Harness 就緒後重試。",
"REMOTE_AGENT_GROUP_USAGE_LIMIT": "此模型的可用帳號已達到用量上限。可改用其他模型,或等配額重置後繼續。",
"REMOTE_AGENT_GROUP_UNAVAILABLE": "供應商組裡的電腦現在都不能執行這個任務:可能都離線、已暫停分配、正在冷卻,或沒有這個模型。可以在電腦上這個供應商的「遠端與分享」頁查看組內電腦。",
"REMOTE_DAEMON_CLOSED": "遠端連線中斷了,可能正在更新。這一輪已經結束,請重新傳送。",
diff --git a/packages/maker-shared/src/errorRedaction.test.ts b/packages/maker-shared/src/errorRedaction.test.ts
index 4d054e4439..b467783105 100644
--- a/packages/maker-shared/src/errorRedaction.test.ts
+++ b/packages/maker-shared/src/errorRedaction.test.ts
@@ -276,9 +276,9 @@ describe('isGatewayProxyTokenInvalidError', () => {
describe('agent error envelopes shared by desktop and mobile', () => {
- it.each(['REMOTE_LOCAL_ONLY_PROVIDER', 'DEVICE_LINK_MEDIA_TRANSFER_FAILED', 'DEVICE_LINK_BUSY', 'MCP_APPROVAL_CONFIRMATION_TIMEOUT', 'AUTO_REVIEW_UNAVAILABLE'])(
+ it.each(['REMOTE_LOCAL_ONLY_PROVIDER', 'DEVICE_LINK_MEDIA_TRANSFER_FAILED', 'DEVICE_LINK_BUSY', 'MCP_APPROVAL_CONFIRMATION_TIMEOUT', 'AUTO_REVIEW_UNAVAILABLE', 'SSH_HARNESS_SWITCH_UNSUPPORTED', 'MODEL_SELECTION_UNAVAILABLE', 'HARNESS_SWITCH_NOT_READY'])(
'parses %s directly and inside an IPC error', code => {
- for (const prefix of ['', "Error invoking remote method 'maker:send': Error: "]) {
+ for (const prefix of ['', '[IPC_ERROR] ', "Error invoking remote method 'maker:send': Error: "]) {
expect(parseAgentErrorCode(`${prefix}[${code}] first line\nsecond line`)).toEqual({ code, fallback: 'first line\nsecond line' });
}
},
diff --git a/packages/maker-shared/src/errorRedaction.ts b/packages/maker-shared/src/errorRedaction.ts
index 482fef8e68..8eae00cb84 100644
--- a/packages/maker-shared/src/errorRedaction.ts
+++ b/packages/maker-shared/src/errorRedaction.ts
@@ -218,6 +218,9 @@ export function canOfferCodexHistoryRecovery(input: {
}
const AGENT_CHAT_ERROR_CODES: ReadonlySet<string> = new Set([
+ 'SSH_HARNESS_SWITCH_UNSUPPORTED',
+ 'MODEL_SELECTION_UNAVAILABLE',
+ 'HARNESS_SWITCH_NOT_READY',
'DEVICE_LINK_BUSY',
'DEVICE_LINK_CONTROL_DISABLED',
'DEVICE_LINK_MEDIA_TRANSFER_FAILED',
@@ -228,12 +231,12 @@ const AGENT_CHAT_ERROR_CODES: ReadonlySet<string> = new Set([
'MCP_APPROVAL_CONFIRMATION_UNAVAILABLE',
]);
-/** Parse the existing runtime error envelope, including Electron's IPC wrapper.
+/** Parse the runtime envelope, including Electron and device-link IPC wrappers.
* A parsed code is only a translation candidate: unknown REMOTE codes must not
* promote their upstream fallback text into localized user-facing guidance.
*/
export function parseAgentErrorCode(message: string): { code: string; fallback: string } | null {
- const match = /(?:^|: Error: )\[([A-Z0-9_]+)\]\s*([\s\S]*)$/.exec(message);
+ const match = /(?:^|: Error: )(?:\[IPC_ERROR\]\s*)?\[([A-Z0-9_]+)\]\s*([\s\S]*)$/.exec(message);
if (!match || (!/^REMOTE_[A-Z_]+$/.test(match[1]) && !AGENT_CHAT_ERROR_CODES.has(match[1]))) {
return null;
}