Merged
Show file tree
Hide file tree
Changes from all 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
24 changes: 22 additions & 2 deletions apps/web/src/assets/assetUrls.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,18 +9,38 @@ import { usePreparedConnection } from "~/state/session";

export { resolveAssetUrl } from "@t3tools/client-runtime/state/assets";

export function useAssetUrl(environmentId: EnvironmentId, resource: AssetResource): string | null {
export type AssetUrlState =
| { readonly _tag: "Loading" }
| { readonly _tag: "Failure" }
| { readonly _tag: "Success"; readonly url: string };

export function useAssetUrlState(
environmentId: EnvironmentId,
resource: AssetResource,
): AssetUrlState {
const preparedConnection = usePreparedConnection(environmentId);
const result = useAtomValue(
assetEnvironment.createUrl({
environmentId,
input: { resource },
}),
);
if (result._tag === "Failure") {
return { _tag: "Failure" };
}
if (preparedConnection._tag === "None" || result._tag !== "Success") {
return { _tag: "Loading" };
}
const url = resolveAssetUrl(preparedConnection.value.httpBaseUrl, result.value.relativeUrl);
return url === null ? { _tag: "Failure" } : { _tag: "Success", url };
}

export function useAssetUrl(environmentId: EnvironmentId, resource: AssetResource): string | null {
const result = useAssetUrlState(environmentId, resource);
if (result._tag !== "Success") {
return null;
}
return resolveAssetUrl(preparedConnection.value.httpBaseUrl, result.value.relativeUrl);
return result.url;
}

export function useAssetUrls(
Expand Down
52 changes: 50 additions & 2 deletions apps/web/src/components/files/FilePreviewPanel.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type {
ResolvedKeybindingsConfig,
ScopedThreadRef,
} from "@t3tools/contracts";
import { isWorkspaceImagePreviewPath } from "@t3tools/shared/filePreview";
import { VirtualizedFile, type SelectedLineRange } from "@pierre/diffs";
import { Editor } from "@pierre/diffs/editor";
import { EditorProvider, File, type FileOptions, Virtualizer } from "@pierre/diffs/react";
Expand All@@ -16,6 +17,7 @@ import * as Schema from "effect/Schema";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";

import { isBrowserPreviewFile, openFileInPreview } from "~/browser/openFileInPreview";
import { useAssetUrlState } from "~/assets/assetUrls";
import ChatMarkdown from "~/components/ChatMarkdown";
import { OpenInPicker } from "~/components/chat/OpenInPicker";
import { useClientSettings } from "~/hooks/useSettings";
Expand DownExpand Up@@ -113,6 +115,43 @@ const FILE_LINK_REVEAL_UNSAFE_CSS = `
`;
type FilePostRender = NonNullable<FileOptions<unknown>["onPostRender"]>;

function WorkspaceImagePreview(props: {
readonly environmentId: EnvironmentId;
readonly threadRef: ScopedThreadRef;
readonly absolutePath: string;
readonly alt: string;
}) {
const assetUrl = useAssetUrlState(props.environmentId, {
_tag: "workspace-file",
threadId: props.threadRef.threadId,
path: props.absolutePath,
});
const [failedUrl, setFailedUrl] = useState<string | null>(null);

if (assetUrl._tag === "Failure" || (assetUrl._tag === "Success" && failedUrl === assetUrl.url)) {
return (
<div className="flex min-h-0 flex-1 items-center justify-center px-6 text-center text-xs leading-relaxed text-destructive">
Unable to load workspace image.
</div>
);
}

return assetUrl._tag === "Success" ? (
<div className="flex min-h-0 flex-1 items-center justify-center overflow-auto p-4">
<img
className="max-h-full max-w-full object-contain"
src={assetUrl.url}
alt={props.alt}
onError={() => setFailedUrl(assetUrl.url)}
Comment thread
Rhiz3K marked this conversation as resolved.
/>
</div>
) : (
<div className="flex min-h-0 flex-1 items-center justify-center text-muted-foreground">
<LoaderCircle className="size-5 animate-spin" />
</div>
Comment thread
cursor[bot] marked this conversation as resolved.
);
}

function clampFileLine(contents: string, requestedLine: number): number {
let lineCount = 1;
for (let index = 0; index < contents.length; index += 1) {
Expand DownExpand Up@@ -630,7 +669,8 @@ export default function FilePreviewPanel({
const openPreview = useAtomCommand(previewEnvironment.open, {
reportFailure: false,
});
const file = useProjectFileQuery(environmentId, cwd, relativePath);
const isImage = relativePath !== null && isWorkspaceImagePreviewPath(relativePath);
const file = useProjectFileQuery(environmentId, cwd, relativePath, !isImage);
const [explorerOpen, setExplorerOpen] = useState(initialExplorerOpen);
const [markdownView, setMarkdownView] = useState<{
path: string | null;
Expand DownExpand Up@@ -818,7 +858,15 @@ export default function FilePreviewPanel({
relativePath ? "flex" : "hidden",
)}
>
{relativePath && file.error && file.data === null ? (
{relativePath && isImage && absolutePath ? (
<WorkspaceImagePreview
key={absolutePath}
environmentId={environmentId}
threadRef={threadRef}
absolutePath={absolutePath}
alt={relativePath}
/>
) : relativePath && file.error && file.data === null ? (
<div className="flex min-h-0 flex-1 items-center justify-center px-6 text-center text-xs leading-relaxed text-destructive">
{file.error}
</div>
Expand Down
10 changes: 8 additions & 2 deletions apps/web/src/components/files/projectFilesQueryState.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,17 @@ import type {
} from "@t3tools/contracts";
import * as Cause from "effect/Cause";
import * as Option from "effect/Option";
import { AsyncResult } from "effect/unstable/reactivity";
import { AsyncResult, Atom } from "effect/unstable/reactivity";
import { useCallback } from "react";

import { appAtomRegistry } from "~/rpc/atomRegistry";
import { projectEnvironment } from "~/state/projects";
import { executeAtomQuery } from "@t3tools/client-runtime/state/runtime";

const EMPTY_PROJECT_FILE_PATH = "";
const EMPTY_PROJECT_FILE_QUERY_ATOM = Atom.make(
AsyncResult.initial<ProjectReadFileResult, never>(false),
).pipe(Atom.withLabel("project-file-query:empty"));
function optimisticFileAtom(environmentId: EnvironmentId, cwd: string, relativePath: string) {
return projectEnvironment.optimisticFile({ environmentId, cwd, relativePath });
}
Expand DownExpand Up@@ -137,8 +140,11 @@ export function useProjectFileQuery(
environmentId: EnvironmentId,
cwd: string,
relativePath: string | null,
enabled = true,
): ProjectQueryState<ProjectReadFileResult> {
const atom = getProjectFileQueryAtom(environmentId, cwd, relativePath);
const atom = enabled
? getProjectFileQueryAtom(environmentId, cwd, relativePath)
: EMPTY_PROJECT_FILE_QUERY_ATOM;
const result = useAtomValue(atom);
const refreshAtom = useAtomRefresh(atom);
const refresh = useCallback(() => refreshAtom(), [refreshAtom]);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
24 changes: 22 additions & 2 deletions apps/web/src/assets/assetUrls.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,18 +9,38 @@ import { usePreparedConnection } from "~/state/session";

export { resolveAssetUrl } from "@t3tools/client-runtime/state/assets";

export function useAssetUrl(environmentId: EnvironmentId, resource: AssetResource): string | null {
export type AssetUrlState =
| { readonly _tag: "Loading" }
| { readonly _tag: "Failure" }
| { readonly _tag: "Success"; readonly url: string };

export function useAssetUrlState(
environmentId: EnvironmentId,
resource: AssetResource,
): AssetUrlState {
const preparedConnection = usePreparedConnection(environmentId);
const result = useAtomValue(
assetEnvironment.createUrl({
environmentId,
input: { resource },
}),
);
if (result._tag === "Failure") {
return { _tag: "Failure" };
}
if (preparedConnection._tag === "None" || result._tag !== "Success") {
return { _tag: "Loading" };
}
const url = resolveAssetUrl(preparedConnection.value.httpBaseUrl, result.value.relativeUrl);
return url === null ? { _tag: "Failure" } : { _tag: "Success", url };
}

export function useAssetUrl(environmentId: EnvironmentId, resource: AssetResource): string | null {
const result = useAssetUrlState(environmentId, resource);
if (result._tag !== "Success") {
return null;
}
return resolveAssetUrl(preparedConnection.value.httpBaseUrl, result.value.relativeUrl);
return result.url;
}

export function useAssetUrls(
Expand Down
52 changes: 50 additions & 2 deletions apps/web/src/components/files/FilePreviewPanel.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type {
ResolvedKeybindingsConfig,
ScopedThreadRef,
} from "@t3tools/contracts";
import { isWorkspaceImagePreviewPath } from "@t3tools/shared/filePreview";
import { VirtualizedFile, type SelectedLineRange } from "@pierre/diffs";
import { Editor } from "@pierre/diffs/editor";
import { EditorProvider, File, type FileOptions, Virtualizer } from "@pierre/diffs/react";
Expand All@@ -16,6 +17,7 @@ import * as Schema from "effect/Schema";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";

import { isBrowserPreviewFile, openFileInPreview } from "~/browser/openFileInPreview";
import { useAssetUrlState } from "~/assets/assetUrls";
import ChatMarkdown from "~/components/ChatMarkdown";
import { OpenInPicker } from "~/components/chat/OpenInPicker";
import { useClientSettings } from "~/hooks/useSettings";
Expand DownExpand Up@@ -113,6 +115,43 @@ const FILE_LINK_REVEAL_UNSAFE_CSS = `
`;
type FilePostRender = NonNullable<FileOptions<unknown>["onPostRender"]>;

function WorkspaceImagePreview(props: {
readonly environmentId: EnvironmentId;
readonly threadRef: ScopedThreadRef;
readonly absolutePath: string;
readonly alt: string;
}) {
const assetUrl = useAssetUrlState(props.environmentId, {
_tag: "workspace-file",
threadId: props.threadRef.threadId,
path: props.absolutePath,
});
const [failedUrl, setFailedUrl] = useState<string | null>(null);

if (assetUrl._tag === "Failure" || (assetUrl._tag === "Success" && failedUrl === assetUrl.url)) {
return (
<div className="flex min-h-0 flex-1 items-center justify-center px-6 text-center text-xs leading-relaxed text-destructive">
Unable to load workspace image.
</div>
);
}

return assetUrl._tag === "Success" ? (
<div className="flex min-h-0 flex-1 items-center justify-center overflow-auto p-4">
<img
className="max-h-full max-w-full object-contain"
src={assetUrl.url}
alt={props.alt}
onError={() => setFailedUrl(assetUrl.url)}
Comment thread
Rhiz3K marked this conversation as resolved.
/>
</div>
) : (
<div className="flex min-h-0 flex-1 items-center justify-center text-muted-foreground">
<LoaderCircle className="size-5 animate-spin" />
</div>
Comment thread
cursor[bot] marked this conversation as resolved.
);
}

function clampFileLine(contents: string, requestedLine: number): number {
let lineCount = 1;
for (let index = 0; index < contents.length; index += 1) {
Expand DownExpand Up@@ -630,7 +669,8 @@ export default function FilePreviewPanel({
const openPreview = useAtomCommand(previewEnvironment.open, {
reportFailure: false,
});
const file = useProjectFileQuery(environmentId, cwd, relativePath);
const isImage = relativePath !== null && isWorkspaceImagePreviewPath(relativePath);
const file = useProjectFileQuery(environmentId, cwd, relativePath, !isImage);
const [explorerOpen, setExplorerOpen] = useState(initialExplorerOpen);
const [markdownView, setMarkdownView] = useState<{
path: string | null;
Expand DownExpand Up@@ -818,7 +858,15 @@ export default function FilePreviewPanel({
relativePath ? "flex" : "hidden",
)}
>
{relativePath && file.error && file.data === null ? (
{relativePath && isImage && absolutePath ? (
<WorkspaceImagePreview
key={absolutePath}
environmentId={environmentId}
threadRef={threadRef}
absolutePath={absolutePath}
alt={relativePath}
/>
) : relativePath && file.error && file.data === null ? (
<div className="flex min-h-0 flex-1 items-center justify-center px-6 text-center text-xs leading-relaxed text-destructive">
{file.error}
</div>
Expand Down
10 changes: 8 additions & 2 deletions apps/web/src/components/files/projectFilesQueryState.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,17 @@ import type {
} from "@t3tools/contracts";
import * as Cause from "effect/Cause";
import * as Option from "effect/Option";
import { AsyncResult } from "effect/unstable/reactivity";
import { AsyncResult, Atom } from "effect/unstable/reactivity";
import { useCallback } from "react";

import { appAtomRegistry } from "~/rpc/atomRegistry";
import { projectEnvironment } from "~/state/projects";
import { executeAtomQuery } from "@t3tools/client-runtime/state/runtime";

const EMPTY_PROJECT_FILE_PATH = "";
const EMPTY_PROJECT_FILE_QUERY_ATOM = Atom.make(
AsyncResult.initial<ProjectReadFileResult, never>(false),
).pipe(Atom.withLabel("project-file-query:empty"));
function optimisticFileAtom(environmentId: EnvironmentId, cwd: string, relativePath: string) {
return projectEnvironment.optimisticFile({ environmentId, cwd, relativePath });
}
Expand DownExpand Up@@ -137,8 +140,11 @@ export function useProjectFileQuery(
environmentId: EnvironmentId,
cwd: string,
relativePath: string | null,
enabled = true,
): ProjectQueryState<ProjectReadFileResult> {
const atom = getProjectFileQueryAtom(environmentId, cwd, relativePath);
const atom = enabled
? getProjectFileQueryAtom(environmentId, cwd, relativePath)
: EMPTY_PROJECT_FILE_QUERY_ATOM;
const result = useAtomValue(atom);
const refreshAtom = useAtomRefresh(atom);
const refresh = useCallback(() => refreshAtom(), [refreshAtom]);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
24 changes: 22 additions & 2 deletions apps/web/src/assets/assetUrls.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,18 +9,38 @@ import { usePreparedConnection } from "~/state/session";

export { resolveAssetUrl } from "@t3tools/client-runtime/state/assets";

export function useAssetUrl(environmentId: EnvironmentId, resource: AssetResource): string | null {
export type AssetUrlState =
| { readonly _tag: "Loading" }
| { readonly _tag: "Failure" }
| { readonly _tag: "Success"; readonly url: string };

export function useAssetUrlState(
environmentId: EnvironmentId,
resource: AssetResource,
): AssetUrlState {
const preparedConnection = usePreparedConnection(environmentId);
const result = useAtomValue(
assetEnvironment.createUrl({
environmentId,
input: { resource },
}),
);
if (result._tag === "Failure") {
return { _tag: "Failure" };
}
if (preparedConnection._tag === "None" || result._tag !== "Success") {
return { _tag: "Loading" };
}
const url = resolveAssetUrl(preparedConnection.value.httpBaseUrl, result.value.relativeUrl);
return url === null ? { _tag: "Failure" } : { _tag: "Success", url };
}

export function useAssetUrl(environmentId: EnvironmentId, resource: AssetResource): string | null {
const result = useAssetUrlState(environmentId, resource);
if (result._tag !== "Success") {
return null;
}
return resolveAssetUrl(preparedConnection.value.httpBaseUrl, result.value.relativeUrl);
return result.url;
}

export function useAssetUrls(
Expand Down
52 changes: 50 additions & 2 deletions apps/web/src/components/files/FilePreviewPanel.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type {
ResolvedKeybindingsConfig,
ScopedThreadRef,
} from "@t3tools/contracts";
import { isWorkspaceImagePreviewPath } from "@t3tools/shared/filePreview";
import { VirtualizedFile, type SelectedLineRange } from "@pierre/diffs";
import { Editor } from "@pierre/diffs/editor";
import { EditorProvider, File, type FileOptions, Virtualizer } from "@pierre/diffs/react";
Expand All@@ -16,6 +17,7 @@ import * as Schema from "effect/Schema";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";

import { isBrowserPreviewFile, openFileInPreview } from "~/browser/openFileInPreview";
import { useAssetUrlState } from "~/assets/assetUrls";
import ChatMarkdown from "~/components/ChatMarkdown";
import { OpenInPicker } from "~/components/chat/OpenInPicker";
import { useClientSettings } from "~/hooks/useSettings";
Expand DownExpand Up@@ -113,6 +115,43 @@ const FILE_LINK_REVEAL_UNSAFE_CSS = `
`;
type FilePostRender = NonNullable<FileOptions<unknown>["onPostRender"]>;

function WorkspaceImagePreview(props: {
readonly environmentId: EnvironmentId;
readonly threadRef: ScopedThreadRef;
readonly absolutePath: string;
readonly alt: string;
}) {
const assetUrl = useAssetUrlState(props.environmentId, {
_tag: "workspace-file",
threadId: props.threadRef.threadId,
path: props.absolutePath,
});
const [failedUrl, setFailedUrl] = useState<string | null>(null);

if (assetUrl._tag === "Failure" || (assetUrl._tag === "Success" && failedUrl === assetUrl.url)) {
return (
<div className="flex min-h-0 flex-1 items-center justify-center px-6 text-center text-xs leading-relaxed text-destructive">
Unable to load workspace image.
</div>
);
}

return assetUrl._tag === "Success" ? (
<div className="flex min-h-0 flex-1 items-center justify-center overflow-auto p-4">
<img
className="max-h-full max-w-full object-contain"
src={assetUrl.url}
alt={props.alt}
onError={() => setFailedUrl(assetUrl.url)}
Comment thread
Rhiz3K marked this conversation as resolved.
/>
</div>
) : (
<div className="flex min-h-0 flex-1 items-center justify-center text-muted-foreground">
<LoaderCircle className="size-5 animate-spin" />
</div>
Comment thread
cursor[bot] marked this conversation as resolved.
);
}

function clampFileLine(contents: string, requestedLine: number): number {
let lineCount = 1;
for (let index = 0; index < contents.length; index += 1) {
Expand DownExpand Up@@ -630,7 +669,8 @@ export default function FilePreviewPanel({
const openPreview = useAtomCommand(previewEnvironment.open, {
reportFailure: false,
});
const file = useProjectFileQuery(environmentId, cwd, relativePath);
const isImage = relativePath !== null && isWorkspaceImagePreviewPath(relativePath);
const file = useProjectFileQuery(environmentId, cwd, relativePath, !isImage);
const [explorerOpen, setExplorerOpen] = useState(initialExplorerOpen);
const [markdownView, setMarkdownView] = useState<{
path: string | null;
Expand DownExpand Up@@ -818,7 +858,15 @@ export default function FilePreviewPanel({
relativePath ? "flex" : "hidden",
)}
>
{relativePath && file.error && file.data === null ? (
{relativePath && isImage && absolutePath ? (
<WorkspaceImagePreview
key={absolutePath}
environmentId={environmentId}
threadRef={threadRef}
absolutePath={absolutePath}
alt={relativePath}
/>
) : relativePath && file.error && file.data === null ? (
<div className="flex min-h-0 flex-1 items-center justify-center px-6 text-center text-xs leading-relaxed text-destructive">
{file.error}
</div>
Expand Down
10 changes: 8 additions & 2 deletions apps/web/src/components/files/projectFilesQueryState.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,17 @@ import type {
} from "@t3tools/contracts";
import * as Cause from "effect/Cause";
import * as Option from "effect/Option";
import { AsyncResult } from "effect/unstable/reactivity";
import { AsyncResult, Atom } from "effect/unstable/reactivity";
import { useCallback } from "react";

import { appAtomRegistry } from "~/rpc/atomRegistry";
import { projectEnvironment } from "~/state/projects";
import { executeAtomQuery } from "@t3tools/client-runtime/state/runtime";

const EMPTY_PROJECT_FILE_PATH = "";
const EMPTY_PROJECT_FILE_QUERY_ATOM = Atom.make(
AsyncResult.initial<ProjectReadFileResult, never>(false),
).pipe(Atom.withLabel("project-file-query:empty"));
function optimisticFileAtom(environmentId: EnvironmentId, cwd: string, relativePath: string) {
return projectEnvironment.optimisticFile({ environmentId, cwd, relativePath });
}
Expand DownExpand Up@@ -137,8 +140,11 @@ export function useProjectFileQuery(
environmentId: EnvironmentId,
cwd: string,
relativePath: string | null,
enabled = true,
): ProjectQueryState<ProjectReadFileResult> {
const atom = getProjectFileQueryAtom(environmentId, cwd, relativePath);
const atom = enabled
? getProjectFileQueryAtom(environmentId, cwd, relativePath)
: EMPTY_PROJECT_FILE_QUERY_ATOM;
const result = useAtomValue(atom);
const refreshAtom = useAtomRefresh(atom);
const refresh = useCallback(() => refreshAtom(), [refreshAtom]);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
24 changes: 22 additions & 2 deletions apps/web/src/assets/assetUrls.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,18 +9,38 @@ import { usePreparedConnection } from "~/state/session";

export { resolveAssetUrl } from "@t3tools/client-runtime/state/assets";

export function useAssetUrl(environmentId: EnvironmentId, resource: AssetResource): string | null {
export type AssetUrlState =
| { readonly _tag: "Loading" }
| { readonly _tag: "Failure" }
| { readonly _tag: "Success"; readonly url: string };

export function useAssetUrlState(
environmentId: EnvironmentId,
resource: AssetResource,
): AssetUrlState {
const preparedConnection = usePreparedConnection(environmentId);
const result = useAtomValue(
assetEnvironment.createUrl({
environmentId,
input: { resource },
}),
);
if (result._tag === "Failure") {
return { _tag: "Failure" };
}
if (preparedConnection._tag === "None" || result._tag !== "Success") {
return { _tag: "Loading" };
}
const url = resolveAssetUrl(preparedConnection.value.httpBaseUrl, result.value.relativeUrl);
return url === null ? { _tag: "Failure" } : { _tag: "Success", url };
}

export function useAssetUrl(environmentId: EnvironmentId, resource: AssetResource): string | null {
const result = useAssetUrlState(environmentId, resource);
if (result._tag !== "Success") {
return null;
}
return resolveAssetUrl(preparedConnection.value.httpBaseUrl, result.value.relativeUrl);
return result.url;
}

export function useAssetUrls(
Expand Down
52 changes: 50 additions & 2 deletions apps/web/src/components/files/FilePreviewPanel.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type {
ResolvedKeybindingsConfig,
ScopedThreadRef,
} from "@t3tools/contracts";
import { isWorkspaceImagePreviewPath } from "@t3tools/shared/filePreview";
import { VirtualizedFile, type SelectedLineRange } from "@pierre/diffs";
import { Editor } from "@pierre/diffs/editor";
import { EditorProvider, File, type FileOptions, Virtualizer } from "@pierre/diffs/react";
Expand All@@ -16,6 +17,7 @@ import * as Schema from "effect/Schema";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";

import { isBrowserPreviewFile, openFileInPreview } from "~/browser/openFileInPreview";
import { useAssetUrlState } from "~/assets/assetUrls";
import ChatMarkdown from "~/components/ChatMarkdown";
import { OpenInPicker } from "~/components/chat/OpenInPicker";
import { useClientSettings } from "~/hooks/useSettings";
Expand DownExpand Up@@ -113,6 +115,43 @@ const FILE_LINK_REVEAL_UNSAFE_CSS = `
`;
type FilePostRender = NonNullable<FileOptions<unknown>["onPostRender"]>;

function WorkspaceImagePreview(props: {
readonly environmentId: EnvironmentId;
readonly threadRef: ScopedThreadRef;
readonly absolutePath: string;
readonly alt: string;
}) {
const assetUrl = useAssetUrlState(props.environmentId, {
_tag: "workspace-file",
threadId: props.threadRef.threadId,
path: props.absolutePath,
});
const [failedUrl, setFailedUrl] = useState<string | null>(null);

if (assetUrl._tag === "Failure" || (assetUrl._tag === "Success" && failedUrl === assetUrl.url)) {
return (
<div className="flex min-h-0 flex-1 items-center justify-center px-6 text-center text-xs leading-relaxed text-destructive">
Unable to load workspace image.
</div>
);
}

return assetUrl._tag === "Success" ? (
<div className="flex min-h-0 flex-1 items-center justify-center overflow-auto p-4">
<img
className="max-h-full max-w-full object-contain"
src={assetUrl.url}
alt={props.alt}
onError={() => setFailedUrl(assetUrl.url)}
Comment thread
Rhiz3K marked this conversation as resolved.
/>
</div>
) : (
<div className="flex min-h-0 flex-1 items-center justify-center text-muted-foreground">
<LoaderCircle className="size-5 animate-spin" />
</div>
Comment thread
cursor[bot] marked this conversation as resolved.
);
}

function clampFileLine(contents: string, requestedLine: number): number {
let lineCount = 1;
for (let index = 0; index < contents.length; index += 1) {
Expand DownExpand Up@@ -630,7 +669,8 @@ export default function FilePreviewPanel({
const openPreview = useAtomCommand(previewEnvironment.open, {
reportFailure: false,
});
const file = useProjectFileQuery(environmentId, cwd, relativePath);
const isImage = relativePath !== null && isWorkspaceImagePreviewPath(relativePath);
const file = useProjectFileQuery(environmentId, cwd, relativePath, !isImage);
const [explorerOpen, setExplorerOpen] = useState(initialExplorerOpen);
const [markdownView, setMarkdownView] = useState<{
path: string | null;
Expand DownExpand Up@@ -818,7 +858,15 @@ export default function FilePreviewPanel({
relativePath ? "flex" : "hidden",
)}
>
{relativePath && file.error && file.data === null ? (
{relativePath && isImage && absolutePath ? (
<WorkspaceImagePreview
key={absolutePath}
environmentId={environmentId}
threadRef={threadRef}
absolutePath={absolutePath}
alt={relativePath}
/>
) : relativePath && file.error && file.data === null ? (
<div className="flex min-h-0 flex-1 items-center justify-center px-6 text-center text-xs leading-relaxed text-destructive">
{file.error}
</div>
Expand Down
10 changes: 8 additions & 2 deletions apps/web/src/components/files/projectFilesQueryState.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,17 @@ import type {
} from "@t3tools/contracts";
import * as Cause from "effect/Cause";
import * as Option from "effect/Option";
import { AsyncResult } from "effect/unstable/reactivity";
import { AsyncResult, Atom } from "effect/unstable/reactivity";
import { useCallback } from "react";

import { appAtomRegistry } from "~/rpc/atomRegistry";
import { projectEnvironment } from "~/state/projects";
import { executeAtomQuery } from "@t3tools/client-runtime/state/runtime";

const EMPTY_PROJECT_FILE_PATH = "";
const EMPTY_PROJECT_FILE_QUERY_ATOM = Atom.make(
AsyncResult.initial<ProjectReadFileResult, never>(false),
).pipe(Atom.withLabel("project-file-query:empty"));
function optimisticFileAtom(environmentId: EnvironmentId, cwd: string, relativePath: string) {
return projectEnvironment.optimisticFile({ environmentId, cwd, relativePath });
}
Expand DownExpand Up@@ -137,8 +140,11 @@ export function useProjectFileQuery(
environmentId: EnvironmentId,
cwd: string,
relativePath: string | null,
enabled = true,
): ProjectQueryState<ProjectReadFileResult> {
const atom = getProjectFileQueryAtom(environmentId, cwd, relativePath);
const atom = enabled
? getProjectFileQueryAtom(environmentId, cwd, relativePath)
: EMPTY_PROJECT_FILE_QUERY_ATOM;
const result = useAtomValue(atom);
const refreshAtom = useAtomRefresh(atom);
const refresh = useCallback(() => refreshAtom(), [refreshAtom]);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
24 changes: 22 additions & 2 deletions apps/web/src/assets/assetUrls.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,18 +9,38 @@ import { usePreparedConnection } from "~/state/session";

export { resolveAssetUrl } from "@t3tools/client-runtime/state/assets";

export function useAssetUrl(environmentId: EnvironmentId, resource: AssetResource): string | null {
export type AssetUrlState =
| { readonly _tag: "Loading" }
| { readonly _tag: "Failure" }
| { readonly _tag: "Success"; readonly url: string };

export function useAssetUrlState(
environmentId: EnvironmentId,
resource: AssetResource,
): AssetUrlState {
const preparedConnection = usePreparedConnection(environmentId);
const result = useAtomValue(
assetEnvironment.createUrl({
environmentId,
input: { resource },
}),
);
if (result._tag === "Failure") {
return { _tag: "Failure" };
}
if (preparedConnection._tag === "None" || result._tag !== "Success") {
return { _tag: "Loading" };
}
const url = resolveAssetUrl(preparedConnection.value.httpBaseUrl, result.value.relativeUrl);
return url === null ? { _tag: "Failure" } : { _tag: "Success", url };
}

export function useAssetUrl(environmentId: EnvironmentId, resource: AssetResource): string | null {
const result = useAssetUrlState(environmentId, resource);
if (result._tag !== "Success") {
return null;
}
return resolveAssetUrl(preparedConnection.value.httpBaseUrl, result.value.relativeUrl);
return result.url;
}

export function useAssetUrls(
Expand Down
52 changes: 50 additions & 2 deletions apps/web/src/components/files/FilePreviewPanel.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type {
ResolvedKeybindingsConfig,
ScopedThreadRef,
} from "@t3tools/contracts";
import { isWorkspaceImagePreviewPath } from "@t3tools/shared/filePreview";
import { VirtualizedFile, type SelectedLineRange } from "@pierre/diffs";
import { Editor } from "@pierre/diffs/editor";
import { EditorProvider, File, type FileOptions, Virtualizer } from "@pierre/diffs/react";
Expand All@@ -16,6 +17,7 @@ import * as Schema from "effect/Schema";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";

import { isBrowserPreviewFile, openFileInPreview } from "~/browser/openFileInPreview";
import { useAssetUrlState } from "~/assets/assetUrls";
import ChatMarkdown from "~/components/ChatMarkdown";
import { OpenInPicker } from "~/components/chat/OpenInPicker";
import { useClientSettings } from "~/hooks/useSettings";
Expand DownExpand Up@@ -113,6 +115,43 @@ const FILE_LINK_REVEAL_UNSAFE_CSS = `
`;
type FilePostRender = NonNullable<FileOptions<unknown>["onPostRender"]>;

function WorkspaceImagePreview(props: {
readonly environmentId: EnvironmentId;
readonly threadRef: ScopedThreadRef;
readonly absolutePath: string;
readonly alt: string;
}) {
const assetUrl = useAssetUrlState(props.environmentId, {
_tag: "workspace-file",
threadId: props.threadRef.threadId,
path: props.absolutePath,
});
const [failedUrl, setFailedUrl] = useState<string | null>(null);

if (assetUrl._tag === "Failure" || (assetUrl._tag === "Success" && failedUrl === assetUrl.url)) {
return (
<div className="flex min-h-0 flex-1 items-center justify-center px-6 text-center text-xs leading-relaxed text-destructive">
Unable to load workspace image.
</div>
);
}

return assetUrl._tag === "Success" ? (
<div className="flex min-h-0 flex-1 items-center justify-center overflow-auto p-4">
<img
className="max-h-full max-w-full object-contain"
src={assetUrl.url}
alt={props.alt}
onError={() => setFailedUrl(assetUrl.url)}
Comment thread
Rhiz3K marked this conversation as resolved.
/>
</div>
) : (
<div className="flex min-h-0 flex-1 items-center justify-center text-muted-foreground">
<LoaderCircle className="size-5 animate-spin" />
</div>
Comment thread
cursor[bot] marked this conversation as resolved.
);
}

function clampFileLine(contents: string, requestedLine: number): number {
let lineCount = 1;
for (let index = 0; index < contents.length; index += 1) {
Expand DownExpand Up@@ -630,7 +669,8 @@ export default function FilePreviewPanel({
const openPreview = useAtomCommand(previewEnvironment.open, {
reportFailure: false,
});
const file = useProjectFileQuery(environmentId, cwd, relativePath);
const isImage = relativePath !== null && isWorkspaceImagePreviewPath(relativePath);
const file = useProjectFileQuery(environmentId, cwd, relativePath, !isImage);
const [explorerOpen, setExplorerOpen] = useState(initialExplorerOpen);
const [markdownView, setMarkdownView] = useState<{
path: string | null;
Expand DownExpand Up@@ -818,7 +858,15 @@ export default function FilePreviewPanel({
relativePath ? "flex" : "hidden",
)}
>
{relativePath && file.error && file.data === null ? (
{relativePath && isImage && absolutePath ? (
<WorkspaceImagePreview
key={absolutePath}
environmentId={environmentId}
threadRef={threadRef}
absolutePath={absolutePath}
alt={relativePath}
/>
) : relativePath && file.error && file.data === null ? (
<div className="flex min-h-0 flex-1 items-center justify-center px-6 text-center text-xs leading-relaxed text-destructive">
{file.error}
</div>
Expand Down
10 changes: 8 additions & 2 deletions apps/web/src/components/files/projectFilesQueryState.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,17 @@ import type {
} from "@t3tools/contracts";
import * as Cause from "effect/Cause";
import * as Option from "effect/Option";
import { AsyncResult } from "effect/unstable/reactivity";
import { AsyncResult, Atom } from "effect/unstable/reactivity";
import { useCallback } from "react";

import { appAtomRegistry } from "~/rpc/atomRegistry";
import { projectEnvironment } from "~/state/projects";
import { executeAtomQuery } from "@t3tools/client-runtime/state/runtime";

const EMPTY_PROJECT_FILE_PATH = "";
const EMPTY_PROJECT_FILE_QUERY_ATOM = Atom.make(
AsyncResult.initial<ProjectReadFileResult, never>(false),
).pipe(Atom.withLabel("project-file-query:empty"));
function optimisticFileAtom(environmentId: EnvironmentId, cwd: string, relativePath: string) {
return projectEnvironment.optimisticFile({ environmentId, cwd, relativePath });
}
Expand DownExpand Up@@ -137,8 +140,11 @@ export function useProjectFileQuery(
environmentId: EnvironmentId,
cwd: string,
relativePath: string | null,
enabled = true,
): ProjectQueryState<ProjectReadFileResult> {
const atom = getProjectFileQueryAtom(environmentId, cwd, relativePath);
const atom = enabled
? getProjectFileQueryAtom(environmentId, cwd, relativePath)
: EMPTY_PROJECT_FILE_QUERY_ATOM;
const result = useAtomValue(atom);
const refreshAtom = useAtomRefresh(atom);
const refresh = useCallback(() => refreshAtom(), [refreshAtom]);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
24 changes: 22 additions & 2 deletions apps/web/src/assets/assetUrls.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,18 +9,38 @@ import { usePreparedConnection } from "~/state/session";

export { resolveAssetUrl } from "@t3tools/client-runtime/state/assets";

export function useAssetUrl(environmentId: EnvironmentId, resource: AssetResource): string | null {
export type AssetUrlState =
| { readonly _tag: "Loading" }
| { readonly _tag: "Failure" }
| { readonly _tag: "Success"; readonly url: string };

export function useAssetUrlState(
environmentId: EnvironmentId,
resource: AssetResource,
): AssetUrlState {
const preparedConnection = usePreparedConnection(environmentId);
const result = useAtomValue(
assetEnvironment.createUrl({
environmentId,
input: { resource },
}),
);
if (result._tag === "Failure") {
return { _tag: "Failure" };
}
if (preparedConnection._tag === "None" || result._tag !== "Success") {
return { _tag: "Loading" };
}
const url = resolveAssetUrl(preparedConnection.value.httpBaseUrl, result.value.relativeUrl);
return url === null ? { _tag: "Failure" } : { _tag: "Success", url };
}

export function useAssetUrl(environmentId: EnvironmentId, resource: AssetResource): string | null {
const result = useAssetUrlState(environmentId, resource);
if (result._tag !== "Success") {
return null;
}
return resolveAssetUrl(preparedConnection.value.httpBaseUrl, result.value.relativeUrl);
return result.url;
}

export function useAssetUrls(
Expand Down
52 changes: 50 additions & 2 deletions apps/web/src/components/files/FilePreviewPanel.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type {
ResolvedKeybindingsConfig,
ScopedThreadRef,
} from "@t3tools/contracts";
import { isWorkspaceImagePreviewPath } from "@t3tools/shared/filePreview";
import { VirtualizedFile, type SelectedLineRange } from "@pierre/diffs";
import { Editor } from "@pierre/diffs/editor";
import { EditorProvider, File, type FileOptions, Virtualizer } from "@pierre/diffs/react";
Expand All@@ -16,6 +17,7 @@ import * as Schema from "effect/Schema";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";

import { isBrowserPreviewFile, openFileInPreview } from "~/browser/openFileInPreview";
import { useAssetUrlState } from "~/assets/assetUrls";
import ChatMarkdown from "~/components/ChatMarkdown";
import { OpenInPicker } from "~/components/chat/OpenInPicker";
import { useClientSettings } from "~/hooks/useSettings";
Expand DownExpand Up@@ -113,6 +115,43 @@ const FILE_LINK_REVEAL_UNSAFE_CSS = `
`;
type FilePostRender = NonNullable<FileOptions<unknown>["onPostRender"]>;

function WorkspaceImagePreview(props: {
readonly environmentId: EnvironmentId;
readonly threadRef: ScopedThreadRef;
readonly absolutePath: string;
readonly alt: string;
}) {
const assetUrl = useAssetUrlState(props.environmentId, {
_tag: "workspace-file",
threadId: props.threadRef.threadId,
path: props.absolutePath,
});
const [failedUrl, setFailedUrl] = useState<string | null>(null);

if (assetUrl._tag === "Failure" || (assetUrl._tag === "Success" && failedUrl === assetUrl.url)) {
return (
<div className="flex min-h-0 flex-1 items-center justify-center px-6 text-center text-xs leading-relaxed text-destructive">
Unable to load workspace image.
</div>
);
}

return assetUrl._tag === "Success" ? (
<div className="flex min-h-0 flex-1 items-center justify-center overflow-auto p-4">
<img
className="max-h-full max-w-full object-contain"
src={assetUrl.url}
alt={props.alt}
onError={() => setFailedUrl(assetUrl.url)}
Comment thread
Rhiz3K marked this conversation as resolved.
/>
</div>
) : (
<div className="flex min-h-0 flex-1 items-center justify-center text-muted-foreground">
<LoaderCircle className="size-5 animate-spin" />
</div>
Comment thread
cursor[bot] marked this conversation as resolved.
);
}

function clampFileLine(contents: string, requestedLine: number): number {
let lineCount = 1;
for (let index = 0; index < contents.length; index += 1) {
Expand DownExpand Up@@ -630,7 +669,8 @@ export default function FilePreviewPanel({
const openPreview = useAtomCommand(previewEnvironment.open, {
reportFailure: false,
});
const file = useProjectFileQuery(environmentId, cwd, relativePath);
const isImage = relativePath !== null && isWorkspaceImagePreviewPath(relativePath);
const file = useProjectFileQuery(environmentId, cwd, relativePath, !isImage);
const [explorerOpen, setExplorerOpen] = useState(initialExplorerOpen);
const [markdownView, setMarkdownView] = useState<{
path: string | null;
Expand DownExpand Up@@ -818,7 +858,15 @@ export default function FilePreviewPanel({
relativePath ? "flex" : "hidden",
)}
>
{relativePath && file.error && file.data === null ? (
{relativePath && isImage && absolutePath ? (
<WorkspaceImagePreview
key={absolutePath}
environmentId={environmentId}
threadRef={threadRef}
absolutePath={absolutePath}
alt={relativePath}
/>
) : relativePath && file.error && file.data === null ? (
<div className="flex min-h-0 flex-1 items-center justify-center px-6 text-center text-xs leading-relaxed text-destructive">
{file.error}
</div>
Expand Down
10 changes: 8 additions & 2 deletions apps/web/src/components/files/projectFilesQueryState.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,17 @@ import type {
} from "@t3tools/contracts";
import * as Cause from "effect/Cause";
import * as Option from "effect/Option";
import { AsyncResult } from "effect/unstable/reactivity";
import { AsyncResult, Atom } from "effect/unstable/reactivity";
import { useCallback } from "react";

import { appAtomRegistry } from "~/rpc/atomRegistry";
import { projectEnvironment } from "~/state/projects";
import { executeAtomQuery } from "@t3tools/client-runtime/state/runtime";

const EMPTY_PROJECT_FILE_PATH = "";
const EMPTY_PROJECT_FILE_QUERY_ATOM = Atom.make(
AsyncResult.initial<ProjectReadFileResult, never>(false),
).pipe(Atom.withLabel("project-file-query:empty"));
function optimisticFileAtom(environmentId: EnvironmentId, cwd: string, relativePath: string) {
return projectEnvironment.optimisticFile({ environmentId, cwd, relativePath });
}
Expand DownExpand Up@@ -137,8 +140,11 @@ export function useProjectFileQuery(
environmentId: EnvironmentId,
cwd: string,
relativePath: string | null,
enabled = true,
): ProjectQueryState<ProjectReadFileResult> {
const atom = getProjectFileQueryAtom(environmentId, cwd, relativePath);
const atom = enabled
? getProjectFileQueryAtom(environmentId, cwd, relativePath)
: EMPTY_PROJECT_FILE_QUERY_ATOM;
const result = useAtomValue(atom);
const refreshAtom = useAtomRefresh(atom);
const refresh = useCallback(() => refreshAtom(), [refreshAtom]);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
24 changes: 22 additions & 2 deletions apps/web/src/assets/assetUrls.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,18 +9,38 @@ import { usePreparedConnection } from "~/state/session";

export { resolveAssetUrl } from "@t3tools/client-runtime/state/assets";

export function useAssetUrl(environmentId: EnvironmentId, resource: AssetResource): string | null {
export type AssetUrlState =
| { readonly _tag: "Loading" }
| { readonly _tag: "Failure" }
| { readonly _tag: "Success"; readonly url: string };

export function useAssetUrlState(
environmentId: EnvironmentId,
resource: AssetResource,
): AssetUrlState {
const preparedConnection = usePreparedConnection(environmentId);
const result = useAtomValue(
assetEnvironment.createUrl({
environmentId,
input: { resource },
}),
);
if (result._tag === "Failure") {
return { _tag: "Failure" };
}
if (preparedConnection._tag === "None" || result._tag !== "Success") {
return { _tag: "Loading" };
}
const url = resolveAssetUrl(preparedConnection.value.httpBaseUrl, result.value.relativeUrl);
return url === null ? { _tag: "Failure" } : { _tag: "Success", url };
}

export function useAssetUrl(environmentId: EnvironmentId, resource: AssetResource): string | null {
const result = useAssetUrlState(environmentId, resource);
if (result._tag !== "Success") {
return null;
}
return resolveAssetUrl(preparedConnection.value.httpBaseUrl, result.value.relativeUrl);
return result.url;
}

export function useAssetUrls(
Expand Down
52 changes: 50 additions & 2 deletions apps/web/src/components/files/FilePreviewPanel.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type {
ResolvedKeybindingsConfig,
ScopedThreadRef,
} from "@t3tools/contracts";
import { isWorkspaceImagePreviewPath } from "@t3tools/shared/filePreview";
import { VirtualizedFile, type SelectedLineRange } from "@pierre/diffs";
import { Editor } from "@pierre/diffs/editor";
import { EditorProvider, File, type FileOptions, Virtualizer } from "@pierre/diffs/react";
Expand All@@ -16,6 +17,7 @@ import * as Schema from "effect/Schema";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";

import { isBrowserPreviewFile, openFileInPreview } from "~/browser/openFileInPreview";
import { useAssetUrlState } from "~/assets/assetUrls";
import ChatMarkdown from "~/components/ChatMarkdown";
import { OpenInPicker } from "~/components/chat/OpenInPicker";
import { useClientSettings } from "~/hooks/useSettings";
Expand DownExpand Up@@ -113,6 +115,43 @@ const FILE_LINK_REVEAL_UNSAFE_CSS = `
`;
type FilePostRender = NonNullable<FileOptions<unknown>["onPostRender"]>;

function WorkspaceImagePreview(props: {
readonly environmentId: EnvironmentId;
readonly threadRef: ScopedThreadRef;
readonly absolutePath: string;
readonly alt: string;
}) {
const assetUrl = useAssetUrlState(props.environmentId, {
_tag: "workspace-file",
threadId: props.threadRef.threadId,
path: props.absolutePath,
});
const [failedUrl, setFailedUrl] = useState<string | null>(null);

if (assetUrl._tag === "Failure" || (assetUrl._tag === "Success" && failedUrl === assetUrl.url)) {
return (
<div className="flex min-h-0 flex-1 items-center justify-center px-6 text-center text-xs leading-relaxed text-destructive">
Unable to load workspace image.
</div>
);
}

return assetUrl._tag === "Success" ? (
<div className="flex min-h-0 flex-1 items-center justify-center overflow-auto p-4">
<img
className="max-h-full max-w-full object-contain"
src={assetUrl.url}
alt={props.alt}
onError={() => setFailedUrl(assetUrl.url)}
Comment thread
Rhiz3K marked this conversation as resolved.
/>
</div>
) : (
<div className="flex min-h-0 flex-1 items-center justify-center text-muted-foreground">
<LoaderCircle className="size-5 animate-spin" />
</div>
Comment thread
cursor[bot] marked this conversation as resolved.
);
}

function clampFileLine(contents: string, requestedLine: number): number {
let lineCount = 1;
for (let index = 0; index < contents.length; index += 1) {
Expand DownExpand Up@@ -630,7 +669,8 @@ export default function FilePreviewPanel({
const openPreview = useAtomCommand(previewEnvironment.open, {
reportFailure: false,
});
const file = useProjectFileQuery(environmentId, cwd, relativePath);
const isImage = relativePath !== null && isWorkspaceImagePreviewPath(relativePath);
const file = useProjectFileQuery(environmentId, cwd, relativePath, !isImage);
const [explorerOpen, setExplorerOpen] = useState(initialExplorerOpen);
const [markdownView, setMarkdownView] = useState<{
path: string | null;
Expand DownExpand Up@@ -818,7 +858,15 @@ export default function FilePreviewPanel({
relativePath ? "flex" : "hidden",
)}
>
{relativePath && file.error && file.data === null ? (
{relativePath && isImage && absolutePath ? (
<WorkspaceImagePreview
key={absolutePath}
environmentId={environmentId}
threadRef={threadRef}
absolutePath={absolutePath}
alt={relativePath}
/>
) : relativePath && file.error && file.data === null ? (
<div className="flex min-h-0 flex-1 items-center justify-center px-6 text-center text-xs leading-relaxed text-destructive">
{file.error}
</div>
Expand Down
10 changes: 8 additions & 2 deletions apps/web/src/components/files/projectFilesQueryState.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,17 @@ import type {
} from "@t3tools/contracts";
import * as Cause from "effect/Cause";
import * as Option from "effect/Option";
import { AsyncResult } from "effect/unstable/reactivity";
import { AsyncResult, Atom } from "effect/unstable/reactivity";
import { useCallback } from "react";

import { appAtomRegistry } from "~/rpc/atomRegistry";
import { projectEnvironment } from "~/state/projects";
import { executeAtomQuery } from "@t3tools/client-runtime/state/runtime";

const EMPTY_PROJECT_FILE_PATH = "";
const EMPTY_PROJECT_FILE_QUERY_ATOM = Atom.make(
AsyncResult.initial<ProjectReadFileResult, never>(false),
).pipe(Atom.withLabel("project-file-query:empty"));
function optimisticFileAtom(environmentId: EnvironmentId, cwd: string, relativePath: string) {
return projectEnvironment.optimisticFile({ environmentId, cwd, relativePath });
}
Expand DownExpand Up@@ -137,8 +140,11 @@ export function useProjectFileQuery(
environmentId: EnvironmentId,
cwd: string,
relativePath: string | null,
enabled = true,
): ProjectQueryState<ProjectReadFileResult> {
const atom = getProjectFileQueryAtom(environmentId, cwd, relativePath);
const atom = enabled
? getProjectFileQueryAtom(environmentId, cwd, relativePath)
: EMPTY_PROJECT_FILE_QUERY_ATOM;
const result = useAtomValue(atom);
const refreshAtom = useAtomRefresh(atom);
const refresh = useCallback(() => refreshAtom(), [refreshAtom]);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
24 changes: 22 additions & 2 deletions apps/web/src/assets/assetUrls.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,18 +9,38 @@ import { usePreparedConnection } from "~/state/session";

export { resolveAssetUrl } from "@t3tools/client-runtime/state/assets";

export function useAssetUrl(environmentId: EnvironmentId, resource: AssetResource): string | null {
export type AssetUrlState =
| { readonly _tag: "Loading" }
| { readonly _tag: "Failure" }
| { readonly _tag: "Success"; readonly url: string };

export function useAssetUrlState(
environmentId: EnvironmentId,
resource: AssetResource,
): AssetUrlState {
const preparedConnection = usePreparedConnection(environmentId);
const result = useAtomValue(
assetEnvironment.createUrl({
environmentId,
input: { resource },
}),
);
if (result._tag === "Failure") {
return { _tag: "Failure" };
}
if (preparedConnection._tag === "None" || result._tag !== "Success") {
return { _tag: "Loading" };
}
const url = resolveAssetUrl(preparedConnection.value.httpBaseUrl, result.value.relativeUrl);
return url === null ? { _tag: "Failure" } : { _tag: "Success", url };
}

export function useAssetUrl(environmentId: EnvironmentId, resource: AssetResource): string | null {
const result = useAssetUrlState(environmentId, resource);
if (result._tag !== "Success") {
return null;
}
return resolveAssetUrl(preparedConnection.value.httpBaseUrl, result.value.relativeUrl);
return result.url;
}

export function useAssetUrls(
Expand Down
52 changes: 50 additions & 2 deletions apps/web/src/components/files/FilePreviewPanel.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ import type {
ResolvedKeybindingsConfig,
ScopedThreadRef,
} from "@t3tools/contracts";
import { isWorkspaceImagePreviewPath } from "@t3tools/shared/filePreview";
import { VirtualizedFile, type SelectedLineRange } from "@pierre/diffs";
import { Editor } from "@pierre/diffs/editor";
import { EditorProvider, File, type FileOptions, Virtualizer } from "@pierre/diffs/react";
Expand All@@ -16,6 +17,7 @@ import * as Schema from "effect/Schema";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";

import { isBrowserPreviewFile, openFileInPreview } from "~/browser/openFileInPreview";
import { useAssetUrlState } from "~/assets/assetUrls";
import ChatMarkdown from "~/components/ChatMarkdown";
import { OpenInPicker } from "~/components/chat/OpenInPicker";
import { useClientSettings } from "~/hooks/useSettings";
Expand DownExpand Up@@ -113,6 +115,43 @@ const FILE_LINK_REVEAL_UNSAFE_CSS = `
`;
type FilePostRender = NonNullable<FileOptions<unknown>["onPostRender"]>;

function WorkspaceImagePreview(props: {
readonly environmentId: EnvironmentId;
readonly threadRef: ScopedThreadRef;
readonly absolutePath: string;
readonly alt: string;
}) {
const assetUrl = useAssetUrlState(props.environmentId, {
_tag: "workspace-file",
threadId: props.threadRef.threadId,
path: props.absolutePath,
});
const [failedUrl, setFailedUrl] = useState<string | null>(null);

if (assetUrl._tag === "Failure" || (assetUrl._tag === "Success" && failedUrl === assetUrl.url)) {
return (
<div className="flex min-h-0 flex-1 items-center justify-center px-6 text-center text-xs leading-relaxed text-destructive">
Unable to load workspace image.
</div>
);
}

return assetUrl._tag === "Success" ? (
<div className="flex min-h-0 flex-1 items-center justify-center overflow-auto p-4">
<img
className="max-h-full max-w-full object-contain"
src={assetUrl.url}
alt={props.alt}
onError={() => setFailedUrl(assetUrl.url)}
Comment thread
Rhiz3K marked this conversation as resolved.
/>
</div>
) : (
<div className="flex min-h-0 flex-1 items-center justify-center text-muted-foreground">
<LoaderCircle className="size-5 animate-spin" />
</div>
Comment thread
cursor[bot] marked this conversation as resolved.
);
}

function clampFileLine(contents: string, requestedLine: number): number {
let lineCount = 1;
for (let index = 0; index < contents.length; index += 1) {
Expand DownExpand Up@@ -630,7 +669,8 @@ export default function FilePreviewPanel({
const openPreview = useAtomCommand(previewEnvironment.open, {
reportFailure: false,
});
const file = useProjectFileQuery(environmentId, cwd, relativePath);
const isImage = relativePath !== null && isWorkspaceImagePreviewPath(relativePath);
const file = useProjectFileQuery(environmentId, cwd, relativePath, !isImage);
const [explorerOpen, setExplorerOpen] = useState(initialExplorerOpen);
const [markdownView, setMarkdownView] = useState<{
path: string | null;
Expand DownExpand Up@@ -818,7 +858,15 @@ export default function FilePreviewPanel({
relativePath ? "flex" : "hidden",
)}
>
{relativePath && file.error && file.data === null ? (
{relativePath && isImage && absolutePath ? (
<WorkspaceImagePreview
key={absolutePath}
environmentId={environmentId}
threadRef={threadRef}
absolutePath={absolutePath}
alt={relativePath}
/>
) : relativePath && file.error && file.data === null ? (
<div className="flex min-h-0 flex-1 items-center justify-center px-6 text-center text-xs leading-relaxed text-destructive">
{file.error}
</div>
Expand Down
10 changes: 8 additions & 2 deletions apps/web/src/components/files/projectFilesQueryState.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,17 @@ import type {
} from "@t3tools/contracts";
import * as Cause from "effect/Cause";
import * as Option from "effect/Option";
import { AsyncResult } from "effect/unstable/reactivity";
import { AsyncResult, Atom } from "effect/unstable/reactivity";
import { useCallback } from "react";

import { appAtomRegistry } from "~/rpc/atomRegistry";
import { projectEnvironment } from "~/state/projects";
import { executeAtomQuery } from "@t3tools/client-runtime/state/runtime";

const EMPTY_PROJECT_FILE_PATH = "";
const EMPTY_PROJECT_FILE_QUERY_ATOM = Atom.make(
AsyncResult.initial<ProjectReadFileResult, never>(false),
).pipe(Atom.withLabel("project-file-query:empty"));
function optimisticFileAtom(environmentId: EnvironmentId, cwd: string, relativePath: string) {
return projectEnvironment.optimisticFile({ environmentId, cwd, relativePath });
}
Expand DownExpand Up@@ -137,8 +140,11 @@ export function useProjectFileQuery(
environmentId: EnvironmentId,
cwd: string,
relativePath: string | null,
enabled = true,
): ProjectQueryState<ProjectReadFileResult> {
const atom = getProjectFileQueryAtom(environmentId, cwd, relativePath);
const atom = enabled
? getProjectFileQueryAtom(environmentId, cwd, relativePath)
: EMPTY_PROJECT_FILE_QUERY_ATOM;
const result = useAtomValue(atom);
const refreshAtom = useAtomRefresh(atom);
const refresh = useCallback(() => refreshAtom(), [refreshAtom]);
Expand Down
Loading