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
2 changes: 1 addition & 1 deletion apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1053,7 +1053,7 @@ export function NewTaskDraftScreen(props: {
multiline
scrollEnabled
value={flow.prompt}
skills={flow.selectedProviderStatus?.skills ?? []}
skills={composerMenu.skills}
selection={composerMenu.selection}
onChangeText={flow.setPrompt}
onSelectionChange={composerMenu.onSelectionChange}
Expand Down
2 changes: 1 addition & 1 deletion apps/mobile/src/features/threads/ThreadComposer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
multiline
value={props.draftMessage}
readOnly={voiceInput.freezesEditor}
skills={selectedProviderStatus?.skills ?? []}
skills={composerMenu.skills}
selection={composerMenu.selection}
onChangeText={props.onChangeDraftMessage}
onSelectionChange={composerMenu.onSelectionChange}
Expand Down
17 changes: 10 additions & 7 deletions apps/mobile/src/features/threads/ThreadDetailScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
} from "@t3tools/client-runtime/codex-artifact-templates";
import type { EnvironmentThreadStatus } from "@t3tools/client-runtime/state/threads";
import { useKeyboardChatComposerInset, useKeyboardScrollToEnd } from "@legendapp/list/keyboard";
import { resolveProviderSkillsForCwd } from "@t3tools/client-runtime/providerSkills";
import type { LegendListRef } from "@legendapp/list/react-native";
import { HeaderHeightContext } from "@react-navigation/elements";
import type {
Expand Down Expand Up @@ -510,12 +511,14 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
const contentMaxWidth = isSplitLayout ? CHAT_CONTENT_MAX_WIDTH : undefined;
const selectedInstanceId = props.selectedThread.modelSelection.instanceId;
useStreamingHaptics(props.selectedThread.id, props.selectedThreadFeed);
const selectedProviderSkills = useMemo(
() =>
props.serverConfig?.providers.find((provider) => provider.instanceId === selectedInstanceId)
?.skills ?? [],
[props.serverConfig, selectedInstanceId],
);
const selectedProviderSkills = useMemo(() => {
const provider = props.serverConfig?.providers.find(
(candidate) => candidate.instanceId === selectedInstanceId,
);
return provider
? resolveProviderSkillsForCwd(provider, props.threadCwd ?? props.projectWorkspaceRoot)
: [];
}, [props.projectWorkspaceRoot, props.serverConfig, props.threadCwd, selectedInstanceId]);

useLayoutEffect(() => {
selectedThreadKeyRef.current = selectedThreadKey;
Expand Down Expand Up @@ -809,7 +812,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
serverConfig={props.serverConfig}
queueCount={props.selectedThreadQueueCount}
environmentId={props.environmentId}
projectCwd={props.projectWorkspaceRoot}
projectCwd={props.threadCwd ?? props.projectWorkspaceRoot}
bottomInset={composerBottomInset}
onChangeDraftMessage={props.onChangeDraftMessage}
onPickDraftMedia={props.onPickDraftMedia}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ import { describe, expect, it, vi } from "vite-plus/test";
vi.mock("../../state/queries", () => ({
useComposerPathSearch: () => ({ entries: [], isPending: false }),
}));
vi.mock("../../state/server", () => ({
serverEnvironment: { refreshProviders: Symbol("refreshProviders") },
}));
vi.mock("../../state/use-atom-command", () => ({
useAtomCommand: () => vi.fn(),
}));

import { composerSelectionAtEnd } from "./use-composer-command-menu";

Expand Down
91 changes: 84 additions & 7 deletions apps/mobile/src/features/threads/use-composer-command-menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,19 @@ import {
dedupeProviderSkillsByName,
getProviderSkillsForSlashMenu,
isProviderSkillUserInvocable,
resolveProviderSkillsForCwd,
} from "@t3tools/client-runtime/providerSkills";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";

import type { ComposerEditorSelection } from "../../components/ComposerEditor";
import { serverEnvironment } from "../../state/server";
import { useAtomCommand } from "../../state/use-atom-command";
import { useComposerPathSearch } from "../../state/queries";
import type { ComposerCommandItem } from "./ComposerCommandPopover";
import { matchesSlashSkillQuery } from "./composerSlashSkillSearch";

const WORKSPACE_SNAPSHOT_RETRY_COOLDOWN_MS = 10_000;

export function composerSelectionAtEnd(draftMessage: string): ComposerEditorSelection {
return { start: draftMessage.length, end: draftMessage.length };
}
Expand Down Expand Up @@ -69,6 +74,72 @@ export function useComposerCommandMenu({
setSelection(composerSelectionAtEnd(draftMessage));
}, [draftMessage, ownerKey]);

const skills = useMemo(
() =>
selectedProviderStatus ? resolveProviderSkillsForCwd(selectedProviderStatus, projectCwd) : [],
[projectCwd, selectedProviderStatus],
);
const slashCommands = selectedProviderStatus?.slashCommands ?? [];
const refreshProviders = useAtomCommand(serverEnvironment.refreshProviders, {
reportFailure: false,
});
const selectedProviderInstanceId = selectedProviderStatus?.instanceId;
const hasWorkspaceSnapshot = Boolean(
projectCwd &&
selectedProviderStatus?.workspaceSnapshots?.some((snapshot) => snapshot.cwd === projectCwd),
);
const workspaceRefreshKeyRef = useRef<string | null>(null);
const workspaceRefreshRetryRef = useRef<{ key: string; notBefore: number } | null>(null);
const hadWorkspaceSnapshotRef = useRef(false);
useEffect(() => {
if (hadWorkspaceSnapshotRef.current && !hasWorkspaceSnapshot) {
workspaceRefreshKeyRef.current = null;
workspaceRefreshRetryRef.current = null;
}
hadWorkspaceSnapshotRef.current = hasWorkspaceSnapshot;
}, [hasWorkspaceSnapshot]);
useEffect(() => {
if (!environmentId || !projectCwd || !selectedProviderInstanceId) return;
const key = `${environmentId}:${selectedProviderInstanceId}:${projectCwd}`;
if (workspaceRefreshKeyRef.current === key) return;
if (hasWorkspaceSnapshot) {
workspaceRefreshKeyRef.current = key;
workspaceRefreshRetryRef.current = null;
return;
}
const retry = workspaceRefreshRetryRef.current;
if (retry?.key === key && Date.now() < retry.notBefore) return;
workspaceRefreshKeyRef.current = key;
const retryLater = () => {
if (workspaceRefreshKeyRef.current !== key) return;
workspaceRefreshKeyRef.current = null;
workspaceRefreshRetryRef.current = {
key,
notBefore: Date.now() + WORKSPACE_SNAPSHOT_RETRY_COOLDOWN_MS,
};
};
void refreshProviders({
environmentId,
input: { instanceId: selectedProviderInstanceId, cwd: projectCwd },
}).then((result) => {
const refreshed =
result._tag === "Success" &&
result.value.providers
.find((provider) => provider.instanceId === selectedProviderInstanceId)
?.workspaceSnapshots?.some((snapshot) => snapshot.cwd === projectCwd);
if (!refreshed && workspaceRefreshKeyRef.current === key) {
retryLater();
}
}, retryLater);
}, [
draftMessage,
environmentId,
hasWorkspaceSnapshot,
projectCwd,
refreshProviders,
selectedProviderInstanceId,
]);
Comment thread
maria-rcks marked this conversation as resolved.

const trigger = useMemo(() => {
if (!enabled || selection.start !== selection.end) {
return null;
Expand Down Expand Up @@ -120,8 +191,7 @@ export function useComposerCommandMenu({
// locally and skills insert a `$` mention the server dispatches from
// any position, so only provider commands are position-gated.
const providerCommands: ComposerCommandItem[] = [];
const expandableCommands =
trigger.rangeStart === 0 ? (selectedProviderStatus?.slashCommands ?? []) : [];
const expandableCommands = trigger.rangeStart === 0 ? slashCommands : [];
for (const command of expandableCommands) {
if (!command.name.toLowerCase().includes(q)) continue;
// Codex feedback uploads an existing thread's session and logs.
Expand All @@ -141,7 +211,7 @@ export function useComposerCommandMenu({
});
}

const skillItems = getProviderSkillsForSlashMenu(selectedProviderStatus?.skills ?? [], true)
const skillItems = getProviderSkillsForSlashMenu(skills, true)
.filter((skill) => matchesSlashSkillQuery(skill, q))
.map((skill) => ({
id: `skill:${skill.name}`,
Expand All @@ -155,9 +225,7 @@ export function useComposerCommandMenu({
}

if (trigger.kind === "skill") {
const enabledSkills = dedupeProviderSkillsByName(
(selectedProviderStatus?.skills ?? []).filter(isProviderSkillUserInvocable),
);
const enabledSkills = dedupeProviderSkillsByName(skills.filter(isProviderSkillUserInvocable));
const normalizedQuery = normalizeSearchQuery(trigger.query, {
trimLeadingPattern: /^\$+/,
});
Expand Down Expand Up @@ -254,7 +322,15 @@ export function useComposerCommandMenu({
}

return [];
}, [hasThread, onUpdateInteractionMode, pathSearch.entries, selectedProviderStatus, trigger]);
}, [
hasThread,
onUpdateInteractionMode,
pathSearch.entries,
selectedProviderStatus,
skills,
slashCommands,
trigger,
]);

const onSelect = useCallback(
(item: ComposerCommandItem) => {
Expand Down Expand Up @@ -299,6 +375,7 @@ export function useComposerCommandMenu({
onSelectionChange,
trigger,
items,
skills,
isLoading: pathSearch.isPending,
onSelect,
};
Expand Down
20 changes: 20 additions & 0 deletions apps/server/src/provider/Drivers/CursorDriver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ import {
makeProviderSnapshotSettingsSource,
type ProviderSnapshotSettings,
} from "../providerUpdateSettings.ts";
import { probeCursorSkills } from "./CursorSkills.ts";
const decodeCursorSettings = Schema.decodeSync(CursorSettings);

const DRIVER_KIND = ProviderDriverKind.make("cursor");
Expand Down Expand Up @@ -166,6 +167,25 @@ export const CursorDriver: ProviderDriver<CursorSettings, CursorDriverEnv> = {
accentColor,
enabled,
snapshot,
snapshotForCwd: (cwd) =>
!effectiveConfig.enabled
? snapshot.getSnapshot
: Effect.all([
snapshot.getSnapshot,
probeCursorSkills(cwd, processEnv).pipe(
Effect.provideService(FileSystem.FileSystem, fileSystem),
Effect.provideService(Path.Path, path),
Effect.mapError(
(cause) =>
new ProviderDriverError({
driver: DRIVER_KIND,
instanceId,
detail: `Failed to discover Cursor skills for '${cwd}'`,
cause,
}),
),
),
]).pipe(Effect.map(([machineSnapshot, skills]) => ({ ...machineSnapshot, skills }))),
adapter,
textGeneration,
} satisfies ProviderInstance;
Expand Down
Loading
Loading