diff --git a/src/components/skills/view/ProviderSkills.tsx b/src/components/skills/view/ProviderSkills.tsx
index 908ed07625..f1a16e9f67 100644
--- a/src/components/skills/view/ProviderSkills.tsx
+++ b/src/components/skills/view/ProviderSkills.tsx
@@ -60,9 +60,10 @@ const PROVIDER_NAMES: Record = {
codex: 'Codex',
cursor: 'Cursor',
opencode: 'OpenCode',
+ pi: 'Pi',
};
-const PROVIDER_SKILL_PATHS: Record, string> = {
+const PROVIDER_SKILL_PATHS: Record, string> = {
claude: '~/.claude/skills//SKILL.md',
codex: '~/.agents/skills//SKILL.md',
cursor: '~/.cursor/skills//SKILL.md',
@@ -220,7 +221,9 @@ export default function ProviderSkills({ selectedProvider, currentProjects }: Pr
const folderInputRef = useRef(null);
const providerName = PROVIDER_NAMES[selectedProvider];
- const providerPath = selectedProvider === 'opencode' ? null : PROVIDER_SKILL_PATHS[selectedProvider];
+ const providerPath = selectedProvider === 'opencode' || selectedProvider === 'pi'
+ ? null
+ : PROVIDER_SKILL_PATHS[selectedProvider];
useEffect(() => {
setQueuedFiles([]);
diff --git a/src/i18n/locales/en/chat.json b/src/i18n/locales/en/chat.json
index eaecb479aa..2821929682 100644
--- a/src/i18n/locales/en/chat.json
+++ b/src/i18n/locales/en/chat.json
@@ -18,7 +18,8 @@
"claude": "Claude",
"cursor": "Cursor",
"codex": "Codex",
- "opencode": "OpenCode"
+ "opencode": "OpenCode",
+ "pi": "Pi"
},
"tools": {
"settings": "Tool Settings",
@@ -161,6 +162,7 @@
"cursor": "Ready to use Cursor with {{model}}. Start typing your message below.",
"codex": "Ready to use Codex with {{model}}. Start typing your message below.",
"opencode": "Ready to use OpenCode with {{model}}. Start typing your message below.",
+ "pi": "Ready to use Pi with {{model}}. Start typing your message below.",
"default": "Select a provider above to begin"
},
"pressToSearch": "Press {{shortcut}} to search sessions, files, and commits"
diff --git a/src/i18n/locales/en/settings.json b/src/i18n/locales/en/settings.json
index 305ce574b2..b20f762ff8 100644
--- a/src/i18n/locales/en/settings.json
+++ b/src/i18n/locales/en/settings.json
@@ -351,6 +351,9 @@
},
"opencode": {
"description": "OpenCode CLI assistant"
+ },
+ "pi": {
+ "description": "Pi CLI assistant"
}
},
"connectionStatus": "Connection Status",
diff --git a/src/i18n/locales/fr/chat.json b/src/i18n/locales/fr/chat.json
index 89dcb7b321..467f5f05e7 100644
--- a/src/i18n/locales/fr/chat.json
+++ b/src/i18n/locales/fr/chat.json
@@ -18,7 +18,8 @@
"claude": "Claude",
"cursor": "Cursor",
"codex": "Codex",
- "opencode": "OpenCode"
+ "opencode": "OpenCode",
+ "pi": "Pi"
},
"tools": {
"settings": "Paramètres de l'outil",
@@ -135,6 +136,7 @@
"cursor": "Prêt à utiliser Cursor avec {{model}}. Commencez à taper votre message ci-dessous.",
"codex": "Prêt à utiliser Codex avec {{model}}. Commencez à taper votre message ci-dessous.",
"opencode": "Prêt à utiliser OpenCode avec {{model}}. Commencez à taper votre message ci-dessous.",
+ "pi": "Prêt à utiliser Pi avec {{model}}. Commencez à taper votre message ci-dessous.",
"default": "Sélectionnez un fournisseur ci-dessus pour commencer"
},
"pressToSearch": "Appuyez sur {{shortcut}} pour rechercher sessions, fichiers et commits"
diff --git a/src/i18n/locales/fr/settings.json b/src/i18n/locales/fr/settings.json
index bf8994ed60..bc322a595d 100644
--- a/src/i18n/locales/fr/settings.json
+++ b/src/i18n/locales/fr/settings.json
@@ -325,6 +325,9 @@
},
"opencode": {
"description": "Assistant CLI OpenCode"
+ },
+ "pi": {
+ "description": "Assistant CLI Pi"
}
},
"connectionStatus": "Statut de la connexion",
diff --git a/src/stores/sessionMessageReconciliation.test.ts b/src/stores/sessionMessageReconciliation.test.ts
index e1b58686ac..2f3e26cce6 100644
--- a/src/stores/sessionMessageReconciliation.test.ts
+++ b/src/stores/sessionMessageReconciliation.test.ts
@@ -2,7 +2,10 @@ import assert from 'node:assert/strict';
import test from 'node:test';
import type { NormalizedMessage } from './useSessionStore';
-import { removeOptimisticUserEchoes } from './sessionMessageReconciliation';
+import {
+ removeOptimisticUserEchoes,
+ upsertRealtimeMessages,
+} from './sessionMessageReconciliation';
const createUserMessage = (
id: string,
@@ -68,3 +71,53 @@ test('keeps the existing optimistic text reconciliation behavior', () => {
assert.deepEqual(removeOptimisticUserEchoes([persisted], [local]), []);
});
+
+test('replaces repeated realtime snapshots with the same logical message id', () => {
+ const base = createUserMessage('thinking-1', '2026-08-04T00:00:00.000Z', {
+ provider: 'pi',
+ kind: 'thinking',
+ role: 'assistant',
+ content: 'The',
+ isStreaming: true,
+ seq: 1,
+ });
+ const updated = {
+ ...base,
+ content: 'The answer',
+ seq: 2,
+ };
+ const finalized = {
+ ...updated,
+ content: 'The authoritative answer',
+ isStreaming: false,
+ duration: 2,
+ seq: 3,
+ };
+
+ const messages = upsertRealtimeMessages([], [base, updated, finalized]);
+
+ assert.equal(messages.length, 1);
+ assert.equal(messages[0]?.id, 'thinking-1');
+ assert.equal(messages[0]?.content, 'The authoritative answer');
+ assert.equal(messages[0]?.isStreaming, false);
+ assert.equal(messages[0]?.duration, 2);
+});
+
+test('ignores an older sequenced snapshot for an existing realtime message', () => {
+ const finalized = createUserMessage('thinking-1', '2026-08-04T00:00:00.000Z', {
+ provider: 'pi',
+ kind: 'thinking',
+ role: 'assistant',
+ content: 'complete',
+ isStreaming: false,
+ seq: 9,
+ });
+ const stale = {
+ ...finalized,
+ content: 'partial',
+ isStreaming: true,
+ seq: 8,
+ };
+
+ assert.deepEqual(upsertRealtimeMessages([finalized], [stale]), [finalized]);
+});
diff --git a/src/stores/sessionMessageReconciliation.ts b/src/stores/sessionMessageReconciliation.ts
index 67d4cabacc..7721cebfb3 100644
--- a/src/stores/sessionMessageReconciliation.ts
+++ b/src/stores/sessionMessageReconciliation.ts
@@ -10,6 +10,44 @@ type UserTurnFingerprint = {
fileCount: number;
};
+/**
+ * Applies realtime snapshots by logical message id while preserving their
+ * original list position. A lower sequence number is stale replay data and
+ * cannot replace a newer snapshot already rendered by the client.
+ */
+export function upsertRealtimeMessages(
+ currentMessages: NormalizedMessage[],
+ incomingMessages: NormalizedMessage[],
+): NormalizedMessage[] {
+ if (incomingMessages.length === 0) {
+ return currentMessages;
+ }
+
+ const updated = [...currentMessages];
+ const indexById = new Map(updated.map((message, index) => [message.id, index]));
+
+ for (const incoming of incomingMessages) {
+ const existingIndex = indexById.get(incoming.id);
+ if (existingIndex === undefined) {
+ indexById.set(incoming.id, updated.length);
+ updated.push(incoming);
+ continue;
+ }
+
+ const existing = updated[existingIndex];
+ if (
+ typeof existing.seq === 'number'
+ && typeof incoming.seq === 'number'
+ && incoming.seq < existing.seq
+ ) {
+ continue;
+ }
+ updated[existingIndex] = incoming;
+ }
+
+ return updated;
+}
+
function userTurnFingerprint(message: NormalizedMessage): UserTurnFingerprint | null {
if (message.kind !== 'text' || message.role !== 'user') return null;
diff --git a/src/stores/useSessionStore.ts b/src/stores/useSessionStore.ts
index ab96c8e597..333982bc72 100644
--- a/src/stores/useSessionStore.ts
+++ b/src/stores/useSessionStore.ts
@@ -12,7 +12,10 @@ import { useCallback, useMemo, useRef, useState } from 'react';
import { authenticatedFetch } from '../utils/api';
import type { LLMProvider } from '../types/app';
-import { removeOptimisticUserEchoes } from './sessionMessageReconciliation';
+import {
+ removeOptimisticUserEchoes,
+ upsertRealtimeMessages,
+} from './sessionMessageReconciliation';
// ─── NormalizedMessage (mirrors server/adapters/types.js) ────────────────────
@@ -48,6 +51,10 @@ export interface NormalizedMessage {
// kind-specific fields (flat for simplicity)
role?: 'user' | 'assistant';
content?: string;
+ /** True while a logical message is still receiving live snapshot updates. */
+ isStreaming?: boolean;
+ /** Completed reasoning duration in whole seconds. */
+ duration?: number;
/**
* Mirrors optional transcript metadata from the server.
*
@@ -67,8 +74,9 @@ export interface NormalizedMessage {
toolName?: string;
toolInput?: unknown;
toolId?: string;
- toolResult?: { content: string; isError: boolean; toolUseResult?: unknown } | null;
+ toolResult?: { content?: string; isError?: boolean; toolUseResult?: unknown } | null;
isError?: boolean;
+ toolUseResult?: unknown;
text?: string;
tokens?: number;
canInterrupt?: boolean;
@@ -250,6 +258,34 @@ function isAssistantTextEchoedInSameTurnOnServer(
);
}
+function isThinkingEchoedInSameTurnOnServer(
+ message: NormalizedMessage,
+ serverMessages: NormalizedMessage[],
+ realtimeMessages: NormalizedMessage[],
+): boolean {
+ if (message.isStreaming) {
+ return false;
+ }
+
+ const thinkingContent = (message.content || '').trim();
+ if (!thinkingContent) {
+ return false;
+ }
+
+ const turnOrdinal = getUserTurnOrdinalBefore(message, serverMessages, realtimeMessages);
+ const turnRange = findServerTurnRangeByOrdinal(serverMessages, turnOrdinal);
+ if (!turnRange) {
+ return false;
+ }
+
+ return serverMessages
+ .slice(turnRange.start + 1, turnRange.end)
+ .some((serverMessage) =>
+ serverMessage.kind === 'thinking'
+ && (serverMessage.content || '').trim() === thinkingContent,
+ );
+}
+
/**
* After `finalizeStreaming`, the client holds a synthetic assistant `text` row
* while the sessions API soon returns the same reply with a different id.
@@ -281,6 +317,18 @@ function dedupeAdjacentAssistantEchoes(merged: NormalizedMessage[]): NormalizedM
continue;
}
}
+ if (prev.kind === 'thinking' && m.kind === 'thinking') {
+ const content = (m.content || '').trim();
+ if (
+ content.length > 0
+ && content === (prev.content || '').trim()
+ && !prev.isStreaming
+ && !m.isStreaming
+ ) {
+ out[out.length - 1] = m;
+ continue;
+ }
+ }
}
out.push(m);
}
@@ -323,6 +371,13 @@ function pruneRealtimeSupersededByServer(
return true;
}
+ if (message.kind === 'thinking') {
+ if (isThinkingEchoedInSameTurnOnServer(message, serverMessages, realtimeMessages)) {
+ return false;
+ }
+ return true;
+ }
+
if (message.kind === 'text' && message.role === 'user') {
return true;
}
@@ -461,6 +516,10 @@ export function useSessionStore() {
slot._appliedFetchSeq = fetchTicket;
slot.serverMessages = messages;
+ slot.realtimeMessages = pruneRealtimeSupersededByServer(
+ slot.serverMessages,
+ slot.realtimeMessages,
+ );
slot.total = data.total ?? messages.length;
slot.hasMore = Boolean(data.hasMore);
slot.offset = (opts.offset ?? 0) + messages.length;
@@ -542,7 +601,7 @@ export function useSessionStore() {
msg.sessionId === sessionId
? msg
: { ...msg, sessionId };
- let updated = [...slot.realtimeMessages, normalizedMessage];
+ let updated = upsertRealtimeMessages(slot.realtimeMessages, [normalizedMessage]);
if (updated.length > MAX_REALTIME_MESSAGES) {
updated = updated.slice(-MAX_REALTIME_MESSAGES);
}
@@ -562,7 +621,7 @@ export function useSessionStore() {
? msg
: { ...msg, sessionId },
);
- let updated = [...slot.realtimeMessages, ...normalizedMessages];
+ let updated = upsertRealtimeMessages(slot.realtimeMessages, normalizedMessages);
if (updated.length > MAX_REALTIME_MESSAGES) {
updated = updated.slice(-MAX_REALTIME_MESSAGES);
}
diff --git a/src/types/app.ts b/src/types/app.ts
index 8fa4a68430..e7214c83a3 100644
--- a/src/types/app.ts
+++ b/src/types/app.ts
@@ -1,4 +1,4 @@
-export type LLMProvider = 'claude' | 'cursor' | 'codex' | 'opencode';
+export type LLMProvider = 'claude' | 'cursor' | 'codex' | 'opencode' | 'pi';
export type ProviderModelOption = {
value: string;