Skip to content

fix(sync): restore session permission mode from last message across devices #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
leeroybrun wants to merge 3 commits into from
Closed

fix(sync): restore session permission mode from last message across devices #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44190a1
fix(sync): restore session permission mode from last message
leeroybrun Jan 13, 2026
c5b2167
fix(sync): persist permission mode timestamp for restart-safe arbitra…
leeroybrun Jan 13, 2026
6409cbe
fix(sync): persist permission mode reliably across devices
leeroybrun Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sources/-session/SessionView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { isRunningOnMac } from '@/utils/platform';
import { useDeviceType, useHeaderHeight, useIsLandscape, useIsTablet } from '@/utils/responsive';
import { formatPathRelativeToHome, getSessionAvatarId, getSessionName, useSessionStatus } from '@/utils/sessionUtils';
import { isVersionSupported, MINIMUM_CLI_VERSION } from '@/utils/versionUtils';
import type { PermissionMode } from '@/constants/PermissionModes';
import { Ionicons } from '@expo/vector-icons';
import { useRouter } from 'expo-router';
import * as React from 'react';
Expand Down Expand Up @@ -189,7 +190,7 @@ function SessionViewLoaded({ sessionId, session }: { sessionId: string, session:
}, [machineId, cliVersion, acknowledgedCliVersions]);

// Function to update permission mode
const updatePermissionMode = React.useCallback((mode: 'default' | 'acceptEdits' | 'bypassPermissions' | 'plan' | 'read-only' | 'safe-yolo' | 'yolo') => {
const updatePermissionMode = React.useCallback((mode: PermissionMode) => {
storage.getState().updateSessionPermissionMode(sessionId, mode);
}, [sessionId]);

Expand Down
3 changes: 2 additions & 1 deletion sources/components/PermissionModeSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ import React from 'react';
import { Text, Pressable, Platform } from 'react-native';
import { Ionicons } from '@expo/vector-icons';
import { Typography } from '@/constants/Typography';
import type { PermissionMode } from '@/constants/PermissionModes';
import { hapticsLight } from './haptics';

export type PermissionMode = 'default' | 'acceptEdits' | 'bypassPermissions' | 'plan' | 'read-only' | 'safe-yolo' | 'yolo';
export type { PermissionMode } from '@/constants/PermissionModes';

export type ModelMode = 'default' | 'adaptiveUsage' | 'sonnet' | 'opus' | 'gpt-5-codex-high' | 'gpt-5-codex-medium' | 'gpt-5-codex-low' | 'gpt-5-minimal' | 'gpt-5-low' | 'gpt-5-medium' | 'gpt-5-high';

Expand Down
12 changes: 12 additions & 0 deletions sources/constants/PermissionModes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
export const PERMISSION_MODES = [
'default',
'acceptEdits',
'bypassPermissions',
'plan',
'read-only',
'safe-yolo',
'yolo',
] as const;

export type PermissionMode = (typeof PERMISSION_MODES)[number];

19 changes: 18 additions & 1 deletion sources/sync/apiSocket.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { io, Socket } from 'socket.io-client';
import { TokenStorage } from '@/auth/tokenStorage';
import { Encryption } from './encryption/encryption';
import { observeServerTimestamp } from './time';

//
// Types
Expand Down Expand Up @@ -180,10 +181,26 @@ class ApiSocket {
...options?.headers
};

return fetch(url, {
const response = await fetch(url, {
...options,
headers
});

// Best-effort server time calibration using the HTTP Date header ("server now").
// This avoids deriving "now" from potentially stale resource timestamps (e.g. session.updatedAt).
try {
const dateHeader = response.headers.get('date');
if (dateHeader) {
const serverNow = Date.parse(dateHeader);
if (!Number.isNaN(serverNow)) {
observeServerTimestamp(serverNow);
}
}
} catch {
// Best-effort only
}

return response;
}

//
Expand Down
30 changes: 29 additions & 1 deletion sources/sync/persistence.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Settings, settingsDefaults, settingsParse, SettingsSchema } from './set
import { LocalSettings, localSettingsDefaults, localSettingsParse } from './localSettings';
import { Purchases, purchasesDefaults, purchasesParse } from './purchases';
import { Profile, profileDefaults, profileParse } from './profile';
import type { PermissionMode } from '@/components/PermissionModeSelector';
import type { PermissionMode } from '@/constants/PermissionModes';

const mmkv = new MMKV();
const NEW_SESSION_DRAFT_KEY = 'new-session-draft-v1';
Expand Down Expand Up @@ -188,6 +188,34 @@ export function saveSessionPermissionModes(modes: Record<string, PermissionMode>
mmkv.set('session-permission-modes', JSON.stringify(modes));
}

export function loadSessionPermissionModeUpdatedAts(): Record<string, number> {
const raw = mmkv.getString('session-permission-mode-updated-ats');
if (raw) {
try {
const parsed = JSON.parse(raw);
if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
return {};
}

const result: Record<string, number> = {};
for (const [sessionId, value] of Object.entries(parsed as Record<string, unknown>)) {
if (typeof value === 'number' && Number.isFinite(value)) {
result[sessionId] = value;
}
}
return result;
} catch (e) {
console.error('Failed to parse session permission mode updated timestamps', e);
return {};
}
}
return {};
}

export function saveSessionPermissionModeUpdatedAts(updatedAts: Record<string, number>) {
mmkv.set('session-permission-mode-updated-ats', JSON.stringify(updatedAts));
}

export function loadProfile(): Profile {
const profile = mmkv.getString('profile');
if (profile) {
Expand Down
3 changes: 2 additions & 1 deletion sources/sync/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as z from 'zod';
import { PERMISSION_MODES } from '@/constants/PermissionModes';

//
// Configuration Profile Schema (for environment variable profiles)
Expand Down Expand Up @@ -116,7 +117,7 @@ export const AIBackendProfileSchema = z.object({
defaultSessionType: z.enum(['simple', 'worktree']).optional(),

// Default permission mode for this profile
defaultPermissionMode: z.enum(['default', 'acceptEdits', 'bypassPermissions', 'plan', 'read-only', 'safe-yolo', 'yolo']).optional(),
defaultPermissionMode: z.enum(PERMISSION_MODES).optional(),

// Default model mode for this profile
defaultModelMode: z.string().optional(),
Expand Down
133 changes: 115 additions & 18 deletions sources/sync/storage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import { Purchases, customerInfoToPurchases } from "./purchases";
import { TodoState } from "../-zen/model/ops";
import { Profile } from "./profile";
import { UserProfile, RelationshipUpdatedEvent } from "./friendTypes";
import { loadSettings, loadLocalSettings, saveLocalSettings, saveSettings, loadPurchases, savePurchases, loadProfile, saveProfile, loadSessionDrafts, saveSessionDrafts, loadSessionPermissionModes, saveSessionPermissionModes } from "./persistence";
import type { PermissionMode } from '@/components/PermissionModeSelector';
import { loadSettings, loadLocalSettings, saveLocalSettings, saveSettings, loadPurchases, savePurchases, loadProfile, saveProfile, loadSessionDrafts, saveSessionDrafts, loadSessionPermissionModes, saveSessionPermissionModes, loadSessionPermissionModeUpdatedAts, saveSessionPermissionModeUpdatedAts } from "./persistence";
import { PERMISSION_MODES, type PermissionMode } from '@/constants/PermissionModes';
import type { CustomerInfo } from './revenueCat/types';
import React from "react";
import { sync } from "./sync";
Expand All @@ -21,6 +21,7 @@ import { isMutableTool } from "@/components/tools/knownTools";
import { projectManager } from "./projectManager";
import { DecryptedArtifact } from "./artifactTypes";
import { FeedItem } from "./feedTypes";
import { nowServerMs } from "./time";

// Debounce timer for realtimeMode changes
let realtimeModeDebounceTimer: ReturnType<typeof setTimeout> | null = null;
Expand Down Expand Up @@ -116,7 +117,7 @@ interface StorageState {
setSocketStatus: (status: 'disconnected' | 'connecting' | 'connected' | 'error') => void;
getActiveSessions: () => Session[];
updateSessionDraft: (sessionId: string, draft: string | null) => void;
updateSessionPermissionMode: (sessionId: string, mode: 'default' | 'acceptEdits' | 'bypassPermissions' | 'plan' | 'read-only' | 'safe-yolo' | 'yolo') => void;
updateSessionPermissionMode: (sessionId: string, mode: PermissionMode) => void;
updateSessionModelMode: (sessionId: string, mode: 'default') => void;
// Artifact methods
applyArtifacts: (artifacts: DecryptedArtifact[]) => void;
Expand Down Expand Up @@ -250,6 +251,31 @@ export const storage = create<StorageState>()((set, get) => {
let profile = loadProfile();
let sessionDrafts = loadSessionDrafts();
let sessionPermissionModes = loadSessionPermissionModes();
let sessionPermissionModeUpdatedAts = loadSessionPermissionModeUpdatedAts();

const persistSessionPermissionData = (sessions: Record<string, Session>) => {
const allModes: Record<string, PermissionMode> = {};
const allUpdatedAts: Record<string, number> = {};

Object.entries(sessions).forEach(([id, sess]) => {
if (sess.permissionMode && sess.permissionMode !== 'default') {
allModes[id] = sess.permissionMode;
}
if (typeof sess.permissionModeUpdatedAt === 'number') {
allUpdatedAts[id] = sess.permissionModeUpdatedAt;
}
});

try {
saveSessionPermissionModes(allModes);
saveSessionPermissionModeUpdatedAts(allUpdatedAts);
sessionPermissionModes = allModes;
sessionPermissionModeUpdatedAts = allUpdatedAts;
} catch (e) {
console.error('Failed to persist session permission data:', e);
}
};

return {
settings,
settingsVersion: version,
Expand Down Expand Up @@ -303,6 +329,7 @@ export const storage = create<StorageState>()((set, get) => {
// Load drafts and permission modes if sessions are empty (initial load)
const savedDrafts = Object.keys(state.sessions).length === 0 ? sessionDrafts : {};
const savedPermissionModes = Object.keys(state.sessions).length === 0 ? sessionPermissionModes : {};
const savedPermissionModeUpdatedAts = Object.keys(state.sessions).length === 0 ? sessionPermissionModeUpdatedAts : {};

// Merge new sessions with existing ones
const mergedSessions: Record<string, Session> = { ...state.sessions };
Expand All @@ -317,11 +344,40 @@ export const storage = create<StorageState>()((set, get) => {
const savedDraft = savedDrafts[session.id];
const existingPermissionMode = state.sessions[session.id]?.permissionMode;
const savedPermissionMode = savedPermissionModes[session.id];
const existingPermissionModeUpdatedAt = state.sessions[session.id]?.permissionModeUpdatedAt;
const savedPermissionModeUpdatedAt = savedPermissionModeUpdatedAts[session.id];

// CLI may publish a session permission mode in encrypted metadata for local-only starts.
// This is a fallback signal for when there are no app-sent user messages carrying meta.permissionMode yet.
const metadataPermissionMode = session.metadata?.permissionMode ?? null;
const metadataPermissionModeUpdatedAt = session.metadata?.permissionModeUpdatedAt ?? null;

let mergedPermissionMode =
existingPermissionMode ||
savedPermissionMode ||
session.permissionMode ||
'default';

let mergedPermissionModeUpdatedAt =
existingPermissionModeUpdatedAt ??
savedPermissionModeUpdatedAt ??
null;

if (metadataPermissionMode && typeof metadataPermissionModeUpdatedAt === 'number') {
const localUpdatedAt = mergedPermissionModeUpdatedAt ?? 0;
if (metadataPermissionModeUpdatedAt > localUpdatedAt) {
mergedPermissionMode = metadataPermissionMode;
mergedPermissionModeUpdatedAt = metadataPermissionModeUpdatedAt;
}
}

mergedSessions[session.id] = {
...session,
presence,
draft: existingDraft || savedDraft || session.draft || null,
permissionMode: existingPermissionMode || savedPermissionMode || session.permissionMode || 'default'
permissionMode: mergedPermissionMode,
// Preserve local coordination timestamp (not synced to server)
permissionModeUpdatedAt: mergedPermissionModeUpdatedAt
};
});

Expand Down Expand Up @@ -514,13 +570,42 @@ export const storage = create<StorageState>()((set, get) => {
const messagesArray = Object.values(mergedMessagesMap)
.sort((a, b) => b.createdAt - a.createdAt);

// Infer session permission mode from the most recent user message meta.
// This makes permission mode "follow" the session across devices/machines without adding server fields.
// Local user changes should win until the next user message is sent (tracked by permissionModeUpdatedAt).
let inferredPermissionMode: PermissionMode | null = null;
let inferredPermissionModeAt: number | null = null;
for (const message of messagesArray) {
if (message.kind !== 'user-text') continue;
const rawMode = message.meta?.permissionMode;
if (!rawMode || !PERMISSION_MODES.includes(rawMode as any)) continue;
const mode = rawMode as PermissionMode;
inferredPermissionMode = mode;
inferredPermissionModeAt = message.createdAt;
break;
}

// Update session with todos and latestUsage
// IMPORTANT: We extract latestUsage from the mutable reducerState and copy it to the Session object
// This ensures latestUsage is available immediately on load, even before messages are fully loaded
let updatedSessions = state.sessions;
const needsUpdate = (reducerResult.todos !== undefined || existingSession.reducerState.latestUsage) && session;

if (needsUpdate) {
const canInferPermissionMode = Boolean(
session &&
inferredPermissionMode &&
inferredPermissionModeAt &&
// NOTE: inferredPermissionModeAt comes from message.createdAt (server timestamp for remote messages,
// and best-effort server-aligned timestamp for locally-created optimistic messages).
// permissionModeUpdatedAt is stamped using nowServerMs() for clock-safe ordering across devices.
inferredPermissionModeAt > (session.permissionModeUpdatedAt ?? 0)
);

const shouldWritePermissionMode =
canInferPermissionMode &&
(session!.permissionMode ?? 'default') !== inferredPermissionMode;

if (needsUpdate || shouldWritePermissionMode) {
updatedSessions = {
...state.sessions,
[sessionId]: {
Expand All @@ -529,9 +614,19 @@ export const storage = create<StorageState>()((set, get) => {
// Copy latestUsage from reducerState to make it immediately available
latestUsage: existingSession.reducerState.latestUsage ? {
...existingSession.reducerState.latestUsage
} : session.latestUsage
} : session.latestUsage,
...(shouldWritePermissionMode && {
permissionMode: inferredPermissionMode,
permissionModeUpdatedAt: inferredPermissionModeAt
})
}
};

// Persist permission modes (only non-default values to save space)
// Note: this includes modes inferred from session messages so they load instantly on app restart.
if (shouldWritePermissionMode) {
persistSessionPermissionData(updatedSessions);
}
}

return {
Expand Down Expand Up @@ -778,29 +873,25 @@ export const storage = create<StorageState>()((set, get) => {
sessionListViewData
};
}),
updateSessionPermissionMode: (sessionId: string, mode: 'default' | 'acceptEdits' | 'bypassPermissions' | 'plan' | 'read-only' | 'safe-yolo' | 'yolo') => set((state) => {
updateSessionPermissionMode: (sessionId: string, mode: PermissionMode) => set((state) => {
const session = state.sessions[sessionId];
if (!session) return state;

const now = nowServerMs();

// Update the session with the new permission mode
const updatedSessions = {
...state.sessions,
[sessionId]: {
...session,
permissionMode: mode
permissionMode: mode,
// Mark as locally updated so older message-based inference cannot override this selection.
// Newer user messages (from any device) will still take over.
permissionModeUpdatedAt: now
}
};

// Collect all permission modes for persistence
const allModes: Record<string, PermissionMode> = {};
Object.entries(updatedSessions).forEach(([id, sess]) => {
if (sess.permissionMode && sess.permissionMode !== 'default') {
allModes[id] = sess.permissionMode;
}
});

// Persist permission modes (only non-default values to save space)
saveSessionPermissionModes(allModes);
persistSessionPermissionData(updatedSessions);

// No need to rebuild sessionListViewData since permission mode doesn't affect the list display
return {
Expand Down Expand Up @@ -931,6 +1022,12 @@ export const storage = create<StorageState>()((set, get) => {
const modes = loadSessionPermissionModes();
delete modes[sessionId];
saveSessionPermissionModes(modes);
sessionPermissionModes = modes;

const updatedAts = loadSessionPermissionModeUpdatedAts();
delete updatedAts[sessionId];
saveSessionPermissionModeUpdatedAts(updatedAts);
sessionPermissionModeUpdatedAts = updatedAts;
Comment on lines +1025 to +1030
Copy link
Copy Markdown

@gemini-code-assist gemini-code-assist bot Jan 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The pattern used here to clear persisted data for both modes and updatedAts can be simplified and made more robust. Instead of re-loading from storage, you can modify the in-memory cache variables (sessionPermissionModes and sessionPermissionModeUpdatedAts) directly and then save them. This avoids unnecessary disk reads and is safer against potential race conditions if persistence were to become asynchronous.

Applying this improved pattern would change lines 1022-1030 to something like this:

// In deleteSession...
delete sessionPermissionModes[sessionId];
saveSessionPermissionModes(sessionPermissionModes);

delete sessionPermissionModeUpdatedAts[sessionId];
saveSessionPermissionModeUpdatedAts(sessionPermissionModeUpdatedAts);

Since this change spans existing code, I'm providing it as an example rather than a direct suggestion.


// Rebuild sessionListViewData without the deleted session
const sessionListViewData = buildSessionListViewData(remainingSessions);
Expand Down
10 changes: 8 additions & 2 deletions sources/sync/storageTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { z } from "zod";
import { PERMISSION_MODES } from "@/constants/PermissionModes";
import type { PermissionMode } from "@/constants/PermissionModes";

//
// Agent states
Expand All @@ -21,7 +23,10 @@ export const MetadataSchema = z.object({
homeDir: z.string().optional(), // User's home directory on the machine
happyHomeDir: z.string().optional(), // Happy configuration directory
hostPid: z.number().optional(), // Process ID of the session
flavor: z.string().nullish() // Session flavor/variant identifier
flavor: z.string().nullish(), // Session flavor/variant identifier
// Published by happy-cli so the app can seed permission state even before there are messages.
permissionMode: z.enum(PERMISSION_MODES).optional(),
permissionModeUpdatedAt: z.number().optional(),
});

export type Metadata = z.infer<typeof MetadataSchema>;
Expand Down Expand Up @@ -69,7 +74,8 @@ export interface Session {
id: string;
}>;
draft?: string | null; // Local draft message, not synced to server
permissionMode?: 'default' | 'acceptEdits' | 'bypassPermissions' | 'plan' | 'read-only' | 'safe-yolo' | 'yolo' | null; // Local permission mode, not synced to server
permissionMode?: PermissionMode | null; // Local permission mode, not synced to server
permissionModeUpdatedAt?: number | null; // Local timestamp to coordinate inferred (from last message) vs user-selected mode, not synced to server
modelMode?: 'default' | null; // Local model mode, not synced to server (models configured in CLI)
// IMPORTANT: latestUsage is extracted from reducerState.latestUsage after message processing.
// We store it directly on Session to ensure it's available immediately on load.
Expand Down
Loading