Skip to content
Closed
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
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
} from "../../state/use-composer-drafts";
import { USAGE_LIMITS_COMMAND } from "@t3tools/shared/usageLimits";
import {
composerTriggerIsOnlyText,
detectComposerTrigger,
replaceTextRange,
serializeComposerFileLink,
Expand Down Expand Up @@ -534,7 +535,8 @@ export function useComposerCommandMenu({
if (
item.type === "provider-slash-command" &&
item.command.argumentMode === "none" &&
onProviderCommand
onProviderCommand &&
composerTriggerIsOnlyText(draftMessage, trigger.rangeStart, trigger.rangeEnd)
) {
const cleared = replaceTextRange(draftMessage, trigger.rangeStart, trigger.rangeEnd, "");
setSelection({ start: cleared.cursor, end: cleared.cursor });
Expand Down
11 changes: 9 additions & 2 deletions apps/web/src/components/chat/ChatComposer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ import {
pastedTextDisposition,
wouldTextPasteExceedLimit,
} from "@t3tools/client-runtime/text-paste";
import { serializeComposerFileLink } from "@t3tools/shared/composerTrigger";
import {
composerTriggerIsOnlyText,
serializeComposerFileLink,
} from "@t3tools/shared/composerTrigger";
import { folderDropTarget, resolveDroppedFolderPath } from "./folderDrop";
import { createModelSelection, normalizeModelSlug } from "@t3tools/shared/model";
import { USAGE_LIMITS_COMMAND } from "@t3tools/shared/usageLimits";
Expand Down Expand Up @@ -3640,7 +3643,11 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
}
return;
}
if (item.command.argumentMode === "none" && onProviderCommand) {
if (
item.command.argumentMode === "none" &&
onProviderCommand &&
composerTriggerIsOnlyText(snapshot.value, trigger.rangeStart, trigger.rangeEnd)
) {
const applied = applyPromptReplacement(trigger.rangeStart, trigger.rangeEnd, "", {
expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd),
});
Expand Down
18 changes: 17 additions & 1 deletion packages/shared/src/composerTrigger.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import { describe, expect, it } from "vite-plus/test";

import { detectComposerTrigger, serializeComposerFileLink } from "./composerTrigger.ts";
import {
composerTriggerIsOnlyText,
detectComposerTrigger,
serializeComposerFileLink,
} from "./composerTrigger.ts";

describe("detectComposerTrigger", () => {
it.each(["$", "€", "£", "¥", "₹", "₩", "₿", "𑿝"])(
Expand All @@ -17,6 +21,18 @@ describe("detectComposerTrigger", () => {
);
});

describe("composerTriggerIsOnlyText", () => {
it("accepts a standalone slash-command trigger", () => {
expect(composerTriggerIsOnlyText("/com", 0, 4)).toBe(true);
expect(composerTriggerIsOnlyText(" /com ", 2, 6)).toBe(true);
});

it("rejects a trigger when other draft text would remain", () => {
expect(composerTriggerIsOnlyText("/com keep this draft", 0, 4)).toBe(false);
expect(composerTriggerIsOnlyText("keep /com", 5, 9)).toBe(false);
});
});

describe("serializeComposerFileLink", () => {
it("uses the basename as the markdown label", () => {
expect(serializeComposerFileLink("path/to/package.json")).toBe(
Expand Down
14 changes: 14 additions & 0 deletions packages/shared/src/composerTrigger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,17 @@ export function replaceTextRange(
const nextText = `${text.slice(0, safeStart)}${replacement}${text.slice(safeEnd)}`;
return { text: nextText, cursor: safeStart + replacement.length };
}


/**
* True when removing the active autocomplete trigger leaves no other prompt text.
* Used by no-argument provider commands so selecting a command only auto-runs a
* standalone command and never discards surrounding draft text.
*/
export function composerTriggerIsOnlyText(
text: string,
rangeStart: number,
rangeEnd: number,
): boolean {
return replaceTextRange(text, rangeStart, rangeEnd, "").text.trim().length === 0;
}
Loading