Skip to content

Open-source Grok Bot alternative for named AI teammates. Local-first desktop, web, and mobile clients with per-bot tools, instructions, and memory. Independent fork of T3 Code.

Merge origin/main into codething/4efb5794

Julius Marminge37e17e920712
diff --cc apps/web/src/components/GitActionsControl.tsx
index 438c0ac63,11b5fc452..ed55c5cce
--- a/apps/web/src/components/GitActionsControl.tsx
+++ b/apps/web/src/components/GitActionsControl.tsx
@@@ -234,10 -234,9 +234,9 @@@ export default function GitActionsContr
title: "Unable to open PR link",
description: err instanceof Error ? err.message : "An error occurred.",
data: threadToastData,
- }),
+ });
});
- void promise.catch(() => undefined);
- }, [api, gitStatusForActions?.pr, threadToastData]);
- }, [api, gitStatusForActions?.openPr?.url, threadToastData]);
++ }, [api, gitStatusForActions?.pr?.state, gitStatusForActions?.pr?.url, threadToastData]);
const runGitActionWithToast = useCallback(
async ({
diff --cc apps/web/src/components/Sidebar.tsx
index 01bbcbafa,9291843ea..34ffe14f0
--- a/apps/web/src/components/Sidebar.tsx
+++ b/apps/web/src/components/Sidebar.tsx
@@@ -1,28 -1,18 +1,25 @@@
-import { TerminalIcon } from "lucide-react";
+import {
+ GitPullRequestIcon,
+ MonitorIcon,
+ MoonIcon,
+ SunIcon,
+ TerminalIcon,
+} from "lucide-react";
import { useCallback, useEffect, useMemo, useState } from "react";
import type { ResolvedKeybindingsConfig } from "@t3tools/contracts";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQueries, useQuery, useQueryClient } from "@tanstack/react-query";
+import { gitStatusResultSchema, type GitStatusResult } from "@t3tools/contracts";
+ import { useNavigate, useParams } from "@tanstack/react-router";
+ import { useAppSettings } from "../appSettings";
import { isElectron } from "../env";
- import { useTheme } from "../hooks/useTheme";
+ import { APP_STAGE_LABEL } from "../branding";
import { DEFAULT_MODEL } from "../model-logic";
import { derivePendingApprovals } from "../session-logic";
import { useStore } from "../store";
import { isChatNewLocalShortcut, isChatNewShortcut } from "../keybindings";
- import {
- DEFAULT_THREAD_TERMINAL_HEIGHT,
- DEFAULT_THREAD_TERMINAL_ID,
- type Project,
- type Thread,
- } from "../types";
+ import { type Project, type Thread } from "../types";
import { useNativeApi } from "../hooks/useNativeApi";
-import { gitRemoveWorktreeMutationOptions } from "../lib/gitReactQuery";
+import { gitRemoveWorktreeMutationOptions, gitStatusQueryOptions } from "../lib/gitReactQuery";
import { serverConfigQueryOptions } from "../lib/serverReactQuery";
import { toastManager } from "./ui/toast";
import { formatWorktreePathForDisplay, getOrphanedWorktreePathForThread } from "../worktreeCleanup";