Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
2 changes: 1 addition & 1 deletion apps/desktop/src/backend/DesktopBackendPool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export const layer = Layer.effect(
});
yield* electronDialog.showErrorBox(
"WSL backend couldn't start",
`${reason}\n\nFalling back to the Windows backend so T3 Code can open. Re-enable the WSL backend from Settings > Connections once the WSL distro is fixed.`,
`${reason}\n\nFalling back to the Windows backend so T3 Code can open. Re-enable the WSL backend from Settings > Sharing & access once the WSL distro is fixed.`,
);
// Clear wslOnly too so enabling WSL cannot restore a failed mode.
// Keep the in-memory fallback if persistence fails.
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/vcs/GitVcsDriverCore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3695,7 +3695,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
operation: "GitVcsDriver.createWorktree",
command: "git worktree add",
cwd: input.cwd,
detail: `The worktree location "${options?.worktreesDirectory}" must be an absolute folder on this machine, not a drive root. Change it in Settings → Storage.`,
detail: `The worktree location "${options?.worktreesDirectory}" must be an absolute folder on this machine, not a drive root. Change it in Settings → Worktrees.`,
});
}
worktreePath = path.join(parentDir, repoName, sanitizedBranch);
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/HostedEmptyState.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export function HostedEmptyState() {
<EmptyContent>
{localEnvironmentOff ? (
<Button render={<Link to="/settings/connections" />} size="sm">
Open Connections
Open Environments
</Button>
) : (
<ol className="w-full space-y-4 text-left">
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/components/PermissionUpdateNotice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ function showPermissionNotice(
timeout: 0,
onClose: persistDismissal,
actionProps: {
children: "Open Connections",
children: "Open Sharing & access",
onClick: () => {
dismiss();
void router.navigate({ to: "/settings/connections" });
void router.navigate({ to: "/settings/access" });
},
},
data: {
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/components/auth/ConnectAgentSurface.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ export function ConnectAgentSurface() {
value={pairingCode}
/>
<p className="text-xs text-muted-foreground">
Create one in Settings → Connections, or run <code>t3 auth pairing create</code> on
this machine.
Create one in Settings → Sharing & access, or run <code>t3 auth pairing create</code>{" "}
on this machine.
</p>
</div>
)}
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/chat/guestShareAvailability.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { serverEnvironment } from "~/state/server";

/**
* Whether this environment offers "Share with guest": the user may create links there, and its
* Guest links beta is on (Settings > Beta). The server refuses links while the beta is off.
* Guest links beta is on (Settings > Labs). The server refuses links while the beta is off.
*/
export const canShareWithGuestAtom = Atom.family((environmentId: EnvironmentId) =>
Atom.make(
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/chat/useSystemComposerBanners.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ export function useSystemComposerBanners(input: SystemComposerBannersInput) {
size="xs"
variant="ghost"
disabled={disconnectingEnvironment}
title="Hide this server's threads. Switch it on again in Connections."
title="Hide this server's threads. Switch it on again in Environments."
onClick={() =>
void handleDisconnectActiveEnvironmentStable(
activeEnvironmentUnavailableState.environmentId,
Expand Down
42 changes: 42 additions & 0 deletions apps/web/src/components/settings/AdvancedSettings.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import { ChevronRightIcon } from "lucide-react";
import { type ReactNode, useState } from "react";

import { Collapsible, CollapsiblePanel, CollapsibleTrigger } from "../ui/collapsible";
import { useSettingsSearchTargetId } from "./settingsLayout";

/**
* Folds power-user rows at the end of a section. `targetIds` names the search targets inside, so a
* search jump opens the fold before its row mounts.
*/
export function AdvancedSettings({
targetIds,
children,
}: {
readonly targetIds: ReadonlyArray<string>;
readonly children: ReactNode;
}) {
const [open, setOpen] = useState(false);
const searchTargetId = useSettingsSearchTargetId();
const [seenSearchTargetId, setSeenSearchTargetId] = useState<string | null>(null);
if (seenSearchTargetId !== searchTargetId) {
setSeenSearchTargetId(searchTargetId);
if (searchTargetId !== null && targetIds.includes(searchTargetId)) setOpen(true);
}

return (
<Collapsible open={open} onOpenChange={setOpen}>
<CollapsibleTrigger className="group flex min-h-10 w-full items-center gap-1.5 rounded-b-xl px-3 text-left text-xs font-medium text-muted-foreground outline-none transition-colors hover:text-foreground focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring data-panel-open:rounded-none sm:px-4">
<ChevronRightIcon
aria-hidden
className="size-3.5 shrink-0 transition-transform duration-150 group-data-panel-open:rotate-90 motion-reduce:transition-none"
/>
Advanced
</CollapsibleTrigger>
<CollapsiblePanel>
<div className="border-t border-border/50 [&>*+*]:border-t [&>*+*]:border-border/50">
{children}
</div>
</CollapsiblePanel>
</Collapsible>
);
}
Loading
Loading