Skip to content

Commit 6acff01

Browse files
t3dotggclaude
andcommitted
fix: council round 1 for project pins and archives
- Archived projects no longer keep a hidden sidebar or mobile filter. - Pinned projects stay ahead of the current project in pickers. - The sidebar pin needs operate access and swaps only on its own hover. - Mobile checks every machine's access and writes one machine at a time. - Mobile Settings marks archived projects; scheduled task pickers skip them. - Adding an archived project's folder again unarchives it. - One copy of the project access check and failure toast. - MCP archived text covers projects on several machines, with an eval case. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 3ce432c commit 6acff01

17 files changed

Lines changed: 189 additions & 132 deletions

‎apps/mobile/src/features/home/HomeScreen.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,11 @@ export function HomeScreen(props: HomeScreenProps) {
375375
})();
376376

377377
const v2ProjectScopeKey = props.selectedProjectKey;
378-
const v2ScopedProjectGroup = findHomeProjectScope(projectScopes, v2ProjectScopeKey);
378+
// An archived project's filter reads as all projects, matching the filter menu.
379+
const v2ScopedProjectGroup = findHomeProjectScope(
380+
pickableProjectGroups(projectScopes),
381+
v2ProjectScopeKey,
382+
);
379383
const threadSearch = useThreadSearch(
380384
searchEnvironmentIds,
381385
props.searchQuery,

‎apps/mobile/src/features/projects/AddProjectScreen.tsx‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,9 @@ function useCreateProject(environment: EnvironmentOption | null) {
713713
const openNewTaskDraft = useOpenNewTaskDraft();
714714
const navigation = useNavigation();
715715
const createProject = useAtomCommand(projectEnvironment.create, { reportFailure: false });
716+
const updateProject = useAtomCommand(projectEnvironment.update, {
717+
label: "project unarchive",
718+
});
716719
const projects = useProjects();
717720

718721
return async (workspaceRoot: string, originRoute = getActiveRoute(navigation)) => {
@@ -734,6 +737,13 @@ function useCreateProject(environment: EnvironmentOption | null) {
734737
path: workspaceRoot,
735738
});
736739
if (existing) {
740+
// Adding an archived project's folder again brings the project back.
741+
if (existing.archivedAt != null) {
742+
void updateProject({
743+
environmentId: existing.environmentId,
744+
input: { projectId: existing.id, archived: false },
745+
});
746+
}
737747
Dialog.alert("Project already exists", existing.title);
738748
openNewTaskDraft(
739749
{

‎apps/mobile/src/features/settings/SettingsProjectOverviewRouteScreen.tsx‎

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,8 @@ function ProjectOverviewContent(props: {
147147
const [draftName, setDraftName] = useState<string | null>(null);
148148
const [isSaving, setIsSaving] = useState(false);
149149
const threads = useThreadShells();
150-
const removableEnvironments = useEnvironmentsWithScope(
151-
props.members,
152-
AuthOrchestrationOperateScope,
153-
);
150+
const allMembers = props.group.members.map((member) => member.project);
151+
const removableEnvironments = useEnvironmentsWithScope(allMembers, AuthOrchestrationOperateScope);
154152
const canRemoveGroup = props.members.every((member) =>
155153
removableEnvironments.has(member.environmentId),
156154
);
@@ -164,25 +162,33 @@ function ProjectOverviewContent(props: {
164162
reportFailure: true,
165163
});
166164
const [isOrganizing, setIsOrganizing] = useState(false);
167-
const allMembers = props.group.members.map((member) => member.project);
165+
const memberTargets = allMembers.map((member) =>
166+
props.connectedTargets.find((entry) => entry.environmentId === member.environmentId),
167+
);
168+
const offline = memberTargets.some((target) => target === undefined);
168169
// Older servers drop pin and archive, so their projects do not offer them.
169170
const canOrganize =
170-
canRemoveGroup &&
171-
allMembers.every(
172-
(member) =>
173-
props.connectedTargets.find((entry) => entry.environmentId === member.environmentId)
174-
?.serverConfig.environment.capabilities.projectOrganization === true,
171+
allMembers.every((member) => removableEnvironments.has(member.environmentId)) &&
172+
memberTargets.every(
173+
(target) =>
174+
target === undefined ||
175+
target.serverConfig.environment.capabilities.projectOrganization === true,
175176
);
176-
const organize = (input: { readonly pinned?: boolean; readonly archived?: boolean }) => {
177+
// One machine at a time, stopping at the first failure, as web does.
178+
const organize = async (input: { readonly pinned?: boolean; readonly archived?: boolean }) => {
177179
setIsOrganizing(true);
178-
void Promise.all(
179-
allMembers.map((member) =>
180-
organizeProject({
181-
environmentId: member.environmentId,
182-
input: { projectId: member.id, ...input },
183-
}),
184-
),
185-
).finally(() => setIsOrganizing(false));
180+
for (const member of allMembers) {
181+
if (!readEnvironmentScope(member.environmentId, AuthOrchestrationOperateScope)) {
182+
Dialog.alert("Failed to update project", "This connection can no longer change it.");
183+
break;
184+
}
185+
const result = await organizeProject({
186+
environmentId: member.environmentId,
187+
input: { projectId: member.id, ...input },
188+
});
189+
if (result._tag === "Failure") break;
190+
}
191+
setIsOrganizing(false);
186192
};
187193
const nextName = (draftName ?? displayName).trim();
188194
const canSave = !isSaving && nextName.length > 0 && nextName !== displayName;
@@ -335,10 +341,14 @@ function ProjectOverviewContent(props: {
335341
<SettingsSwitchRow
336342
icon="pin"
337343
label="Pin"
338-
subtitle="Pinned projects come first in project pickers."
344+
subtitle={
345+
offline
346+
? "Connect every machine with this project to change this."
347+
: "Pinned projects come first in project pickers."
348+
}
339349
value={props.group.pinned}
340-
disabled={isOrganizing}
341-
onValueChange={(pinned) => organize({ pinned })}
350+
disabled={isOrganizing || offline}
351+
onValueChange={(pinned) => void organize({ pinned })}
342352
/>
343353
<SettingsActionRow
344354
icon="archivebox"
@@ -348,8 +358,8 @@ function ProjectOverviewContent(props: {
348358
? "Hidden from project pickers. Threads and files are kept."
349359
: "Hides the project from project pickers. Threads and files are kept."
350360
}
351-
disabled={isOrganizing}
352-
onPress={() => organize({ archived: !props.group.archived })}
361+
disabled={isOrganizing || offline}
362+
onPress={() => void organize({ archived: !props.group.archived })}
353363
/>
354364
</SettingsSection>
355365
) : null}

‎apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.tsx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,12 @@ function TaskForm({
665665
const tasks = useEnvironmentQuery(
666666
serverEnvironment.scheduledTasksLive({ environmentId, input: {} }),
667667
);
668-
const projects = useProjects().filter((project) => project.environmentId === environmentId);
668+
// The chosen project stays listed after it is archived.
669+
const projects = useProjects().filter(
670+
(project) =>
671+
project.environmentId === environmentId &&
672+
(project.archivedAt == null || project.id === draft.projectId),
673+
);
669674
const config = useEnvironmentServerConfig(environmentId);
670675
const modelOptions = buildModelOptions(config, null, undefined, draft.projectId);
671676
const canOperate = useAtomValue(

‎apps/mobile/src/features/settings/components/SettingsEnvironmentFilterHeader.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export function SettingsEnvironmentFilterHeader(props: {
100100
},
101101
...selectableProjectGroups.map((group) => ({
102102
type: "action" as const,
103-
label: group.label,
103+
label: projectMenuLabel(group),
104104
state: selectedProjectKey === group.key ? ("on" as const) : undefined,
105105
onPress: () => selectProject(group.key),
106106
})),
@@ -160,7 +160,7 @@ export function AndroidSettingsEnvironmentFilter() {
160160
},
161161
...selectableProjectGroups.map((group) => ({
162162
id: `project:${group.key}`,
163-
title: `Project · ${group.label}`,
163+
title: `Project · ${projectMenuLabel(group)}`,
164164
state: selectedProjectKey === group.key ? ("on" as const) : ("off" as const),
165165
})),
166166
]}
@@ -190,3 +190,6 @@ export function AndroidSettingsEnvironmentFilter() {
190190
</Menu>
191191
);
192192
}
193+
194+
const projectMenuLabel = (group: { readonly label: string; readonly archived: boolean }) =>
195+
group.archived ? `${group.label} · Archived` : group.label;

‎apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,9 @@ function ThreadNavigationSidebarPane(
235235
),
236236
[projectScopes],
237237
);
238+
// An archived project's filter reads as all projects, matching the filter menu.
238239
const selectedProjectScope =
239-
projectScopes.find((scope) => scope.key === resolvedProjectKey) ?? null;
240+
pickableProjectGroups(projectScopes).find((scope) => scope.key === resolvedProjectKey) ?? null;
240241
const threadSearch = useThreadSearch(
241242
searchEnvironmentIds,
242243
props.searchQuery,

‎apps/web/src/components/CommandPalette.tsx‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,9 @@ function OpenCommandPaletteDialog(props: {
394394
const createProject = useAtomCommand(projectEnvironment.create, {
395395
reportFailure: false,
396396
});
397+
const updateProject = useAtomCommand(projectEnvironment.update, {
398+
label: "project unarchive",
399+
});
397400
const { scratchEnvironmentId, scratchWorkspaceRootFor, startScratchThread } = useScratchProject();
398401
const lookupRepository = useAtomQueryRunner(sourceControlEnvironment.repository, {
399402
reportFailure: false,
@@ -1669,6 +1672,13 @@ function OpenCommandPaletteDialog(props: {
16691672
cwd,
16701673
);
16711674
if (existing) {
1675+
// Adding an archived project's folder again brings the project back.
1676+
if (existing.archivedAt != null) {
1677+
void updateProject({
1678+
environmentId: existing.environmentId,
1679+
input: { projectId: existing.id, archived: false },
1680+
});
1681+
}
16721682
const latestThread = getLatestThreadForProject(
16731683
threads.filter((thread) => thread.environmentId === existing.environmentId),
16741684
existing.id,

‎apps/web/src/components/Sidebar.tsx‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,11 @@ import { threadEnvironment } from "../state/threads";
148148
import { useOlderSettledShelf, useOlderSettledShelfGrowth } from "../state/olderSettledShelf";
149149
import { useThreadSearch } from "../state/queries";
150150
import { useOrchestrationCommand } from "../state/use-orchestration-command";
151-
import { readEnvironmentScope, useEnvironmentScope } from "../state/session";
151+
import {
152+
readEnvironmentScope,
153+
useEnvironmentScope,
154+
useEnvironmentsWithScope,
155+
} from "../state/session";
152156
import { appAtomRegistry } from "../rpc/atomRegistry";
153157
import { canShareWithGuestAtom } from "./chat/guestShareAvailability";
154158
import { openGuestShareDialog } from "./chat/guestShareDialogState";
@@ -979,8 +983,9 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
979983
};
980984
// A scope whose project is gone reads as all projects once every snapshot has
981985
// loaded. The stored key is left alone, so the scope returns with its project.
986+
// An archived project's scope reads as all projects, matching the menu.
982987
const chosenProjectScopeKey = resolveSidebarProjectScopeKey({
983-
groups: projectGroups,
988+
groups: pickableProjectGroups(projectGroups),
984989
key: persistedProjectScopeKey,
985990
settings: projectGroupingSettings,
986991
canClearMissingScope: allProjectSnapshotsReady && allProjectConfigsReady,
@@ -1112,6 +1117,10 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
11121117
},
11131118
);
11141119
const { updateProjectGroup, canOrganizeProjectGroup } = useProjectGroupUpdate();
1120+
const operableEnvironmentIds = useEnvironmentsWithScope(projects, AuthOrchestrationOperateScope);
1121+
const canPinProject = (project: SidebarProjectSnapshot) =>
1122+
canOrganizeProjectGroup(project.memberProjects) &&
1123+
project.memberProjects.every((member) => operableEnvironmentIds.has(member.environmentId));
11151124
const handleProjectSettings = useStableCallback(
11161125
(
11171126
event: ReactMouseEvent<HTMLElement> | ReactKeyboardEvent<HTMLInputElement>,
@@ -2832,11 +2841,10 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
28322841
machineByEnvironmentId={environmentMachineById}
28332842
/>
28342843
) : null}
2835-
{project && canOrganizeProjectGroup(project.memberProjects) ? (
2836-
// Pinned rows always show their pin; others on hover.
2844+
{project && canPinProject(project) ? (
28372845
<span
28382846
className={cn(
2839-
"ml-auto flex",
2847+
"group/pin ml-auto flex",
28402848
!project.pinned &&
28412849
"opacity-0 in-data-highlighted:opacity-100 pointer-coarse:opacity-100",
28422850
)}
@@ -2866,8 +2874,8 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
28662874
>
28672875
{project.pinned ? (
28682876
<>
2869-
<PinIcon className="size-3.5 in-data-highlighted:hidden" />
2870-
<PinOffIcon className="hidden size-3.5 in-data-highlighted:block" />
2877+
<PinIcon className="size-3.5 group-hover/pin:hidden" />
2878+
<PinOffIcon className="hidden size-3.5 group-hover/pin:block" />
28712879
</>
28722880
) : (
28732881
<PinIcon className="size-3.5" />
@@ -2882,11 +2890,7 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
28822890
tabIndex={-1}
28832891
aria-hidden="true"
28842892
title={`Project settings for ${project.displayName}`}
2885-
className={
2886-
canOrganizeProjectGroup(project.memberProjects)
2887-
? undefined
2888-
: "ml-auto"
2889-
}
2893+
className={canPinProject(project) ? undefined : "ml-auto"}
28902894
onPointerDown={(event) => event.stopPropagation()}
28912895
onClick={(event) => {
28922896
void handleProjectSettings(event, project);

‎apps/web/src/components/settings/ProjectSettingsPanel.browser.test.tsx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,18 @@ vi.mock(import("@t3tools/client-runtime/state/session"), async (original) => {
7070
vi.mock(import("~/state/environments"), async (original) => ({
7171
...(await original()),
7272
useEnvironments: (() => ({ environments })) as never,
73+
readEnvironment: ((id: EnvironmentId) =>
74+
environments.find((environment) => environment.environmentId === id) ?? null) as never,
7375
usePrimaryEnvironmentId: () => primaryId,
7476
}));
7577
vi.mock(import("~/state/entities"), async (original) => ({
7678
...(await original()),
7779
useProjects: (() => state.projects) as never,
7880
useThreadShells: () => [],
81+
useServerConfigs: (() =>
82+
new Map(
83+
environments.map((environment) => [environment.environmentId, environment.serverConfig]),
84+
)) as never,
7985
waitForProjectRemoval: async () => true,
8086
}));
8187
vi.mock(import("~/state/projects"), async (original) => {

0 commit comments

Comments
 (0)