Add /new command for contextual threads#7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tim-smart wants to merge 1 commit into from
Open

Add /new command for contextual threads #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 18 additions & 0 deletions apps/mobile/src/features/threads/NewTaskDraftRouteScreen.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { StaticScreenProps } from "@react-navigation/native";
import { useMemo } from "react";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import type { ComposerDraftWorkspaceSelection } from "../../state/use-composer-drafts";

import { NewTaskDraftScreen } from "./NewTaskDraftScreen";

Expand All@@ -10,8 +11,15 @@ type NewTaskDraftRouteParams = {
readonly title?: string | string[];
readonly pendingTaskId?: string | string[];
readonly incomingShareId?: string | string[];
readonly workspaceMode?: string | string[];
readonly branch?: string | string[];
readonly worktreePath?: string | string[];
};

function firstParam(value: string | string[] | undefined): string | undefined {
return Array.isArray(value) ? value[0] : value;
}

export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraftRouteParams>) {
const params = route.params ?? {};

Expand All@@ -27,6 +35,15 @@ export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraf
}),
[route.params],
);
const initialWorkspaceSelection = useMemo<ComposerDraftWorkspaceSelection | undefined>(() => {
const mode = firstParam(params.workspaceMode);
if (mode !== "local" && mode !== "worktree") return undefined;
return {
mode,
branch: firstParam(params.branch) ?? null,
worktreePath: firstParam(params.worktreePath) ?? null,
};
}, [route.params]);

return (
<>
Expand All@@ -37,6 +54,7 @@ export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraf
/>
<NewTaskDraftScreen
initialProjectRef={initialProjectRef}
initialWorkspaceSelection={initialWorkspaceSelection}
incomingShareId={
Array.isArray(params.incomingShareId) ? params.incomingShareId[0] : params.incomingShareId
}
Expand Down
30 changes: 30 additions & 0 deletions apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,9 @@ import {
getComposerDraftSnapshot,
mergeComposerDraftContent,
restoreComposerDraftSnapshot,
updateComposerDraftSettings,
type ComposerDraft,
type ComposerDraftWorkspaceSelection,
} from "../../state/use-composer-drafts";
import { useProjects } from "../../state/entities";
import { deriveThreadTitleFromPrompt } from "../../lib/projectThreadStartTurn";
Expand DownExpand Up@@ -68,6 +70,7 @@ export function NewTaskDraftScreen(props: {
readonly environmentId?: string;
readonly projectId?: string;
};
readonly initialWorkspaceSelection?: ComposerDraftWorkspaceSelection;
/** Queued outbox message id when editing an existing pending task. */
readonly pendingTaskId?: string;
/** Durable native share inbox item to merge into this project draft. */
Expand DownExpand Up@@ -294,6 +297,33 @@ export function NewTaskDraftScreen(props: {
setProject,
]);

const appliedInitialWorkspaceSelectionRef = useRef<ComposerDraftWorkspaceSelection | undefined>(
undefined,
);
useEffect(() => {
const selection = props.initialWorkspaceSelection;
const initialEnvironmentId = props.initialProjectRef?.environmentId;
const initialProjectId = props.initialProjectRef?.projectId;
if (
!selection ||
!flow.draftKey ||
!selectedProject ||
selectedProject.environmentId !== initialEnvironmentId ||
selectedProject.id !== initialProjectId ||
appliedInitialWorkspaceSelectionRef.current === selection
) {
return;
}
appliedInitialWorkspaceSelectionRef.current = selection;
updateComposerDraftSettings(flow.draftKey, { workspaceSelection: selection });
}, [
flow.draftKey,
props.initialProjectRef?.environmentId,
props.initialProjectRef?.projectId,
props.initialWorkspaceSelection,
selectedProject,
]);

useEffect(() => {
if (!selectedProject) {
loadedBranchesProjectKeyRef.current = null;
Expand Down
46 changes: 44 additions & 2 deletions apps/mobile/src/features/threads/ThreadComposer.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import type {
} from "@t3tools/contracts";
import {
detectComposerTrigger,
parseStandaloneComposerSlashCommand,
replaceTextRange,
serializeComposerFileLink,
type ComposerTrigger,
Expand DownExpand Up@@ -110,6 +111,7 @@ export interface ThreadComposerProps {
readonly onRemoveDraftImage: (imageId: string) => void;
readonly onStopThread: () => void;
readonly onSendMessage: () => Promise<MessageId | null>;
readonly onStartNewThread: () => void;
readonly onUpdateModelSelection: (modelSelection: ModelSelection) => void;
readonly onUpdateRuntimeMode: (runtimeMode: RuntimeMode) => void;
readonly onUpdateInteractionMode: (interactionMode: ProviderInteractionMode) => void;
Expand DownExpand Up@@ -372,6 +374,13 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
if (composerTrigger.kind === "slash-command") {
const q = composerTrigger.query.toLowerCase();
const allBuiltIn = [
{
id: "cmd:new",
type: "slash-command" as const,
command: "new",
label: "/new",
description: "Start a new thread here",
},
{
id: "cmd:model",
type: "slash-command" as const,
Expand DownExpand Up@@ -512,9 +521,20 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
}, [composerTrigger, pathSearch.entries, selectedProviderStatus]);

// ── Handle command selection ──────────────────────────────
const { onChangeDraftMessage, onUpdateInteractionMode, draftMessage, onSendMessage } = props;
const {
onChangeDraftMessage,
onStartNewThread,
onUpdateInteractionMode,
draftMessage,
onSendMessage,
} = props;

const handleSend = useCallback(async () => {
if (parseStandaloneComposerSlashCommand(draftMessage) === "new") {
onChangeDraftMessage("");
onStartNewThread();
return;
}
const threadKey = scopedThreadKey(props.environmentId, props.selectedThread.id);
if (inFlightThreadIdsRef.current.has(threadKey)) return;
inFlightThreadIdsRef.current.add(threadKey);
Expand All@@ -533,6 +553,9 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
}
}, [
onSendMessage,
draftMessage,
onChangeDraftMessage,
onStartNewThread,
props.environmentId,
props.environmentLabel,
props.selectedThread.id,
Expand All@@ -558,6 +581,19 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
return;
}

if (item.type === "slash-command" && item.command === "new") {
const result = replaceTextRange(
draftMessage,
composerTrigger.rangeStart,
composerTrigger.rangeEnd,
"",
);
setComposerSelection({ start: result.cursor, end: result.cursor });
onChangeDraftMessage(result.text);
onStartNewThread();
return;
}

let replacement = "";
if (item.type === "path") {
replacement = `${serializeComposerFileLink(item.path)} `;
Expand All@@ -578,7 +614,13 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
setComposerSelection({ start: result.cursor, end: result.cursor });
onChangeDraftMessage(result.text);
},
[composerTrigger, draftMessage, onChangeDraftMessage, onUpdateInteractionMode],
[
composerTrigger,
draftMessage,
onChangeDraftMessage,
onStartNewThread,
onUpdateInteractionMode,
],
);

// ── Model menu ───────────────────────────────────────────
Expand Down
2 changes: 2 additions & 0 deletions apps/mobile/src/features/threads/ThreadDetailScreen.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ export interface ThreadDetailScreenProps {
readonly onRemoveDraftImage: (imageId: string) => void;
readonly onStopThread: () => void;
readonly onSendMessage: () => Promise<MessageId | null>;
readonly onStartNewThread: () => void;
readonly onReconnectEnvironment: () => void;
readonly onUpdateThreadModelSelection: (modelSelection: ModelSelection) => void;
readonly onUpdateThreadRuntimeMode: (runtimeMode: RuntimeMode) => void;
Expand DownExpand Up@@ -439,6 +440,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
onRemoveDraftImage={props.onRemoveDraftImage}
onStopThread={props.onStopThread}
onSendMessage={handleSendMessage}
onStartNewThread={props.onStartNewThread}
onReconnectEnvironment={props.onReconnectEnvironment}
onUpdateModelSelection={props.onUpdateThreadModelSelection}
onUpdateRuntimeMode={props.onUpdateThreadRuntimeMode}
Expand Down
19 changes: 19 additions & 0 deletions apps/mobile/src/features/threads/ThreadRouteScreen.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -308,6 +308,24 @@ function ThreadRouteContent(
[knownTerminalSessions, selectedThreadProject?.workspaceRoot],
);
const selectedThreadDetailWorktreePath = selectedThreadDetail?.worktreePath ?? null;
const handleStartNewThread = useCallback(() => {
if (!selectedThread || !selectedThreadProject) return;
const worktreePath = resolvePreferredThreadWorktreePath({
threadShellWorktreePath: selectedThread.worktreePath ?? null,
threadDetailWorktreePath: selectedThreadDetailWorktreePath,
});
navigation.navigate("NewTaskSheet", {
screen: "NewTaskDraft",
params: {
environmentId: String(selectedThread.environmentId),
projectId: String(selectedThread.projectId),
title: selectedThreadProject.title,
workspaceMode: "local",
branch: selectedThread.branch ?? undefined,
worktreePath: worktreePath ?? undefined,
},
});
}, [navigation, selectedThread, selectedThreadDetailWorktreePath, selectedThreadProject]);
const handleReconnectEnvironment = useCallback(() => {
if (!environmentId) {
return;
Expand DownExpand Up@@ -781,6 +799,7 @@ function ThreadRouteContent(
serverConfig={serverConfig}
onStopThread={handleStopThread}
onSendMessage={composer.onSendMessage}
onStartNewThread={handleStartNewThread}
onReconnectEnvironment={handleReconnectEnvironment}
onUpdateThreadModelSelection={composer.onUpdateModelSelection}
onUpdateThreadRuntimeMode={composer.onUpdateRuntimeMode}
Expand Down
23 changes: 22 additions & 1 deletion apps/web/src/components/ChatView.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3927,6 +3927,22 @@ function ChatViewContent(props: ChatViewProps) {
? (pendingServerThreadStartFromOriginByThreadId[activeThread?.id ?? ""] ??
primaryServerSettings.newWorktreesStartFromOrigin)
: false;
const handleStartNewThread = useCallback(() => {
if (!activeProjectRef) return;
void handleNewThread(activeProjectRef, {
branch: activeThreadBranch,
worktreePath: activeWorktreePath,
envMode,
startFromOrigin,
});
}, [
activeProjectRef,
activeThreadBranch,
activeWorktreePath,
envMode,
handleNewThread,
startFromOrigin,
]);
const sendEnvMode = resolveSendEnvMode({
requestedEnvMode: envMode,
isGitRepo,
Expand DownExpand Up@@ -4609,10 +4625,14 @@ function ChatViewContent(props: ChatViewProps) {
? parseStandaloneComposerSlashCommand(trimmed)
: null;
if (standaloneSlashCommand) {
handleInteractionModeChange(standaloneSlashCommand);
promptRef.current = "";
clearComposerDraftContent(composerDraftTarget);
composerRef.current?.resetCursorState();
if (standaloneSlashCommand === "new") {
handleStartNewThread();
} else {
handleInteractionModeChange(standaloneSlashCommand);
}
return;
}
if (!hasSendableContent) {
Expand DownExpand Up@@ -5949,6 +5969,7 @@ function ChatViewContent(props: ChatViewProps) {
composerTerminalContextsRef={composerTerminalContextsRef}
composerElementContextsRef={composerElementContextsRef}
onSend={onSend}
onStartNewThread={handleStartNewThread}
onInterrupt={onInterrupt}
onImplementPlanInNewThread={onImplementPlanInNewThread}
onRespondToApproval={onRespondToApproval}
Expand Down
27 changes: 26 additions & 1 deletion apps/web/src/components/chat/ChatComposer.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -587,6 +587,7 @@ export interface ChatComposerProps {

// Callbacks
onSend: (e?: { preventDefault: () => void }) => void;
onStartNewThread: () => void;
onInterrupt: () => void;
onImplementPlanInNewThread: () => void;
onRespondToApproval: (
Expand DownExpand Up@@ -674,6 +675,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
composerTerminalContextsRef,
composerElementContextsRef,
onSend,
onStartNewThread,
onInterrupt,
onImplementPlanInNewThread,
onRespondToApproval,
Expand DownExpand Up@@ -1062,6 +1064,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
}
if (composerTrigger.kind === "slash-command") {
const builtInSlashCommandItems = [
{
id: "slash:new",
type: "slash-command",
command: "new",
label: "/new",
description: "Start a new thread in this worktree or directory",
},
{
id: "slash:model",
type: "slash-command",
Expand DownExpand Up@@ -1692,6 +1701,17 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
return;
}
if (item.type === "slash-command") {
if (item.command === "new") {
const applied = applyPromptReplacement(trigger.rangeStart, trigger.rangeEnd, "", {
expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd),
focusEditorAfterReplace: false,
});
if (applied) {
setComposerHighlightedItemId(null);
onStartNewThread();
}
return;
}
if (item.command === "model") {
const applied = applyPromptReplacement(trigger.rangeStart, trigger.rangeEnd, "", {
expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd),
Expand DownExpand Up@@ -1749,7 +1769,12 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
return;
}
},
[applyPromptReplacement, handleInteractionModeChange, resolveActiveComposerTrigger],
[
applyPromptReplacement,
handleInteractionModeChange,
onStartNewThread,
resolveActiveComposerTrigger,
],
);

const onComposerMenuItemHighlighted = useCallback(
Expand Down
6 changes: 5 additions & 1 deletion apps/web/src/composer-logic.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -360,6 +360,10 @@ describe("isCollapsedCursorAdjacentToInlineToken", () => {
});

describe("parseStandaloneComposerSlashCommand", () => {
it("parses standalone /new command", () => {
expect(parseStandaloneComposerSlashCommand(" /NEW ")).toBe("new");
});

it("parses standalone /plan command", () => {
expect(parseStandaloneComposerSlashCommand(" /plan ")).toBe("plan");
});
Expand All@@ -369,6 +373,6 @@ describe("parseStandaloneComposerSlashCommand", () => {
});

it("ignores slash commands with extra message text", () => {
expect(parseStandaloneComposerSlashCommand("/plan explain this")).toBeNull();
expect(parseStandaloneComposerSlashCommand("/new explain this")).toBeNull();
});
});
5 changes: 3 additions & 2 deletions apps/web/src/composer-logic.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { splitPromptIntoComposerSegments } from "./composer-editor-mentions";
import { INLINE_TERMINAL_CONTEXT_PLACEHOLDER } from "./lib/terminalContext";

export type ComposerTriggerKind = "path" | "slash-command" | "skill";
export type ComposerSlashCommand = "model" | "plan" | "default";
export type ComposerSlashCommand = "new" | "model" | "plan" | "default";

export interface ComposerTrigger {
kind: ComposerTriggerKind;
Expand DownExpand Up@@ -265,11 +265,12 @@ export function detectComposerTrigger(text: string, cursorInput: number): Compos
export function parseStandaloneComposerSlashCommand(
text: string,
): Exclude<ComposerSlashCommand, "model"> | null {
const match = /^\/(plan|default)\s*$/i.exec(text.trim());
const match = /^\/(new|plan|default)\s*$/i.exec(text.trim());
if (!match) {
return null;
}
const command = match[1]?.toLowerCase();
if (command === "new") return "new";
if (command === "plan") return "plan";
return "default";
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} 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
Add /new command for contextual threads#7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

tim-smart
wants to merge
1
commit into

from

 Open


Add /new command for contextual threads
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


18 changes: 18 additions & 0 deletions
apps/mobile/src/features/threads/NewTaskDraftRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { StaticScreenProps } from "@react-navigation/native";
import { useMemo } from "react";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import type { ComposerDraftWorkspaceSelection } from "../../state/use-composer-drafts";

import { NewTaskDraftScreen } from "./NewTaskDraftScreen";

Expand All@@ -10,8 +11,15 @@ type NewTaskDraftRouteParams = {
 readonly title?: string | string[];
 readonly pendingTaskId?: string | string[];
 readonly incomingShareId?: string | string[];
 readonly workspaceMode?: string | string[];
 readonly branch?: string | string[];
 readonly worktreePath?: string | string[];
};

function firstParam(value: string | string[] | undefined): string | undefined {
 return Array.isArray(value) ? value[0] : value;
}

export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraftRouteParams>) {
 const params = route.params ?? {};

Expand All@@ -27,6 +35,15 @@ export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraf
 }),
 [route.params],
 );
 const initialWorkspaceSelection = useMemo<ComposerDraftWorkspaceSelection | undefined>(() => {
 const mode = firstParam(params.workspaceMode);
 if (mode !== "local" && mode !== "worktree") return undefined;
 return {
 mode,
 branch: firstParam(params.branch) ?? null,
 worktreePath: firstParam(params.worktreePath) ?? null,
 };
 }, [route.params]);

 return (
 <>
Expand All@@ -37,6 +54,7 @@ export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraf
 />
 <NewTaskDraftScreen
 initialProjectRef={initialProjectRef}
 initialWorkspaceSelection={initialWorkspaceSelection}
 incomingShareId={
 Array.isArray(params.incomingShareId) ? params.incomingShareId[0] : params.incomingShareId
 }
Expand Down

30 changes: 30 additions & 0 deletions
apps/mobile/src/features/threads/NewTaskDraftScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,9 @@ import {
 getComposerDraftSnapshot,
 mergeComposerDraftContent,
 restoreComposerDraftSnapshot,
 updateComposerDraftSettings,
 type ComposerDraft,
 type ComposerDraftWorkspaceSelection,
} from "../../state/use-composer-drafts";
import { useProjects } from "../../state/entities";
import { deriveThreadTitleFromPrompt } from "../../lib/projectThreadStartTurn";
Expand DownExpand Up@@ -68,6 +70,7 @@ export function NewTaskDraftScreen(props: {
 readonly environmentId?: string;
 readonly projectId?: string;
 };
 readonly initialWorkspaceSelection?: ComposerDraftWorkspaceSelection;
 /** Queued outbox message id when editing an existing pending task. */
 readonly pendingTaskId?: string;
 /** Durable native share inbox item to merge into this project draft. */
Expand DownExpand Up@@ -294,6 +297,33 @@ export function NewTaskDraftScreen(props: {
 setProject,
 ]);

 const appliedInitialWorkspaceSelectionRef = useRef<ComposerDraftWorkspaceSelection | undefined>(
 undefined,
 );
 useEffect(() => {
 const selection = props.initialWorkspaceSelection;
 const initialEnvironmentId = props.initialProjectRef?.environmentId;
 const initialProjectId = props.initialProjectRef?.projectId;
 if (
 !selection ||
 !flow.draftKey ||
 !selectedProject ||
 selectedProject.environmentId !== initialEnvironmentId ||
 selectedProject.id !== initialProjectId ||
 appliedInitialWorkspaceSelectionRef.current === selection
 ) {
 return;
 }
 appliedInitialWorkspaceSelectionRef.current = selection;
 updateComposerDraftSettings(flow.draftKey, { workspaceSelection: selection });
 }, [
 flow.draftKey,
 props.initialProjectRef?.environmentId,
 props.initialProjectRef?.projectId,
 props.initialWorkspaceSelection,
 selectedProject,
 ]);

 useEffect(() => {
 if (!selectedProject) {
 loadedBranchesProjectKeyRef.current = null;
Expand Down

46 changes: 44 additions & 2 deletions
apps/mobile/src/features/threads/ThreadComposer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import type {
} from "@t3tools/contracts";
import {
 detectComposerTrigger,
 parseStandaloneComposerSlashCommand,
 replaceTextRange,
 serializeComposerFileLink,
 type ComposerTrigger,
Expand DownExpand Up@@ -110,6 +111,7 @@ export interface ThreadComposerProps {
 readonly onRemoveDraftImage: (imageId: string) => void;
 readonly onStopThread: () => void;
 readonly onSendMessage: () => Promise<MessageId | null>;
 readonly onStartNewThread: () => void;
 readonly onUpdateModelSelection: (modelSelection: ModelSelection) => void;
 readonly onUpdateRuntimeMode: (runtimeMode: RuntimeMode) => void;
 readonly onUpdateInteractionMode: (interactionMode: ProviderInteractionMode) => void;
Expand DownExpand Up@@ -372,6 +374,13 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 if (composerTrigger.kind === "slash-command") {
 const q = composerTrigger.query.toLowerCase();
 const allBuiltIn = [
 {
 id: "cmd:new",
 type: "slash-command" as const,
 command: "new",
 label: "/new",
 description: "Start a new thread here",
 },
 {
 id: "cmd:model",
 type: "slash-command" as const,
Expand DownExpand Up@@ -512,9 +521,20 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 }, [composerTrigger, pathSearch.entries, selectedProviderStatus]);

 // ── Handle command selection ──────────────────────────────
 const { onChangeDraftMessage, onUpdateInteractionMode, draftMessage, onSendMessage } = props;
 const {
 onChangeDraftMessage,
 onStartNewThread,
 onUpdateInteractionMode,
 draftMessage,
 onSendMessage,
 } = props;

 const handleSend = useCallback(async () => {
 if (parseStandaloneComposerSlashCommand(draftMessage) === "new") {
 onChangeDraftMessage("");
 onStartNewThread();
 return;
 }
 const threadKey = scopedThreadKey(props.environmentId, props.selectedThread.id);
 if (inFlightThreadIdsRef.current.has(threadKey)) return;
 inFlightThreadIdsRef.current.add(threadKey);
Expand All@@ -533,6 +553,9 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 }
 }, [
 onSendMessage,
 draftMessage,
 onChangeDraftMessage,
 onStartNewThread,
 props.environmentId,
 props.environmentLabel,
 props.selectedThread.id,
Expand All@@ -558,6 +581,19 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 return;
 }

 if (item.type === "slash-command" && item.command === "new") {
 const result = replaceTextRange(
 draftMessage,
 composerTrigger.rangeStart,
 composerTrigger.rangeEnd,
 "",
 );
 setComposerSelection({ start: result.cursor, end: result.cursor });
 onChangeDraftMessage(result.text);
 onStartNewThread();
 return;
 }

 let replacement = "";
 if (item.type === "path") {
 replacement = `${serializeComposerFileLink(item.path)} `;
Expand All@@ -578,7 +614,13 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 setComposerSelection({ start: result.cursor, end: result.cursor });
 onChangeDraftMessage(result.text);
 },
 [composerTrigger, draftMessage, onChangeDraftMessage, onUpdateInteractionMode],
 [
 composerTrigger,
 draftMessage,
 onChangeDraftMessage,
 onStartNewThread,
 onUpdateInteractionMode,
 ],
 );

 // ── Model menu ───────────────────────────────────────────
Expand Down

2 changes: 2 additions & 0 deletions
apps/mobile/src/features/threads/ThreadDetailScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ export interface ThreadDetailScreenProps {
 readonly onRemoveDraftImage: (imageId: string) => void;
 readonly onStopThread: () => void;
 readonly onSendMessage: () => Promise<MessageId | null>;
 readonly onStartNewThread: () => void;
 readonly onReconnectEnvironment: () => void;
 readonly onUpdateThreadModelSelection: (modelSelection: ModelSelection) => void;
 readonly onUpdateThreadRuntimeMode: (runtimeMode: RuntimeMode) => void;
Expand DownExpand Up@@ -439,6 +440,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 onRemoveDraftImage={props.onRemoveDraftImage}
 onStopThread={props.onStopThread}
 onSendMessage={handleSendMessage}
 onStartNewThread={props.onStartNewThread}
 onReconnectEnvironment={props.onReconnectEnvironment}
 onUpdateModelSelection={props.onUpdateThreadModelSelection}
 onUpdateRuntimeMode={props.onUpdateThreadRuntimeMode}
Expand Down

19 changes: 19 additions & 0 deletions
apps/mobile/src/features/threads/ThreadRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -308,6 +308,24 @@ function ThreadRouteContent(
 [knownTerminalSessions, selectedThreadProject?.workspaceRoot],
 );
 const selectedThreadDetailWorktreePath = selectedThreadDetail?.worktreePath ?? null;
 const handleStartNewThread = useCallback(() => {
 if (!selectedThread || !selectedThreadProject) return;
 const worktreePath = resolvePreferredThreadWorktreePath({
 threadShellWorktreePath: selectedThread.worktreePath ?? null,
 threadDetailWorktreePath: selectedThreadDetailWorktreePath,
 });
 navigation.navigate("NewTaskSheet", {
 screen: "NewTaskDraft",
 params: {
 environmentId: String(selectedThread.environmentId),
 projectId: String(selectedThread.projectId),
 title: selectedThreadProject.title,
 workspaceMode: "local",
 branch: selectedThread.branch ?? undefined,
 worktreePath: worktreePath ?? undefined,
 },
 });
 }, [navigation, selectedThread, selectedThreadDetailWorktreePath, selectedThreadProject]);
 const handleReconnectEnvironment = useCallback(() => {
 if (!environmentId) {
 return;
Expand DownExpand Up@@ -781,6 +799,7 @@ function ThreadRouteContent(
 serverConfig={serverConfig}
 onStopThread={handleStopThread}
 onSendMessage={composer.onSendMessage}
 onStartNewThread={handleStartNewThread}
 onReconnectEnvironment={handleReconnectEnvironment}
 onUpdateThreadModelSelection={composer.onUpdateModelSelection}
 onUpdateThreadRuntimeMode={composer.onUpdateRuntimeMode}
Expand Down

23 changes: 22 additions & 1 deletion
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3927,6 +3927,22 @@ function ChatViewContent(props: ChatViewProps) {
 ? (pendingServerThreadStartFromOriginByThreadId[activeThread?.id ?? ""] ??
 primaryServerSettings.newWorktreesStartFromOrigin)
 : false;
 const handleStartNewThread = useCallback(() => {
 if (!activeProjectRef) return;
 void handleNewThread(activeProjectRef, {
 branch: activeThreadBranch,
 worktreePath: activeWorktreePath,
 envMode,
 startFromOrigin,
 });
 }, [
 activeProjectRef,
 activeThreadBranch,
 activeWorktreePath,
 envMode,
 handleNewThread,
 startFromOrigin,
 ]);
 const sendEnvMode = resolveSendEnvMode({
 requestedEnvMode: envMode,
 isGitRepo,
Expand DownExpand Up@@ -4609,10 +4625,14 @@ function ChatViewContent(props: ChatViewProps) {
 ? parseStandaloneComposerSlashCommand(trimmed)
 : null;
 if (standaloneSlashCommand) {
 handleInteractionModeChange(standaloneSlashCommand);
 promptRef.current = "";
 clearComposerDraftContent(composerDraftTarget);
 composerRef.current?.resetCursorState();
 if (standaloneSlashCommand === "new") {
 handleStartNewThread();
 } else {
 handleInteractionModeChange(standaloneSlashCommand);
 }
 return;
 }
 if (!hasSendableContent) {
Expand DownExpand Up@@ -5949,6 +5969,7 @@ function ChatViewContent(props: ChatViewProps) {
 composerTerminalContextsRef={composerTerminalContextsRef}
 composerElementContextsRef={composerElementContextsRef}
 onSend={onSend}
 onStartNewThread={handleStartNewThread}
 onInterrupt={onInterrupt}
 onImplementPlanInNewThread={onImplementPlanInNewThread}
 onRespondToApproval={onRespondToApproval}
Expand Down

27 changes: 26 additions & 1 deletion
apps/web/src/components/chat/ChatComposer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -587,6 +587,7 @@ export interface ChatComposerProps {

 // Callbacks
 onSend: (e?: { preventDefault: () => void }) => void;
 onStartNewThread: () => void;
 onInterrupt: () => void;
 onImplementPlanInNewThread: () => void;
 onRespondToApproval: (
Expand DownExpand Up@@ -674,6 +675,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 composerTerminalContextsRef,
 composerElementContextsRef,
 onSend,
 onStartNewThread,
 onInterrupt,
 onImplementPlanInNewThread,
 onRespondToApproval,
Expand DownExpand Up@@ -1062,6 +1064,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 }
 if (composerTrigger.kind === "slash-command") {
 const builtInSlashCommandItems = [
 {
 id: "slash:new",
 type: "slash-command",
 command: "new",
 label: "/new",
 description: "Start a new thread in this worktree or directory",
 },
 {
 id: "slash:model",
 type: "slash-command",
Expand DownExpand Up@@ -1692,6 +1701,17 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 return;
 }
 if (item.type === "slash-command") {
 if (item.command === "new") {
 const applied = applyPromptReplacement(trigger.rangeStart, trigger.rangeEnd, "", {
 expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd),
 focusEditorAfterReplace: false,
 });
 if (applied) {
 setComposerHighlightedItemId(null);
 onStartNewThread();
 }
 return;
 }
 if (item.command === "model") {
 const applied = applyPromptReplacement(trigger.rangeStart, trigger.rangeEnd, "", {
 expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd),
Expand DownExpand Up@@ -1749,7 +1769,12 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 return;
 }
 },
 [applyPromptReplacement, handleInteractionModeChange, resolveActiveComposerTrigger],
 [
 applyPromptReplacement,
 handleInteractionModeChange,
 onStartNewThread,
 resolveActiveComposerTrigger,
 ],
 );

 const onComposerMenuItemHighlighted = useCallback(
Expand Down

6 changes: 5 additions & 1 deletion
apps/web/src/composer-logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,6 +360,10 @@ describe("isCollapsedCursorAdjacentToInlineToken", () => {
});

describe("parseStandaloneComposerSlashCommand", () => {
 it("parses standalone /new command", () => {
 expect(parseStandaloneComposerSlashCommand(" /NEW ")).toBe("new");
 });

 it("parses standalone /plan command", () => {
 expect(parseStandaloneComposerSlashCommand(" /plan ")).toBe("plan");
 });
Expand All@@ -369,6 +373,6 @@ describe("parseStandaloneComposerSlashCommand", () => {
 });

 it("ignores slash commands with extra message text", () => {
 expect(parseStandaloneComposerSlashCommand("/plan explain this")).toBeNull();
 expect(parseStandaloneComposerSlashCommand("/new explain this")).toBeNull();
 });
});

5 changes: 3 additions & 2 deletions
apps/web/src/composer-logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { splitPromptIntoComposerSegments } from "./composer-editor-mentions";
import { INLINE_TERMINAL_CONTEXT_PLACEHOLDER } from "./lib/terminalContext";

export type ComposerTriggerKind = "path" | "slash-command" | "skill";
export type ComposerSlashCommand = "model" | "plan" | "default";
export type ComposerSlashCommand = "new" | "model" | "plan" | "default";

export interface ComposerTrigger {
 kind: ComposerTriggerKind;
Expand DownExpand Up@@ -265,11 +265,12 @@ export function detectComposerTrigger(text: string, cursorInput: number): Compos
export function parseStandaloneComposerSlashCommand(
 text: string,
): Exclude<ComposerSlashCommand, "model"> | null {
 const match = /^\/(plan|default)\s*$/i.exec(text.trim());
 const match = /^\/(new|plan|default)\s*$/i.exec(text.trim());
 if (!match) {
 return null;
 }
 const command = match[1]?.toLowerCase();
 if (command === "new") return "new";
 if (command === "plan") return "plan";
 return "default";
}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add /new command for contextual threads#7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

tim-smart
wants to merge
1
commit into

from

 Open


Add /new command for contextual threads
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


18 changes: 18 additions & 0 deletions
apps/mobile/src/features/threads/NewTaskDraftRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { StaticScreenProps } from "@react-navigation/native";
import { useMemo } from "react";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import type { ComposerDraftWorkspaceSelection } from "../../state/use-composer-drafts";

import { NewTaskDraftScreen } from "./NewTaskDraftScreen";

Expand All@@ -10,8 +11,15 @@ type NewTaskDraftRouteParams = {
 readonly title?: string | string[];
 readonly pendingTaskId?: string | string[];
 readonly incomingShareId?: string | string[];
 readonly workspaceMode?: string | string[];
 readonly branch?: string | string[];
 readonly worktreePath?: string | string[];
};

function firstParam(value: string | string[] | undefined): string | undefined {
 return Array.isArray(value) ? value[0] : value;
}

export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraftRouteParams>) {
 const params = route.params ?? {};

Expand All@@ -27,6 +35,15 @@ export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraf
 }),
 [route.params],
 );
 const initialWorkspaceSelection = useMemo<ComposerDraftWorkspaceSelection | undefined>(() => {
 const mode = firstParam(params.workspaceMode);
 if (mode !== "local" && mode !== "worktree") return undefined;
 return {
 mode,
 branch: firstParam(params.branch) ?? null,
 worktreePath: firstParam(params.worktreePath) ?? null,
 };
 }, [route.params]);

 return (
 <>
Expand All@@ -37,6 +54,7 @@ export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraf
 />
 <NewTaskDraftScreen
 initialProjectRef={initialProjectRef}
 initialWorkspaceSelection={initialWorkspaceSelection}
 incomingShareId={
 Array.isArray(params.incomingShareId) ? params.incomingShareId[0] : params.incomingShareId
 }
Expand Down

30 changes: 30 additions & 0 deletions
apps/mobile/src/features/threads/NewTaskDraftScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,9 @@ import {
 getComposerDraftSnapshot,
 mergeComposerDraftContent,
 restoreComposerDraftSnapshot,
 updateComposerDraftSettings,
 type ComposerDraft,
 type ComposerDraftWorkspaceSelection,
} from "../../state/use-composer-drafts";
import { useProjects } from "../../state/entities";
import { deriveThreadTitleFromPrompt } from "../../lib/projectThreadStartTurn";
Expand DownExpand Up@@ -68,6 +70,7 @@ export function NewTaskDraftScreen(props: {
 readonly environmentId?: string;
 readonly projectId?: string;
 };
 readonly initialWorkspaceSelection?: ComposerDraftWorkspaceSelection;
 /** Queued outbox message id when editing an existing pending task. */
 readonly pendingTaskId?: string;
 /** Durable native share inbox item to merge into this project draft. */
Expand DownExpand Up@@ -294,6 +297,33 @@ export function NewTaskDraftScreen(props: {
 setProject,
 ]);

 const appliedInitialWorkspaceSelectionRef = useRef<ComposerDraftWorkspaceSelection | undefined>(
 undefined,
 );
 useEffect(() => {
 const selection = props.initialWorkspaceSelection;
 const initialEnvironmentId = props.initialProjectRef?.environmentId;
 const initialProjectId = props.initialProjectRef?.projectId;
 if (
 !selection ||
 !flow.draftKey ||
 !selectedProject ||
 selectedProject.environmentId !== initialEnvironmentId ||
 selectedProject.id !== initialProjectId ||
 appliedInitialWorkspaceSelectionRef.current === selection
 ) {
 return;
 }
 appliedInitialWorkspaceSelectionRef.current = selection;
 updateComposerDraftSettings(flow.draftKey, { workspaceSelection: selection });
 }, [
 flow.draftKey,
 props.initialProjectRef?.environmentId,
 props.initialProjectRef?.projectId,
 props.initialWorkspaceSelection,
 selectedProject,
 ]);

 useEffect(() => {
 if (!selectedProject) {
 loadedBranchesProjectKeyRef.current = null;
Expand Down

46 changes: 44 additions & 2 deletions
apps/mobile/src/features/threads/ThreadComposer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import type {
} from "@t3tools/contracts";
import {
 detectComposerTrigger,
 parseStandaloneComposerSlashCommand,
 replaceTextRange,
 serializeComposerFileLink,
 type ComposerTrigger,
Expand DownExpand Up@@ -110,6 +111,7 @@ export interface ThreadComposerProps {
 readonly onRemoveDraftImage: (imageId: string) => void;
 readonly onStopThread: () => void;
 readonly onSendMessage: () => Promise<MessageId | null>;
 readonly onStartNewThread: () => void;
 readonly onUpdateModelSelection: (modelSelection: ModelSelection) => void;
 readonly onUpdateRuntimeMode: (runtimeMode: RuntimeMode) => void;
 readonly onUpdateInteractionMode: (interactionMode: ProviderInteractionMode) => void;
Expand DownExpand Up@@ -372,6 +374,13 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 if (composerTrigger.kind === "slash-command") {
 const q = composerTrigger.query.toLowerCase();
 const allBuiltIn = [
 {
 id: "cmd:new",
 type: "slash-command" as const,
 command: "new",
 label: "/new",
 description: "Start a new thread here",
 },
 {
 id: "cmd:model",
 type: "slash-command" as const,
Expand DownExpand Up@@ -512,9 +521,20 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 }, [composerTrigger, pathSearch.entries, selectedProviderStatus]);

 // ── Handle command selection ──────────────────────────────
 const { onChangeDraftMessage, onUpdateInteractionMode, draftMessage, onSendMessage } = props;
 const {
 onChangeDraftMessage,
 onStartNewThread,
 onUpdateInteractionMode,
 draftMessage,
 onSendMessage,
 } = props;

 const handleSend = useCallback(async () => {
 if (parseStandaloneComposerSlashCommand(draftMessage) === "new") {
 onChangeDraftMessage("");
 onStartNewThread();
 return;
 }
 const threadKey = scopedThreadKey(props.environmentId, props.selectedThread.id);
 if (inFlightThreadIdsRef.current.has(threadKey)) return;
 inFlightThreadIdsRef.current.add(threadKey);
Expand All@@ -533,6 +553,9 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 }
 }, [
 onSendMessage,
 draftMessage,
 onChangeDraftMessage,
 onStartNewThread,
 props.environmentId,
 props.environmentLabel,
 props.selectedThread.id,
Expand All@@ -558,6 +581,19 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 return;
 }

 if (item.type === "slash-command" && item.command === "new") {
 const result = replaceTextRange(
 draftMessage,
 composerTrigger.rangeStart,
 composerTrigger.rangeEnd,
 "",
 );
 setComposerSelection({ start: result.cursor, end: result.cursor });
 onChangeDraftMessage(result.text);
 onStartNewThread();
 return;
 }

 let replacement = "";
 if (item.type === "path") {
 replacement = `${serializeComposerFileLink(item.path)} `;
Expand All@@ -578,7 +614,13 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 setComposerSelection({ start: result.cursor, end: result.cursor });
 onChangeDraftMessage(result.text);
 },
 [composerTrigger, draftMessage, onChangeDraftMessage, onUpdateInteractionMode],
 [
 composerTrigger,
 draftMessage,
 onChangeDraftMessage,
 onStartNewThread,
 onUpdateInteractionMode,
 ],
 );

 // ── Model menu ───────────────────────────────────────────
Expand Down

2 changes: 2 additions & 0 deletions
apps/mobile/src/features/threads/ThreadDetailScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ export interface ThreadDetailScreenProps {
 readonly onRemoveDraftImage: (imageId: string) => void;
 readonly onStopThread: () => void;
 readonly onSendMessage: () => Promise<MessageId | null>;
 readonly onStartNewThread: () => void;
 readonly onReconnectEnvironment: () => void;
 readonly onUpdateThreadModelSelection: (modelSelection: ModelSelection) => void;
 readonly onUpdateThreadRuntimeMode: (runtimeMode: RuntimeMode) => void;
Expand DownExpand Up@@ -439,6 +440,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 onRemoveDraftImage={props.onRemoveDraftImage}
 onStopThread={props.onStopThread}
 onSendMessage={handleSendMessage}
 onStartNewThread={props.onStartNewThread}
 onReconnectEnvironment={props.onReconnectEnvironment}
 onUpdateModelSelection={props.onUpdateThreadModelSelection}
 onUpdateRuntimeMode={props.onUpdateThreadRuntimeMode}
Expand Down

19 changes: 19 additions & 0 deletions
apps/mobile/src/features/threads/ThreadRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -308,6 +308,24 @@ function ThreadRouteContent(
 [knownTerminalSessions, selectedThreadProject?.workspaceRoot],
 );
 const selectedThreadDetailWorktreePath = selectedThreadDetail?.worktreePath ?? null;
 const handleStartNewThread = useCallback(() => {
 if (!selectedThread || !selectedThreadProject) return;
 const worktreePath = resolvePreferredThreadWorktreePath({
 threadShellWorktreePath: selectedThread.worktreePath ?? null,
 threadDetailWorktreePath: selectedThreadDetailWorktreePath,
 });
 navigation.navigate("NewTaskSheet", {
 screen: "NewTaskDraft",
 params: {
 environmentId: String(selectedThread.environmentId),
 projectId: String(selectedThread.projectId),
 title: selectedThreadProject.title,
 workspaceMode: "local",
 branch: selectedThread.branch ?? undefined,
 worktreePath: worktreePath ?? undefined,
 },
 });
 }, [navigation, selectedThread, selectedThreadDetailWorktreePath, selectedThreadProject]);
 const handleReconnectEnvironment = useCallback(() => {
 if (!environmentId) {
 return;
Expand DownExpand Up@@ -781,6 +799,7 @@ function ThreadRouteContent(
 serverConfig={serverConfig}
 onStopThread={handleStopThread}
 onSendMessage={composer.onSendMessage}
 onStartNewThread={handleStartNewThread}
 onReconnectEnvironment={handleReconnectEnvironment}
 onUpdateThreadModelSelection={composer.onUpdateModelSelection}
 onUpdateThreadRuntimeMode={composer.onUpdateRuntimeMode}
Expand Down

23 changes: 22 additions & 1 deletion
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3927,6 +3927,22 @@ function ChatViewContent(props: ChatViewProps) {
 ? (pendingServerThreadStartFromOriginByThreadId[activeThread?.id ?? ""] ??
 primaryServerSettings.newWorktreesStartFromOrigin)
 : false;
 const handleStartNewThread = useCallback(() => {
 if (!activeProjectRef) return;
 void handleNewThread(activeProjectRef, {
 branch: activeThreadBranch,
 worktreePath: activeWorktreePath,
 envMode,
 startFromOrigin,
 });
 }, [
 activeProjectRef,
 activeThreadBranch,
 activeWorktreePath,
 envMode,
 handleNewThread,
 startFromOrigin,
 ]);
 const sendEnvMode = resolveSendEnvMode({
 requestedEnvMode: envMode,
 isGitRepo,
Expand DownExpand Up@@ -4609,10 +4625,14 @@ function ChatViewContent(props: ChatViewProps) {
 ? parseStandaloneComposerSlashCommand(trimmed)
 : null;
 if (standaloneSlashCommand) {
 handleInteractionModeChange(standaloneSlashCommand);
 promptRef.current = "";
 clearComposerDraftContent(composerDraftTarget);
 composerRef.current?.resetCursorState();
 if (standaloneSlashCommand === "new") {
 handleStartNewThread();
 } else {
 handleInteractionModeChange(standaloneSlashCommand);
 }
 return;
 }
 if (!hasSendableContent) {
Expand DownExpand Up@@ -5949,6 +5969,7 @@ function ChatViewContent(props: ChatViewProps) {
 composerTerminalContextsRef={composerTerminalContextsRef}
 composerElementContextsRef={composerElementContextsRef}
 onSend={onSend}
 onStartNewThread={handleStartNewThread}
 onInterrupt={onInterrupt}
 onImplementPlanInNewThread={onImplementPlanInNewThread}
 onRespondToApproval={onRespondToApproval}
Expand Down

27 changes: 26 additions & 1 deletion
apps/web/src/components/chat/ChatComposer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -587,6 +587,7 @@ export interface ChatComposerProps {

 // Callbacks
 onSend: (e?: { preventDefault: () => void }) => void;
 onStartNewThread: () => void;
 onInterrupt: () => void;
 onImplementPlanInNewThread: () => void;
 onRespondToApproval: (
Expand DownExpand Up@@ -674,6 +675,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 composerTerminalContextsRef,
 composerElementContextsRef,
 onSend,
 onStartNewThread,
 onInterrupt,
 onImplementPlanInNewThread,
 onRespondToApproval,
Expand DownExpand Up@@ -1062,6 +1064,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 }
 if (composerTrigger.kind === "slash-command") {
 const builtInSlashCommandItems = [
 {
 id: "slash:new",
 type: "slash-command",
 command: "new",
 label: "/new",
 description: "Start a new thread in this worktree or directory",
 },
 {
 id: "slash:model",
 type: "slash-command",
Expand DownExpand Up@@ -1692,6 +1701,17 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 return;
 }
 if (item.type === "slash-command") {
 if (item.command === "new") {
 const applied = applyPromptReplacement(trigger.rangeStart, trigger.rangeEnd, "", {
 expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd),
 focusEditorAfterReplace: false,
 });
 if (applied) {
 setComposerHighlightedItemId(null);
 onStartNewThread();
 }
 return;
 }
 if (item.command === "model") {
 const applied = applyPromptReplacement(trigger.rangeStart, trigger.rangeEnd, "", {
 expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd),
Expand DownExpand Up@@ -1749,7 +1769,12 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 return;
 }
 },
 [applyPromptReplacement, handleInteractionModeChange, resolveActiveComposerTrigger],
 [
 applyPromptReplacement,
 handleInteractionModeChange,
 onStartNewThread,
 resolveActiveComposerTrigger,
 ],
 );

 const onComposerMenuItemHighlighted = useCallback(
Expand Down

6 changes: 5 additions & 1 deletion
apps/web/src/composer-logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,6 +360,10 @@ describe("isCollapsedCursorAdjacentToInlineToken", () => {
});

describe("parseStandaloneComposerSlashCommand", () => {
 it("parses standalone /new command", () => {
 expect(parseStandaloneComposerSlashCommand(" /NEW ")).toBe("new");
 });

 it("parses standalone /plan command", () => {
 expect(parseStandaloneComposerSlashCommand(" /plan ")).toBe("plan");
 });
Expand All@@ -369,6 +373,6 @@ describe("parseStandaloneComposerSlashCommand", () => {
 });

 it("ignores slash commands with extra message text", () => {
 expect(parseStandaloneComposerSlashCommand("/plan explain this")).toBeNull();
 expect(parseStandaloneComposerSlashCommand("/new explain this")).toBeNull();
 });
});

5 changes: 3 additions & 2 deletions
apps/web/src/composer-logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { splitPromptIntoComposerSegments } from "./composer-editor-mentions";
import { INLINE_TERMINAL_CONTEXT_PLACEHOLDER } from "./lib/terminalContext";

export type ComposerTriggerKind = "path" | "slash-command" | "skill";
export type ComposerSlashCommand = "model" | "plan" | "default";
export type ComposerSlashCommand = "new" | "model" | "plan" | "default";

export interface ComposerTrigger {
 kind: ComposerTriggerKind;
Expand DownExpand Up@@ -265,11 +265,12 @@ export function detectComposerTrigger(text: string, cursorInput: number): Compos
export function parseStandaloneComposerSlashCommand(
 text: string,
): Exclude<ComposerSlashCommand, "model"> | null {
 const match = /^\/(plan|default)\s*$/i.exec(text.trim());
 const match = /^\/(new|plan|default)\s*$/i.exec(text.trim());
 if (!match) {
 return null;
 }
 const command = match[1]?.toLowerCase();
 if (command === "new") return "new";
 if (command === "plan") return "plan";
 return "default";
}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add /new command for contextual threads#7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

tim-smart
wants to merge
1
commit into

from

 Open


Add /new command for contextual threads
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


18 changes: 18 additions & 0 deletions
apps/mobile/src/features/threads/NewTaskDraftRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { StaticScreenProps } from "@react-navigation/native";
import { useMemo } from "react";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import type { ComposerDraftWorkspaceSelection } from "../../state/use-composer-drafts";

import { NewTaskDraftScreen } from "./NewTaskDraftScreen";

Expand All@@ -10,8 +11,15 @@ type NewTaskDraftRouteParams = {
 readonly title?: string | string[];
 readonly pendingTaskId?: string | string[];
 readonly incomingShareId?: string | string[];
 readonly workspaceMode?: string | string[];
 readonly branch?: string | string[];
 readonly worktreePath?: string | string[];
};

function firstParam(value: string | string[] | undefined): string | undefined {
 return Array.isArray(value) ? value[0] : value;
}

export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraftRouteParams>) {
 const params = route.params ?? {};

Expand All@@ -27,6 +35,15 @@ export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraf
 }),
 [route.params],
 );
 const initialWorkspaceSelection = useMemo<ComposerDraftWorkspaceSelection | undefined>(() => {
 const mode = firstParam(params.workspaceMode);
 if (mode !== "local" && mode !== "worktree") return undefined;
 return {
 mode,
 branch: firstParam(params.branch) ?? null,
 worktreePath: firstParam(params.worktreePath) ?? null,
 };
 }, [route.params]);

 return (
 <>
Expand All@@ -37,6 +54,7 @@ export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraf
 />
 <NewTaskDraftScreen
 initialProjectRef={initialProjectRef}
 initialWorkspaceSelection={initialWorkspaceSelection}
 incomingShareId={
 Array.isArray(params.incomingShareId) ? params.incomingShareId[0] : params.incomingShareId
 }
Expand Down

30 changes: 30 additions & 0 deletions
apps/mobile/src/features/threads/NewTaskDraftScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,9 @@ import {
 getComposerDraftSnapshot,
 mergeComposerDraftContent,
 restoreComposerDraftSnapshot,
 updateComposerDraftSettings,
 type ComposerDraft,
 type ComposerDraftWorkspaceSelection,
} from "../../state/use-composer-drafts";
import { useProjects } from "../../state/entities";
import { deriveThreadTitleFromPrompt } from "../../lib/projectThreadStartTurn";
Expand DownExpand Up@@ -68,6 +70,7 @@ export function NewTaskDraftScreen(props: {
 readonly environmentId?: string;
 readonly projectId?: string;
 };
 readonly initialWorkspaceSelection?: ComposerDraftWorkspaceSelection;
 /** Queued outbox message id when editing an existing pending task. */
 readonly pendingTaskId?: string;
 /** Durable native share inbox item to merge into this project draft. */
Expand DownExpand Up@@ -294,6 +297,33 @@ export function NewTaskDraftScreen(props: {
 setProject,
 ]);

 const appliedInitialWorkspaceSelectionRef = useRef<ComposerDraftWorkspaceSelection | undefined>(
 undefined,
 );
 useEffect(() => {
 const selection = props.initialWorkspaceSelection;
 const initialEnvironmentId = props.initialProjectRef?.environmentId;
 const initialProjectId = props.initialProjectRef?.projectId;
 if (
 !selection ||
 !flow.draftKey ||
 !selectedProject ||
 selectedProject.environmentId !== initialEnvironmentId ||
 selectedProject.id !== initialProjectId ||
 appliedInitialWorkspaceSelectionRef.current === selection
 ) {
 return;
 }
 appliedInitialWorkspaceSelectionRef.current = selection;
 updateComposerDraftSettings(flow.draftKey, { workspaceSelection: selection });
 }, [
 flow.draftKey,
 props.initialProjectRef?.environmentId,
 props.initialProjectRef?.projectId,
 props.initialWorkspaceSelection,
 selectedProject,
 ]);

 useEffect(() => {
 if (!selectedProject) {
 loadedBranchesProjectKeyRef.current = null;
Expand Down

46 changes: 44 additions & 2 deletions
apps/mobile/src/features/threads/ThreadComposer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import type {
} from "@t3tools/contracts";
import {
 detectComposerTrigger,
 parseStandaloneComposerSlashCommand,
 replaceTextRange,
 serializeComposerFileLink,
 type ComposerTrigger,
Expand DownExpand Up@@ -110,6 +111,7 @@ export interface ThreadComposerProps {
 readonly onRemoveDraftImage: (imageId: string) => void;
 readonly onStopThread: () => void;
 readonly onSendMessage: () => Promise<MessageId | null>;
 readonly onStartNewThread: () => void;
 readonly onUpdateModelSelection: (modelSelection: ModelSelection) => void;
 readonly onUpdateRuntimeMode: (runtimeMode: RuntimeMode) => void;
 readonly onUpdateInteractionMode: (interactionMode: ProviderInteractionMode) => void;
Expand DownExpand Up@@ -372,6 +374,13 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 if (composerTrigger.kind === "slash-command") {
 const q = composerTrigger.query.toLowerCase();
 const allBuiltIn = [
 {
 id: "cmd:new",
 type: "slash-command" as const,
 command: "new",
 label: "/new",
 description: "Start a new thread here",
 },
 {
 id: "cmd:model",
 type: "slash-command" as const,
Expand DownExpand Up@@ -512,9 +521,20 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 }, [composerTrigger, pathSearch.entries, selectedProviderStatus]);

 // ── Handle command selection ──────────────────────────────
 const { onChangeDraftMessage, onUpdateInteractionMode, draftMessage, onSendMessage } = props;
 const {
 onChangeDraftMessage,
 onStartNewThread,
 onUpdateInteractionMode,
 draftMessage,
 onSendMessage,
 } = props;

 const handleSend = useCallback(async () => {
 if (parseStandaloneComposerSlashCommand(draftMessage) === "new") {
 onChangeDraftMessage("");
 onStartNewThread();
 return;
 }
 const threadKey = scopedThreadKey(props.environmentId, props.selectedThread.id);
 if (inFlightThreadIdsRef.current.has(threadKey)) return;
 inFlightThreadIdsRef.current.add(threadKey);
Expand All@@ -533,6 +553,9 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 }
 }, [
 onSendMessage,
 draftMessage,
 onChangeDraftMessage,
 onStartNewThread,
 props.environmentId,
 props.environmentLabel,
 props.selectedThread.id,
Expand All@@ -558,6 +581,19 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 return;
 }

 if (item.type === "slash-command" && item.command === "new") {
 const result = replaceTextRange(
 draftMessage,
 composerTrigger.rangeStart,
 composerTrigger.rangeEnd,
 "",
 );
 setComposerSelection({ start: result.cursor, end: result.cursor });
 onChangeDraftMessage(result.text);
 onStartNewThread();
 return;
 }

 let replacement = "";
 if (item.type === "path") {
 replacement = `${serializeComposerFileLink(item.path)} `;
Expand All@@ -578,7 +614,13 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 setComposerSelection({ start: result.cursor, end: result.cursor });
 onChangeDraftMessage(result.text);
 },
 [composerTrigger, draftMessage, onChangeDraftMessage, onUpdateInteractionMode],
 [
 composerTrigger,
 draftMessage,
 onChangeDraftMessage,
 onStartNewThread,
 onUpdateInteractionMode,
 ],
 );

 // ── Model menu ───────────────────────────────────────────
Expand Down

2 changes: 2 additions & 0 deletions
apps/mobile/src/features/threads/ThreadDetailScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ export interface ThreadDetailScreenProps {
 readonly onRemoveDraftImage: (imageId: string) => void;
 readonly onStopThread: () => void;
 readonly onSendMessage: () => Promise<MessageId | null>;
 readonly onStartNewThread: () => void;
 readonly onReconnectEnvironment: () => void;
 readonly onUpdateThreadModelSelection: (modelSelection: ModelSelection) => void;
 readonly onUpdateThreadRuntimeMode: (runtimeMode: RuntimeMode) => void;
Expand DownExpand Up@@ -439,6 +440,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 onRemoveDraftImage={props.onRemoveDraftImage}
 onStopThread={props.onStopThread}
 onSendMessage={handleSendMessage}
 onStartNewThread={props.onStartNewThread}
 onReconnectEnvironment={props.onReconnectEnvironment}
 onUpdateModelSelection={props.onUpdateThreadModelSelection}
 onUpdateRuntimeMode={props.onUpdateThreadRuntimeMode}
Expand Down

19 changes: 19 additions & 0 deletions
apps/mobile/src/features/threads/ThreadRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -308,6 +308,24 @@ function ThreadRouteContent(
 [knownTerminalSessions, selectedThreadProject?.workspaceRoot],
 );
 const selectedThreadDetailWorktreePath = selectedThreadDetail?.worktreePath ?? null;
 const handleStartNewThread = useCallback(() => {
 if (!selectedThread || !selectedThreadProject) return;
 const worktreePath = resolvePreferredThreadWorktreePath({
 threadShellWorktreePath: selectedThread.worktreePath ?? null,
 threadDetailWorktreePath: selectedThreadDetailWorktreePath,
 });
 navigation.navigate("NewTaskSheet", {
 screen: "NewTaskDraft",
 params: {
 environmentId: String(selectedThread.environmentId),
 projectId: String(selectedThread.projectId),
 title: selectedThreadProject.title,
 workspaceMode: "local",
 branch: selectedThread.branch ?? undefined,
 worktreePath: worktreePath ?? undefined,
 },
 });
 }, [navigation, selectedThread, selectedThreadDetailWorktreePath, selectedThreadProject]);
 const handleReconnectEnvironment = useCallback(() => {
 if (!environmentId) {
 return;
Expand DownExpand Up@@ -781,6 +799,7 @@ function ThreadRouteContent(
 serverConfig={serverConfig}
 onStopThread={handleStopThread}
 onSendMessage={composer.onSendMessage}
 onStartNewThread={handleStartNewThread}
 onReconnectEnvironment={handleReconnectEnvironment}
 onUpdateThreadModelSelection={composer.onUpdateModelSelection}
 onUpdateThreadRuntimeMode={composer.onUpdateRuntimeMode}
Expand Down

23 changes: 22 additions & 1 deletion
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3927,6 +3927,22 @@ function ChatViewContent(props: ChatViewProps) {
 ? (pendingServerThreadStartFromOriginByThreadId[activeThread?.id ?? ""] ??
 primaryServerSettings.newWorktreesStartFromOrigin)
 : false;
 const handleStartNewThread = useCallback(() => {
 if (!activeProjectRef) return;
 void handleNewThread(activeProjectRef, {
 branch: activeThreadBranch,
 worktreePath: activeWorktreePath,
 envMode,
 startFromOrigin,
 });
 }, [
 activeProjectRef,
 activeThreadBranch,
 activeWorktreePath,
 envMode,
 handleNewThread,
 startFromOrigin,
 ]);
 const sendEnvMode = resolveSendEnvMode({
 requestedEnvMode: envMode,
 isGitRepo,
Expand DownExpand Up@@ -4609,10 +4625,14 @@ function ChatViewContent(props: ChatViewProps) {
 ? parseStandaloneComposerSlashCommand(trimmed)
 : null;
 if (standaloneSlashCommand) {
 handleInteractionModeChange(standaloneSlashCommand);
 promptRef.current = "";
 clearComposerDraftContent(composerDraftTarget);
 composerRef.current?.resetCursorState();
 if (standaloneSlashCommand === "new") {
 handleStartNewThread();
 } else {
 handleInteractionModeChange(standaloneSlashCommand);
 }
 return;
 }
 if (!hasSendableContent) {
Expand DownExpand Up@@ -5949,6 +5969,7 @@ function ChatViewContent(props: ChatViewProps) {
 composerTerminalContextsRef={composerTerminalContextsRef}
 composerElementContextsRef={composerElementContextsRef}
 onSend={onSend}
 onStartNewThread={handleStartNewThread}
 onInterrupt={onInterrupt}
 onImplementPlanInNewThread={onImplementPlanInNewThread}
 onRespondToApproval={onRespondToApproval}
Expand Down

27 changes: 26 additions & 1 deletion
apps/web/src/components/chat/ChatComposer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -587,6 +587,7 @@ export interface ChatComposerProps {

 // Callbacks
 onSend: (e?: { preventDefault: () => void }) => void;
 onStartNewThread: () => void;
 onInterrupt: () => void;
 onImplementPlanInNewThread: () => void;
 onRespondToApproval: (
Expand DownExpand Up@@ -674,6 +675,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 composerTerminalContextsRef,
 composerElementContextsRef,
 onSend,
 onStartNewThread,
 onInterrupt,
 onImplementPlanInNewThread,
 onRespondToApproval,
Expand DownExpand Up@@ -1062,6 +1064,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 }
 if (composerTrigger.kind === "slash-command") {
 const builtInSlashCommandItems = [
 {
 id: "slash:new",
 type: "slash-command",
 command: "new",
 label: "/new",
 description: "Start a new thread in this worktree or directory",
 },
 {
 id: "slash:model",
 type: "slash-command",
Expand DownExpand Up@@ -1692,6 +1701,17 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 return;
 }
 if (item.type === "slash-command") {
 if (item.command === "new") {
 const applied = applyPromptReplacement(trigger.rangeStart, trigger.rangeEnd, "", {
 expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd),
 focusEditorAfterReplace: false,
 });
 if (applied) {
 setComposerHighlightedItemId(null);
 onStartNewThread();
 }
 return;
 }
 if (item.command === "model") {
 const applied = applyPromptReplacement(trigger.rangeStart, trigger.rangeEnd, "", {
 expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd),
Expand DownExpand Up@@ -1749,7 +1769,12 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 return;
 }
 },
 [applyPromptReplacement, handleInteractionModeChange, resolveActiveComposerTrigger],
 [
 applyPromptReplacement,
 handleInteractionModeChange,
 onStartNewThread,
 resolveActiveComposerTrigger,
 ],
 );

 const onComposerMenuItemHighlighted = useCallback(
Expand Down

6 changes: 5 additions & 1 deletion
apps/web/src/composer-logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,6 +360,10 @@ describe("isCollapsedCursorAdjacentToInlineToken", () => {
});

describe("parseStandaloneComposerSlashCommand", () => {
 it("parses standalone /new command", () => {
 expect(parseStandaloneComposerSlashCommand(" /NEW ")).toBe("new");
 });

 it("parses standalone /plan command", () => {
 expect(parseStandaloneComposerSlashCommand(" /plan ")).toBe("plan");
 });
Expand All@@ -369,6 +373,6 @@ describe("parseStandaloneComposerSlashCommand", () => {
 });

 it("ignores slash commands with extra message text", () => {
 expect(parseStandaloneComposerSlashCommand("/plan explain this")).toBeNull();
 expect(parseStandaloneComposerSlashCommand("/new explain this")).toBeNull();
 });
});

5 changes: 3 additions & 2 deletions
apps/web/src/composer-logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { splitPromptIntoComposerSegments } from "./composer-editor-mentions";
import { INLINE_TERMINAL_CONTEXT_PLACEHOLDER } from "./lib/terminalContext";

export type ComposerTriggerKind = "path" | "slash-command" | "skill";
export type ComposerSlashCommand = "model" | "plan" | "default";
export type ComposerSlashCommand = "new" | "model" | "plan" | "default";

export interface ComposerTrigger {
 kind: ComposerTriggerKind;
Expand DownExpand Up@@ -265,11 +265,12 @@ export function detectComposerTrigger(text: string, cursorInput: number): Compos
export function parseStandaloneComposerSlashCommand(
 text: string,
): Exclude<ComposerSlashCommand, "model"> | null {
 const match = /^\/(plan|default)\s*$/i.exec(text.trim());
 const match = /^\/(new|plan|default)\s*$/i.exec(text.trim());
 if (!match) {
 return null;
 }
 const command = match[1]?.toLowerCase();
 if (command === "new") return "new";
 if (command === "plan") return "plan";
 return "default";
}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} 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
Add /new command for contextual threads#7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

tim-smart
wants to merge
1
commit into

from

 Open


Add /new command for contextual threads
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


18 changes: 18 additions & 0 deletions
apps/mobile/src/features/threads/NewTaskDraftRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { StaticScreenProps } from "@react-navigation/native";
import { useMemo } from "react";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import type { ComposerDraftWorkspaceSelection } from "../../state/use-composer-drafts";

import { NewTaskDraftScreen } from "./NewTaskDraftScreen";

Expand All@@ -10,8 +11,15 @@ type NewTaskDraftRouteParams = {
 readonly title?: string | string[];
 readonly pendingTaskId?: string | string[];
 readonly incomingShareId?: string | string[];
 readonly workspaceMode?: string | string[];
 readonly branch?: string | string[];
 readonly worktreePath?: string | string[];
};

function firstParam(value: string | string[] | undefined): string | undefined {
 return Array.isArray(value) ? value[0] : value;
}

export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraftRouteParams>) {
 const params = route.params ?? {};

Expand All@@ -27,6 +35,15 @@ export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraf
 }),
 [route.params],
 );
 const initialWorkspaceSelection = useMemo<ComposerDraftWorkspaceSelection | undefined>(() => {
 const mode = firstParam(params.workspaceMode);
 if (mode !== "local" && mode !== "worktree") return undefined;
 return {
 mode,
 branch: firstParam(params.branch) ?? null,
 worktreePath: firstParam(params.worktreePath) ?? null,
 };
 }, [route.params]);

 return (
 <>
Expand All@@ -37,6 +54,7 @@ export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraf
 />
 <NewTaskDraftScreen
 initialProjectRef={initialProjectRef}
 initialWorkspaceSelection={initialWorkspaceSelection}
 incomingShareId={
 Array.isArray(params.incomingShareId) ? params.incomingShareId[0] : params.incomingShareId
 }
Expand Down

30 changes: 30 additions & 0 deletions
apps/mobile/src/features/threads/NewTaskDraftScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,9 @@ import {
 getComposerDraftSnapshot,
 mergeComposerDraftContent,
 restoreComposerDraftSnapshot,
 updateComposerDraftSettings,
 type ComposerDraft,
 type ComposerDraftWorkspaceSelection,
} from "../../state/use-composer-drafts";
import { useProjects } from "../../state/entities";
import { deriveThreadTitleFromPrompt } from "../../lib/projectThreadStartTurn";
Expand DownExpand Up@@ -68,6 +70,7 @@ export function NewTaskDraftScreen(props: {
 readonly environmentId?: string;
 readonly projectId?: string;
 };
 readonly initialWorkspaceSelection?: ComposerDraftWorkspaceSelection;
 /** Queued outbox message id when editing an existing pending task. */
 readonly pendingTaskId?: string;
 /** Durable native share inbox item to merge into this project draft. */
Expand DownExpand Up@@ -294,6 +297,33 @@ export function NewTaskDraftScreen(props: {
 setProject,
 ]);

 const appliedInitialWorkspaceSelectionRef = useRef<ComposerDraftWorkspaceSelection | undefined>(
 undefined,
 );
 useEffect(() => {
 const selection = props.initialWorkspaceSelection;
 const initialEnvironmentId = props.initialProjectRef?.environmentId;
 const initialProjectId = props.initialProjectRef?.projectId;
 if (
 !selection ||
 !flow.draftKey ||
 !selectedProject ||
 selectedProject.environmentId !== initialEnvironmentId ||
 selectedProject.id !== initialProjectId ||
 appliedInitialWorkspaceSelectionRef.current === selection
 ) {
 return;
 }
 appliedInitialWorkspaceSelectionRef.current = selection;
 updateComposerDraftSettings(flow.draftKey, { workspaceSelection: selection });
 }, [
 flow.draftKey,
 props.initialProjectRef?.environmentId,
 props.initialProjectRef?.projectId,
 props.initialWorkspaceSelection,
 selectedProject,
 ]);

 useEffect(() => {
 if (!selectedProject) {
 loadedBranchesProjectKeyRef.current = null;
Expand Down

46 changes: 44 additions & 2 deletions
apps/mobile/src/features/threads/ThreadComposer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import type {
} from "@t3tools/contracts";
import {
 detectComposerTrigger,
 parseStandaloneComposerSlashCommand,
 replaceTextRange,
 serializeComposerFileLink,
 type ComposerTrigger,
Expand DownExpand Up@@ -110,6 +111,7 @@ export interface ThreadComposerProps {
 readonly onRemoveDraftImage: (imageId: string) => void;
 readonly onStopThread: () => void;
 readonly onSendMessage: () => Promise<MessageId | null>;
 readonly onStartNewThread: () => void;
 readonly onUpdateModelSelection: (modelSelection: ModelSelection) => void;
 readonly onUpdateRuntimeMode: (runtimeMode: RuntimeMode) => void;
 readonly onUpdateInteractionMode: (interactionMode: ProviderInteractionMode) => void;
Expand DownExpand Up@@ -372,6 +374,13 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 if (composerTrigger.kind === "slash-command") {
 const q = composerTrigger.query.toLowerCase();
 const allBuiltIn = [
 {
 id: "cmd:new",
 type: "slash-command" as const,
 command: "new",
 label: "/new",
 description: "Start a new thread here",
 },
 {
 id: "cmd:model",
 type: "slash-command" as const,
Expand DownExpand Up@@ -512,9 +521,20 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 }, [composerTrigger, pathSearch.entries, selectedProviderStatus]);

 // ── Handle command selection ──────────────────────────────
 const { onChangeDraftMessage, onUpdateInteractionMode, draftMessage, onSendMessage } = props;
 const {
 onChangeDraftMessage,
 onStartNewThread,
 onUpdateInteractionMode,
 draftMessage,
 onSendMessage,
 } = props;

 const handleSend = useCallback(async () => {
 if (parseStandaloneComposerSlashCommand(draftMessage) === "new") {
 onChangeDraftMessage("");
 onStartNewThread();
 return;
 }
 const threadKey = scopedThreadKey(props.environmentId, props.selectedThread.id);
 if (inFlightThreadIdsRef.current.has(threadKey)) return;
 inFlightThreadIdsRef.current.add(threadKey);
Expand All@@ -533,6 +553,9 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 }
 }, [
 onSendMessage,
 draftMessage,
 onChangeDraftMessage,
 onStartNewThread,
 props.environmentId,
 props.environmentLabel,
 props.selectedThread.id,
Expand All@@ -558,6 +581,19 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 return;
 }

 if (item.type === "slash-command" && item.command === "new") {
 const result = replaceTextRange(
 draftMessage,
 composerTrigger.rangeStart,
 composerTrigger.rangeEnd,
 "",
 );
 setComposerSelection({ start: result.cursor, end: result.cursor });
 onChangeDraftMessage(result.text);
 onStartNewThread();
 return;
 }

 let replacement = "";
 if (item.type === "path") {
 replacement = `${serializeComposerFileLink(item.path)} `;
Expand All@@ -578,7 +614,13 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 setComposerSelection({ start: result.cursor, end: result.cursor });
 onChangeDraftMessage(result.text);
 },
 [composerTrigger, draftMessage, onChangeDraftMessage, onUpdateInteractionMode],
 [
 composerTrigger,
 draftMessage,
 onChangeDraftMessage,
 onStartNewThread,
 onUpdateInteractionMode,
 ],
 );

 // ── Model menu ───────────────────────────────────────────
Expand Down

2 changes: 2 additions & 0 deletions
apps/mobile/src/features/threads/ThreadDetailScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ export interface ThreadDetailScreenProps {
 readonly onRemoveDraftImage: (imageId: string) => void;
 readonly onStopThread: () => void;
 readonly onSendMessage: () => Promise<MessageId | null>;
 readonly onStartNewThread: () => void;
 readonly onReconnectEnvironment: () => void;
 readonly onUpdateThreadModelSelection: (modelSelection: ModelSelection) => void;
 readonly onUpdateThreadRuntimeMode: (runtimeMode: RuntimeMode) => void;
Expand DownExpand Up@@ -439,6 +440,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 onRemoveDraftImage={props.onRemoveDraftImage}
 onStopThread={props.onStopThread}
 onSendMessage={handleSendMessage}
 onStartNewThread={props.onStartNewThread}
 onReconnectEnvironment={props.onReconnectEnvironment}
 onUpdateModelSelection={props.onUpdateThreadModelSelection}
 onUpdateRuntimeMode={props.onUpdateThreadRuntimeMode}
Expand Down

19 changes: 19 additions & 0 deletions
apps/mobile/src/features/threads/ThreadRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -308,6 +308,24 @@ function ThreadRouteContent(
 [knownTerminalSessions, selectedThreadProject?.workspaceRoot],
 );
 const selectedThreadDetailWorktreePath = selectedThreadDetail?.worktreePath ?? null;
 const handleStartNewThread = useCallback(() => {
 if (!selectedThread || !selectedThreadProject) return;
 const worktreePath = resolvePreferredThreadWorktreePath({
 threadShellWorktreePath: selectedThread.worktreePath ?? null,
 threadDetailWorktreePath: selectedThreadDetailWorktreePath,
 });
 navigation.navigate("NewTaskSheet", {
 screen: "NewTaskDraft",
 params: {
 environmentId: String(selectedThread.environmentId),
 projectId: String(selectedThread.projectId),
 title: selectedThreadProject.title,
 workspaceMode: "local",
 branch: selectedThread.branch ?? undefined,
 worktreePath: worktreePath ?? undefined,
 },
 });
 }, [navigation, selectedThread, selectedThreadDetailWorktreePath, selectedThreadProject]);
 const handleReconnectEnvironment = useCallback(() => {
 if (!environmentId) {
 return;
Expand DownExpand Up@@ -781,6 +799,7 @@ function ThreadRouteContent(
 serverConfig={serverConfig}
 onStopThread={handleStopThread}
 onSendMessage={composer.onSendMessage}
 onStartNewThread={handleStartNewThread}
 onReconnectEnvironment={handleReconnectEnvironment}
 onUpdateThreadModelSelection={composer.onUpdateModelSelection}
 onUpdateThreadRuntimeMode={composer.onUpdateRuntimeMode}
Expand Down

23 changes: 22 additions & 1 deletion
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3927,6 +3927,22 @@ function ChatViewContent(props: ChatViewProps) {
 ? (pendingServerThreadStartFromOriginByThreadId[activeThread?.id ?? ""] ??
 primaryServerSettings.newWorktreesStartFromOrigin)
 : false;
 const handleStartNewThread = useCallback(() => {
 if (!activeProjectRef) return;
 void handleNewThread(activeProjectRef, {
 branch: activeThreadBranch,
 worktreePath: activeWorktreePath,
 envMode,
 startFromOrigin,
 });
 }, [
 activeProjectRef,
 activeThreadBranch,
 activeWorktreePath,
 envMode,
 handleNewThread,
 startFromOrigin,
 ]);
 const sendEnvMode = resolveSendEnvMode({
 requestedEnvMode: envMode,
 isGitRepo,
Expand DownExpand Up@@ -4609,10 +4625,14 @@ function ChatViewContent(props: ChatViewProps) {
 ? parseStandaloneComposerSlashCommand(trimmed)
 : null;
 if (standaloneSlashCommand) {
 handleInteractionModeChange(standaloneSlashCommand);
 promptRef.current = "";
 clearComposerDraftContent(composerDraftTarget);
 composerRef.current?.resetCursorState();
 if (standaloneSlashCommand === "new") {
 handleStartNewThread();
 } else {
 handleInteractionModeChange(standaloneSlashCommand);
 }
 return;
 }
 if (!hasSendableContent) {
Expand DownExpand Up@@ -5949,6 +5969,7 @@ function ChatViewContent(props: ChatViewProps) {
 composerTerminalContextsRef={composerTerminalContextsRef}
 composerElementContextsRef={composerElementContextsRef}
 onSend={onSend}
 onStartNewThread={handleStartNewThread}
 onInterrupt={onInterrupt}
 onImplementPlanInNewThread={onImplementPlanInNewThread}
 onRespondToApproval={onRespondToApproval}
Expand Down

27 changes: 26 additions & 1 deletion
apps/web/src/components/chat/ChatComposer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -587,6 +587,7 @@ export interface ChatComposerProps {

 // Callbacks
 onSend: (e?: { preventDefault: () => void }) => void;
 onStartNewThread: () => void;
 onInterrupt: () => void;
 onImplementPlanInNewThread: () => void;
 onRespondToApproval: (
Expand DownExpand Up@@ -674,6 +675,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 composerTerminalContextsRef,
 composerElementContextsRef,
 onSend,
 onStartNewThread,
 onInterrupt,
 onImplementPlanInNewThread,
 onRespondToApproval,
Expand DownExpand Up@@ -1062,6 +1064,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 }
 if (composerTrigger.kind === "slash-command") {
 const builtInSlashCommandItems = [
 {
 id: "slash:new",
 type: "slash-command",
 command: "new",
 label: "/new",
 description: "Start a new thread in this worktree or directory",
 },
 {
 id: "slash:model",
 type: "slash-command",
Expand DownExpand Up@@ -1692,6 +1701,17 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 return;
 }
 if (item.type === "slash-command") {
 if (item.command === "new") {
 const applied = applyPromptReplacement(trigger.rangeStart, trigger.rangeEnd, "", {
 expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd),
 focusEditorAfterReplace: false,
 });
 if (applied) {
 setComposerHighlightedItemId(null);
 onStartNewThread();
 }
 return;
 }
 if (item.command === "model") {
 const applied = applyPromptReplacement(trigger.rangeStart, trigger.rangeEnd, "", {
 expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd),
Expand DownExpand Up@@ -1749,7 +1769,12 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 return;
 }
 },
 [applyPromptReplacement, handleInteractionModeChange, resolveActiveComposerTrigger],
 [
 applyPromptReplacement,
 handleInteractionModeChange,
 onStartNewThread,
 resolveActiveComposerTrigger,
 ],
 );

 const onComposerMenuItemHighlighted = useCallback(
Expand Down

6 changes: 5 additions & 1 deletion
apps/web/src/composer-logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,6 +360,10 @@ describe("isCollapsedCursorAdjacentToInlineToken", () => {
});

describe("parseStandaloneComposerSlashCommand", () => {
 it("parses standalone /new command", () => {
 expect(parseStandaloneComposerSlashCommand(" /NEW ")).toBe("new");
 });

 it("parses standalone /plan command", () => {
 expect(parseStandaloneComposerSlashCommand(" /plan ")).toBe("plan");
 });
Expand All@@ -369,6 +373,6 @@ describe("parseStandaloneComposerSlashCommand", () => {
 });

 it("ignores slash commands with extra message text", () => {
 expect(parseStandaloneComposerSlashCommand("/plan explain this")).toBeNull();
 expect(parseStandaloneComposerSlashCommand("/new explain this")).toBeNull();
 });
});

5 changes: 3 additions & 2 deletions
apps/web/src/composer-logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { splitPromptIntoComposerSegments } from "./composer-editor-mentions";
import { INLINE_TERMINAL_CONTEXT_PLACEHOLDER } from "./lib/terminalContext";

export type ComposerTriggerKind = "path" | "slash-command" | "skill";
export type ComposerSlashCommand = "model" | "plan" | "default";
export type ComposerSlashCommand = "new" | "model" | "plan" | "default";

export interface ComposerTrigger {
 kind: ComposerTriggerKind;
Expand DownExpand Up@@ -265,11 +265,12 @@ export function detectComposerTrigger(text: string, cursorInput: number): Compos
export function parseStandaloneComposerSlashCommand(
 text: string,
): Exclude<ComposerSlashCommand, "model"> | null {
 const match = /^\/(plan|default)\s*$/i.exec(text.trim());
 const match = /^\/(new|plan|default)\s*$/i.exec(text.trim());
 if (!match) {
 return null;
 }
 const command = match[1]?.toLowerCase();
 if (command === "new") return "new";
 if (command === "plan") return "plan";
 return "default";
}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add /new command for contextual threads#7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

tim-smart
wants to merge
1
commit into

from

 Open


Add /new command for contextual threads
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


18 changes: 18 additions & 0 deletions
apps/mobile/src/features/threads/NewTaskDraftRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { StaticScreenProps } from "@react-navigation/native";
import { useMemo } from "react";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import type { ComposerDraftWorkspaceSelection } from "../../state/use-composer-drafts";

import { NewTaskDraftScreen } from "./NewTaskDraftScreen";

Expand All@@ -10,8 +11,15 @@ type NewTaskDraftRouteParams = {
 readonly title?: string | string[];
 readonly pendingTaskId?: string | string[];
 readonly incomingShareId?: string | string[];
 readonly workspaceMode?: string | string[];
 readonly branch?: string | string[];
 readonly worktreePath?: string | string[];
};

function firstParam(value: string | string[] | undefined): string | undefined {
 return Array.isArray(value) ? value[0] : value;
}

export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraftRouteParams>) {
 const params = route.params ?? {};

Expand All@@ -27,6 +35,15 @@ export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraf
 }),
 [route.params],
 );
 const initialWorkspaceSelection = useMemo<ComposerDraftWorkspaceSelection | undefined>(() => {
 const mode = firstParam(params.workspaceMode);
 if (mode !== "local" && mode !== "worktree") return undefined;
 return {
 mode,
 branch: firstParam(params.branch) ?? null,
 worktreePath: firstParam(params.worktreePath) ?? null,
 };
 }, [route.params]);

 return (
 <>
Expand All@@ -37,6 +54,7 @@ export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraf
 />
 <NewTaskDraftScreen
 initialProjectRef={initialProjectRef}
 initialWorkspaceSelection={initialWorkspaceSelection}
 incomingShareId={
 Array.isArray(params.incomingShareId) ? params.incomingShareId[0] : params.incomingShareId
 }
Expand Down

30 changes: 30 additions & 0 deletions
apps/mobile/src/features/threads/NewTaskDraftScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,9 @@ import {
 getComposerDraftSnapshot,
 mergeComposerDraftContent,
 restoreComposerDraftSnapshot,
 updateComposerDraftSettings,
 type ComposerDraft,
 type ComposerDraftWorkspaceSelection,
} from "../../state/use-composer-drafts";
import { useProjects } from "../../state/entities";
import { deriveThreadTitleFromPrompt } from "../../lib/projectThreadStartTurn";
Expand DownExpand Up@@ -68,6 +70,7 @@ export function NewTaskDraftScreen(props: {
 readonly environmentId?: string;
 readonly projectId?: string;
 };
 readonly initialWorkspaceSelection?: ComposerDraftWorkspaceSelection;
 /** Queued outbox message id when editing an existing pending task. */
 readonly pendingTaskId?: string;
 /** Durable native share inbox item to merge into this project draft. */
Expand DownExpand Up@@ -294,6 +297,33 @@ export function NewTaskDraftScreen(props: {
 setProject,
 ]);

 const appliedInitialWorkspaceSelectionRef = useRef<ComposerDraftWorkspaceSelection | undefined>(
 undefined,
 );
 useEffect(() => {
 const selection = props.initialWorkspaceSelection;
 const initialEnvironmentId = props.initialProjectRef?.environmentId;
 const initialProjectId = props.initialProjectRef?.projectId;
 if (
 !selection ||
 !flow.draftKey ||
 !selectedProject ||
 selectedProject.environmentId !== initialEnvironmentId ||
 selectedProject.id !== initialProjectId ||
 appliedInitialWorkspaceSelectionRef.current === selection
 ) {
 return;
 }
 appliedInitialWorkspaceSelectionRef.current = selection;
 updateComposerDraftSettings(flow.draftKey, { workspaceSelection: selection });
 }, [
 flow.draftKey,
 props.initialProjectRef?.environmentId,
 props.initialProjectRef?.projectId,
 props.initialWorkspaceSelection,
 selectedProject,
 ]);

 useEffect(() => {
 if (!selectedProject) {
 loadedBranchesProjectKeyRef.current = null;
Expand Down

46 changes: 44 additions & 2 deletions
apps/mobile/src/features/threads/ThreadComposer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import type {
} from "@t3tools/contracts";
import {
 detectComposerTrigger,
 parseStandaloneComposerSlashCommand,
 replaceTextRange,
 serializeComposerFileLink,
 type ComposerTrigger,
Expand DownExpand Up@@ -110,6 +111,7 @@ export interface ThreadComposerProps {
 readonly onRemoveDraftImage: (imageId: string) => void;
 readonly onStopThread: () => void;
 readonly onSendMessage: () => Promise<MessageId | null>;
 readonly onStartNewThread: () => void;
 readonly onUpdateModelSelection: (modelSelection: ModelSelection) => void;
 readonly onUpdateRuntimeMode: (runtimeMode: RuntimeMode) => void;
 readonly onUpdateInteractionMode: (interactionMode: ProviderInteractionMode) => void;
Expand DownExpand Up@@ -372,6 +374,13 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 if (composerTrigger.kind === "slash-command") {
 const q = composerTrigger.query.toLowerCase();
 const allBuiltIn = [
 {
 id: "cmd:new",
 type: "slash-command" as const,
 command: "new",
 label: "/new",
 description: "Start a new thread here",
 },
 {
 id: "cmd:model",
 type: "slash-command" as const,
Expand DownExpand Up@@ -512,9 +521,20 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 }, [composerTrigger, pathSearch.entries, selectedProviderStatus]);

 // ── Handle command selection ──────────────────────────────
 const { onChangeDraftMessage, onUpdateInteractionMode, draftMessage, onSendMessage } = props;
 const {
 onChangeDraftMessage,
 onStartNewThread,
 onUpdateInteractionMode,
 draftMessage,
 onSendMessage,
 } = props;

 const handleSend = useCallback(async () => {
 if (parseStandaloneComposerSlashCommand(draftMessage) === "new") {
 onChangeDraftMessage("");
 onStartNewThread();
 return;
 }
 const threadKey = scopedThreadKey(props.environmentId, props.selectedThread.id);
 if (inFlightThreadIdsRef.current.has(threadKey)) return;
 inFlightThreadIdsRef.current.add(threadKey);
Expand All@@ -533,6 +553,9 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 }
 }, [
 onSendMessage,
 draftMessage,
 onChangeDraftMessage,
 onStartNewThread,
 props.environmentId,
 props.environmentLabel,
 props.selectedThread.id,
Expand All@@ -558,6 +581,19 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 return;
 }

 if (item.type === "slash-command" && item.command === "new") {
 const result = replaceTextRange(
 draftMessage,
 composerTrigger.rangeStart,
 composerTrigger.rangeEnd,
 "",
 );
 setComposerSelection({ start: result.cursor, end: result.cursor });
 onChangeDraftMessage(result.text);
 onStartNewThread();
 return;
 }

 let replacement = "";
 if (item.type === "path") {
 replacement = `${serializeComposerFileLink(item.path)} `;
Expand All@@ -578,7 +614,13 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 setComposerSelection({ start: result.cursor, end: result.cursor });
 onChangeDraftMessage(result.text);
 },
 [composerTrigger, draftMessage, onChangeDraftMessage, onUpdateInteractionMode],
 [
 composerTrigger,
 draftMessage,
 onChangeDraftMessage,
 onStartNewThread,
 onUpdateInteractionMode,
 ],
 );

 // ── Model menu ───────────────────────────────────────────
Expand Down

2 changes: 2 additions & 0 deletions
apps/mobile/src/features/threads/ThreadDetailScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ export interface ThreadDetailScreenProps {
 readonly onRemoveDraftImage: (imageId: string) => void;
 readonly onStopThread: () => void;
 readonly onSendMessage: () => Promise<MessageId | null>;
 readonly onStartNewThread: () => void;
 readonly onReconnectEnvironment: () => void;
 readonly onUpdateThreadModelSelection: (modelSelection: ModelSelection) => void;
 readonly onUpdateThreadRuntimeMode: (runtimeMode: RuntimeMode) => void;
Expand DownExpand Up@@ -439,6 +440,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 onRemoveDraftImage={props.onRemoveDraftImage}
 onStopThread={props.onStopThread}
 onSendMessage={handleSendMessage}
 onStartNewThread={props.onStartNewThread}
 onReconnectEnvironment={props.onReconnectEnvironment}
 onUpdateModelSelection={props.onUpdateThreadModelSelection}
 onUpdateRuntimeMode={props.onUpdateThreadRuntimeMode}
Expand Down

19 changes: 19 additions & 0 deletions
apps/mobile/src/features/threads/ThreadRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -308,6 +308,24 @@ function ThreadRouteContent(
 [knownTerminalSessions, selectedThreadProject?.workspaceRoot],
 );
 const selectedThreadDetailWorktreePath = selectedThreadDetail?.worktreePath ?? null;
 const handleStartNewThread = useCallback(() => {
 if (!selectedThread || !selectedThreadProject) return;
 const worktreePath = resolvePreferredThreadWorktreePath({
 threadShellWorktreePath: selectedThread.worktreePath ?? null,
 threadDetailWorktreePath: selectedThreadDetailWorktreePath,
 });
 navigation.navigate("NewTaskSheet", {
 screen: "NewTaskDraft",
 params: {
 environmentId: String(selectedThread.environmentId),
 projectId: String(selectedThread.projectId),
 title: selectedThreadProject.title,
 workspaceMode: "local",
 branch: selectedThread.branch ?? undefined,
 worktreePath: worktreePath ?? undefined,
 },
 });
 }, [navigation, selectedThread, selectedThreadDetailWorktreePath, selectedThreadProject]);
 const handleReconnectEnvironment = useCallback(() => {
 if (!environmentId) {
 return;
Expand DownExpand Up@@ -781,6 +799,7 @@ function ThreadRouteContent(
 serverConfig={serverConfig}
 onStopThread={handleStopThread}
 onSendMessage={composer.onSendMessage}
 onStartNewThread={handleStartNewThread}
 onReconnectEnvironment={handleReconnectEnvironment}
 onUpdateThreadModelSelection={composer.onUpdateModelSelection}
 onUpdateThreadRuntimeMode={composer.onUpdateRuntimeMode}
Expand Down

23 changes: 22 additions & 1 deletion
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3927,6 +3927,22 @@ function ChatViewContent(props: ChatViewProps) {
 ? (pendingServerThreadStartFromOriginByThreadId[activeThread?.id ?? ""] ??
 primaryServerSettings.newWorktreesStartFromOrigin)
 : false;
 const handleStartNewThread = useCallback(() => {
 if (!activeProjectRef) return;
 void handleNewThread(activeProjectRef, {
 branch: activeThreadBranch,
 worktreePath: activeWorktreePath,
 envMode,
 startFromOrigin,
 });
 }, [
 activeProjectRef,
 activeThreadBranch,
 activeWorktreePath,
 envMode,
 handleNewThread,
 startFromOrigin,
 ]);
 const sendEnvMode = resolveSendEnvMode({
 requestedEnvMode: envMode,
 isGitRepo,
Expand DownExpand Up@@ -4609,10 +4625,14 @@ function ChatViewContent(props: ChatViewProps) {
 ? parseStandaloneComposerSlashCommand(trimmed)
 : null;
 if (standaloneSlashCommand) {
 handleInteractionModeChange(standaloneSlashCommand);
 promptRef.current = "";
 clearComposerDraftContent(composerDraftTarget);
 composerRef.current?.resetCursorState();
 if (standaloneSlashCommand === "new") {
 handleStartNewThread();
 } else {
 handleInteractionModeChange(standaloneSlashCommand);
 }
 return;
 }
 if (!hasSendableContent) {
Expand DownExpand Up@@ -5949,6 +5969,7 @@ function ChatViewContent(props: ChatViewProps) {
 composerTerminalContextsRef={composerTerminalContextsRef}
 composerElementContextsRef={composerElementContextsRef}
 onSend={onSend}
 onStartNewThread={handleStartNewThread}
 onInterrupt={onInterrupt}
 onImplementPlanInNewThread={onImplementPlanInNewThread}
 onRespondToApproval={onRespondToApproval}
Expand Down

27 changes: 26 additions & 1 deletion
apps/web/src/components/chat/ChatComposer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -587,6 +587,7 @@ export interface ChatComposerProps {

 // Callbacks
 onSend: (e?: { preventDefault: () => void }) => void;
 onStartNewThread: () => void;
 onInterrupt: () => void;
 onImplementPlanInNewThread: () => void;
 onRespondToApproval: (
Expand DownExpand Up@@ -674,6 +675,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 composerTerminalContextsRef,
 composerElementContextsRef,
 onSend,
 onStartNewThread,
 onInterrupt,
 onImplementPlanInNewThread,
 onRespondToApproval,
Expand DownExpand Up@@ -1062,6 +1064,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 }
 if (composerTrigger.kind === "slash-command") {
 const builtInSlashCommandItems = [
 {
 id: "slash:new",
 type: "slash-command",
 command: "new",
 label: "/new",
 description: "Start a new thread in this worktree or directory",
 },
 {
 id: "slash:model",
 type: "slash-command",
Expand DownExpand Up@@ -1692,6 +1701,17 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 return;
 }
 if (item.type === "slash-command") {
 if (item.command === "new") {
 const applied = applyPromptReplacement(trigger.rangeStart, trigger.rangeEnd, "", {
 expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd),
 focusEditorAfterReplace: false,
 });
 if (applied) {
 setComposerHighlightedItemId(null);
 onStartNewThread();
 }
 return;
 }
 if (item.command === "model") {
 const applied = applyPromptReplacement(trigger.rangeStart, trigger.rangeEnd, "", {
 expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd),
Expand DownExpand Up@@ -1749,7 +1769,12 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 return;
 }
 },
 [applyPromptReplacement, handleInteractionModeChange, resolveActiveComposerTrigger],
 [
 applyPromptReplacement,
 handleInteractionModeChange,
 onStartNewThread,
 resolveActiveComposerTrigger,
 ],
 );

 const onComposerMenuItemHighlighted = useCallback(
Expand Down

6 changes: 5 additions & 1 deletion
apps/web/src/composer-logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,6 +360,10 @@ describe("isCollapsedCursorAdjacentToInlineToken", () => {
});

describe("parseStandaloneComposerSlashCommand", () => {
 it("parses standalone /new command", () => {
 expect(parseStandaloneComposerSlashCommand(" /NEW ")).toBe("new");
 });

 it("parses standalone /plan command", () => {
 expect(parseStandaloneComposerSlashCommand(" /plan ")).toBe("plan");
 });
Expand All@@ -369,6 +373,6 @@ describe("parseStandaloneComposerSlashCommand", () => {
 });

 it("ignores slash commands with extra message text", () => {
 expect(parseStandaloneComposerSlashCommand("/plan explain this")).toBeNull();
 expect(parseStandaloneComposerSlashCommand("/new explain this")).toBeNull();
 });
});

5 changes: 3 additions & 2 deletions
apps/web/src/composer-logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { splitPromptIntoComposerSegments } from "./composer-editor-mentions";
import { INLINE_TERMINAL_CONTEXT_PLACEHOLDER } from "./lib/terminalContext";

export type ComposerTriggerKind = "path" | "slash-command" | "skill";
export type ComposerSlashCommand = "model" | "plan" | "default";
export type ComposerSlashCommand = "new" | "model" | "plan" | "default";

export interface ComposerTrigger {
 kind: ComposerTriggerKind;
Expand DownExpand Up@@ -265,11 +265,12 @@ export function detectComposerTrigger(text: string, cursorInput: number): Compos
export function parseStandaloneComposerSlashCommand(
 text: string,
): Exclude<ComposerSlashCommand, "model"> | null {
 const match = /^\/(plan|default)\s*$/i.exec(text.trim());
 const match = /^\/(new|plan|default)\s*$/i.exec(text.trim());
 if (!match) {
 return null;
 }
 const command = match[1]?.toLowerCase();
 if (command === "new") return "new";
 if (command === "plan") return "plan";
 return "default";
}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add /new command for contextual threads#7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

tim-smart
wants to merge
1
commit into

from

 Open


Add /new command for contextual threads
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


18 changes: 18 additions & 0 deletions
apps/mobile/src/features/threads/NewTaskDraftRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { StaticScreenProps } from "@react-navigation/native";
import { useMemo } from "react";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import type { ComposerDraftWorkspaceSelection } from "../../state/use-composer-drafts";

import { NewTaskDraftScreen } from "./NewTaskDraftScreen";

Expand All@@ -10,8 +11,15 @@ type NewTaskDraftRouteParams = {
 readonly title?: string | string[];
 readonly pendingTaskId?: string | string[];
 readonly incomingShareId?: string | string[];
 readonly workspaceMode?: string | string[];
 readonly branch?: string | string[];
 readonly worktreePath?: string | string[];
};

function firstParam(value: string | string[] | undefined): string | undefined {
 return Array.isArray(value) ? value[0] : value;
}

export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraftRouteParams>) {
 const params = route.params ?? {};

Expand All@@ -27,6 +35,15 @@ export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraf
 }),
 [route.params],
 );
 const initialWorkspaceSelection = useMemo<ComposerDraftWorkspaceSelection | undefined>(() => {
 const mode = firstParam(params.workspaceMode);
 if (mode !== "local" && mode !== "worktree") return undefined;
 return {
 mode,
 branch: firstParam(params.branch) ?? null,
 worktreePath: firstParam(params.worktreePath) ?? null,
 };
 }, [route.params]);

 return (
 <>
Expand All@@ -37,6 +54,7 @@ export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraf
 />
 <NewTaskDraftScreen
 initialProjectRef={initialProjectRef}
 initialWorkspaceSelection={initialWorkspaceSelection}
 incomingShareId={
 Array.isArray(params.incomingShareId) ? params.incomingShareId[0] : params.incomingShareId
 }
Expand Down

30 changes: 30 additions & 0 deletions
apps/mobile/src/features/threads/NewTaskDraftScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,9 @@ import {
 getComposerDraftSnapshot,
 mergeComposerDraftContent,
 restoreComposerDraftSnapshot,
 updateComposerDraftSettings,
 type ComposerDraft,
 type ComposerDraftWorkspaceSelection,
} from "../../state/use-composer-drafts";
import { useProjects } from "../../state/entities";
import { deriveThreadTitleFromPrompt } from "../../lib/projectThreadStartTurn";
Expand DownExpand Up@@ -68,6 +70,7 @@ export function NewTaskDraftScreen(props: {
 readonly environmentId?: string;
 readonly projectId?: string;
 };
 readonly initialWorkspaceSelection?: ComposerDraftWorkspaceSelection;
 /** Queued outbox message id when editing an existing pending task. */
 readonly pendingTaskId?: string;
 /** Durable native share inbox item to merge into this project draft. */
Expand DownExpand Up@@ -294,6 +297,33 @@ export function NewTaskDraftScreen(props: {
 setProject,
 ]);

 const appliedInitialWorkspaceSelectionRef = useRef<ComposerDraftWorkspaceSelection | undefined>(
 undefined,
 );
 useEffect(() => {
 const selection = props.initialWorkspaceSelection;
 const initialEnvironmentId = props.initialProjectRef?.environmentId;
 const initialProjectId = props.initialProjectRef?.projectId;
 if (
 !selection ||
 !flow.draftKey ||
 !selectedProject ||
 selectedProject.environmentId !== initialEnvironmentId ||
 selectedProject.id !== initialProjectId ||
 appliedInitialWorkspaceSelectionRef.current === selection
 ) {
 return;
 }
 appliedInitialWorkspaceSelectionRef.current = selection;
 updateComposerDraftSettings(flow.draftKey, { workspaceSelection: selection });
 }, [
 flow.draftKey,
 props.initialProjectRef?.environmentId,
 props.initialProjectRef?.projectId,
 props.initialWorkspaceSelection,
 selectedProject,
 ]);

 useEffect(() => {
 if (!selectedProject) {
 loadedBranchesProjectKeyRef.current = null;
Expand Down

46 changes: 44 additions & 2 deletions
apps/mobile/src/features/threads/ThreadComposer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import type {
} from "@t3tools/contracts";
import {
 detectComposerTrigger,
 parseStandaloneComposerSlashCommand,
 replaceTextRange,
 serializeComposerFileLink,
 type ComposerTrigger,
Expand DownExpand Up@@ -110,6 +111,7 @@ export interface ThreadComposerProps {
 readonly onRemoveDraftImage: (imageId: string) => void;
 readonly onStopThread: () => void;
 readonly onSendMessage: () => Promise<MessageId | null>;
 readonly onStartNewThread: () => void;
 readonly onUpdateModelSelection: (modelSelection: ModelSelection) => void;
 readonly onUpdateRuntimeMode: (runtimeMode: RuntimeMode) => void;
 readonly onUpdateInteractionMode: (interactionMode: ProviderInteractionMode) => void;
Expand DownExpand Up@@ -372,6 +374,13 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 if (composerTrigger.kind === "slash-command") {
 const q = composerTrigger.query.toLowerCase();
 const allBuiltIn = [
 {
 id: "cmd:new",
 type: "slash-command" as const,
 command: "new",
 label: "/new",
 description: "Start a new thread here",
 },
 {
 id: "cmd:model",
 type: "slash-command" as const,
Expand DownExpand Up@@ -512,9 +521,20 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 }, [composerTrigger, pathSearch.entries, selectedProviderStatus]);

 // ── Handle command selection ──────────────────────────────
 const { onChangeDraftMessage, onUpdateInteractionMode, draftMessage, onSendMessage } = props;
 const {
 onChangeDraftMessage,
 onStartNewThread,
 onUpdateInteractionMode,
 draftMessage,
 onSendMessage,
 } = props;

 const handleSend = useCallback(async () => {
 if (parseStandaloneComposerSlashCommand(draftMessage) === "new") {
 onChangeDraftMessage("");
 onStartNewThread();
 return;
 }
 const threadKey = scopedThreadKey(props.environmentId, props.selectedThread.id);
 if (inFlightThreadIdsRef.current.has(threadKey)) return;
 inFlightThreadIdsRef.current.add(threadKey);
Expand All@@ -533,6 +553,9 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 }
 }, [
 onSendMessage,
 draftMessage,
 onChangeDraftMessage,
 onStartNewThread,
 props.environmentId,
 props.environmentLabel,
 props.selectedThread.id,
Expand All@@ -558,6 +581,19 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 return;
 }

 if (item.type === "slash-command" && item.command === "new") {
 const result = replaceTextRange(
 draftMessage,
 composerTrigger.rangeStart,
 composerTrigger.rangeEnd,
 "",
 );
 setComposerSelection({ start: result.cursor, end: result.cursor });
 onChangeDraftMessage(result.text);
 onStartNewThread();
 return;
 }

 let replacement = "";
 if (item.type === "path") {
 replacement = `${serializeComposerFileLink(item.path)} `;
Expand All@@ -578,7 +614,13 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 setComposerSelection({ start: result.cursor, end: result.cursor });
 onChangeDraftMessage(result.text);
 },
 [composerTrigger, draftMessage, onChangeDraftMessage, onUpdateInteractionMode],
 [
 composerTrigger,
 draftMessage,
 onChangeDraftMessage,
 onStartNewThread,
 onUpdateInteractionMode,
 ],
 );

 // ── Model menu ───────────────────────────────────────────
Expand Down

2 changes: 2 additions & 0 deletions
apps/mobile/src/features/threads/ThreadDetailScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ export interface ThreadDetailScreenProps {
 readonly onRemoveDraftImage: (imageId: string) => void;
 readonly onStopThread: () => void;
 readonly onSendMessage: () => Promise<MessageId | null>;
 readonly onStartNewThread: () => void;
 readonly onReconnectEnvironment: () => void;
 readonly onUpdateThreadModelSelection: (modelSelection: ModelSelection) => void;
 readonly onUpdateThreadRuntimeMode: (runtimeMode: RuntimeMode) => void;
Expand DownExpand Up@@ -439,6 +440,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 onRemoveDraftImage={props.onRemoveDraftImage}
 onStopThread={props.onStopThread}
 onSendMessage={handleSendMessage}
 onStartNewThread={props.onStartNewThread}
 onReconnectEnvironment={props.onReconnectEnvironment}
 onUpdateModelSelection={props.onUpdateThreadModelSelection}
 onUpdateRuntimeMode={props.onUpdateThreadRuntimeMode}
Expand Down

19 changes: 19 additions & 0 deletions
apps/mobile/src/features/threads/ThreadRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -308,6 +308,24 @@ function ThreadRouteContent(
 [knownTerminalSessions, selectedThreadProject?.workspaceRoot],
 );
 const selectedThreadDetailWorktreePath = selectedThreadDetail?.worktreePath ?? null;
 const handleStartNewThread = useCallback(() => {
 if (!selectedThread || !selectedThreadProject) return;
 const worktreePath = resolvePreferredThreadWorktreePath({
 threadShellWorktreePath: selectedThread.worktreePath ?? null,
 threadDetailWorktreePath: selectedThreadDetailWorktreePath,
 });
 navigation.navigate("NewTaskSheet", {
 screen: "NewTaskDraft",
 params: {
 environmentId: String(selectedThread.environmentId),
 projectId: String(selectedThread.projectId),
 title: selectedThreadProject.title,
 workspaceMode: "local",
 branch: selectedThread.branch ?? undefined,
 worktreePath: worktreePath ?? undefined,
 },
 });
 }, [navigation, selectedThread, selectedThreadDetailWorktreePath, selectedThreadProject]);
 const handleReconnectEnvironment = useCallback(() => {
 if (!environmentId) {
 return;
Expand DownExpand Up@@ -781,6 +799,7 @@ function ThreadRouteContent(
 serverConfig={serverConfig}
 onStopThread={handleStopThread}
 onSendMessage={composer.onSendMessage}
 onStartNewThread={handleStartNewThread}
 onReconnectEnvironment={handleReconnectEnvironment}
 onUpdateThreadModelSelection={composer.onUpdateModelSelection}
 onUpdateThreadRuntimeMode={composer.onUpdateRuntimeMode}
Expand Down

23 changes: 22 additions & 1 deletion
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3927,6 +3927,22 @@ function ChatViewContent(props: ChatViewProps) {
 ? (pendingServerThreadStartFromOriginByThreadId[activeThread?.id ?? ""] ??
 primaryServerSettings.newWorktreesStartFromOrigin)
 : false;
 const handleStartNewThread = useCallback(() => {
 if (!activeProjectRef) return;
 void handleNewThread(activeProjectRef, {
 branch: activeThreadBranch,
 worktreePath: activeWorktreePath,
 envMode,
 startFromOrigin,
 });
 }, [
 activeProjectRef,
 activeThreadBranch,
 activeWorktreePath,
 envMode,
 handleNewThread,
 startFromOrigin,
 ]);
 const sendEnvMode = resolveSendEnvMode({
 requestedEnvMode: envMode,
 isGitRepo,
Expand DownExpand Up@@ -4609,10 +4625,14 @@ function ChatViewContent(props: ChatViewProps) {
 ? parseStandaloneComposerSlashCommand(trimmed)
 : null;
 if (standaloneSlashCommand) {
 handleInteractionModeChange(standaloneSlashCommand);
 promptRef.current = "";
 clearComposerDraftContent(composerDraftTarget);
 composerRef.current?.resetCursorState();
 if (standaloneSlashCommand === "new") {
 handleStartNewThread();
 } else {
 handleInteractionModeChange(standaloneSlashCommand);
 }
 return;
 }
 if (!hasSendableContent) {
Expand DownExpand Up@@ -5949,6 +5969,7 @@ function ChatViewContent(props: ChatViewProps) {
 composerTerminalContextsRef={composerTerminalContextsRef}
 composerElementContextsRef={composerElementContextsRef}
 onSend={onSend}
 onStartNewThread={handleStartNewThread}
 onInterrupt={onInterrupt}
 onImplementPlanInNewThread={onImplementPlanInNewThread}
 onRespondToApproval={onRespondToApproval}
Expand Down

27 changes: 26 additions & 1 deletion
apps/web/src/components/chat/ChatComposer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -587,6 +587,7 @@ export interface ChatComposerProps {

 // Callbacks
 onSend: (e?: { preventDefault: () => void }) => void;
 onStartNewThread: () => void;
 onInterrupt: () => void;
 onImplementPlanInNewThread: () => void;
 onRespondToApproval: (
Expand DownExpand Up@@ -674,6 +675,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 composerTerminalContextsRef,
 composerElementContextsRef,
 onSend,
 onStartNewThread,
 onInterrupt,
 onImplementPlanInNewThread,
 onRespondToApproval,
Expand DownExpand Up@@ -1062,6 +1064,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 }
 if (composerTrigger.kind === "slash-command") {
 const builtInSlashCommandItems = [
 {
 id: "slash:new",
 type: "slash-command",
 command: "new",
 label: "/new",
 description: "Start a new thread in this worktree or directory",
 },
 {
 id: "slash:model",
 type: "slash-command",
Expand DownExpand Up@@ -1692,6 +1701,17 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 return;
 }
 if (item.type === "slash-command") {
 if (item.command === "new") {
 const applied = applyPromptReplacement(trigger.rangeStart, trigger.rangeEnd, "", {
 expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd),
 focusEditorAfterReplace: false,
 });
 if (applied) {
 setComposerHighlightedItemId(null);
 onStartNewThread();
 }
 return;
 }
 if (item.command === "model") {
 const applied = applyPromptReplacement(trigger.rangeStart, trigger.rangeEnd, "", {
 expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd),
Expand DownExpand Up@@ -1749,7 +1769,12 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 return;
 }
 },
 [applyPromptReplacement, handleInteractionModeChange, resolveActiveComposerTrigger],
 [
 applyPromptReplacement,
 handleInteractionModeChange,
 onStartNewThread,
 resolveActiveComposerTrigger,
 ],
 );

 const onComposerMenuItemHighlighted = useCallback(
Expand Down

6 changes: 5 additions & 1 deletion
apps/web/src/composer-logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,6 +360,10 @@ describe("isCollapsedCursorAdjacentToInlineToken", () => {
});

describe("parseStandaloneComposerSlashCommand", () => {
 it("parses standalone /new command", () => {
 expect(parseStandaloneComposerSlashCommand(" /NEW ")).toBe("new");
 });

 it("parses standalone /plan command", () => {
 expect(parseStandaloneComposerSlashCommand(" /plan ")).toBe("plan");
 });
Expand All@@ -369,6 +373,6 @@ describe("parseStandaloneComposerSlashCommand", () => {
 });

 it("ignores slash commands with extra message text", () => {
 expect(parseStandaloneComposerSlashCommand("/plan explain this")).toBeNull();
 expect(parseStandaloneComposerSlashCommand("/new explain this")).toBeNull();
 });
});

5 changes: 3 additions & 2 deletions
apps/web/src/composer-logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { splitPromptIntoComposerSegments } from "./composer-editor-mentions";
import { INLINE_TERMINAL_CONTEXT_PLACEHOLDER } from "./lib/terminalContext";

export type ComposerTriggerKind = "path" | "slash-command" | "skill";
export type ComposerSlashCommand = "model" | "plan" | "default";
export type ComposerSlashCommand = "new" | "model" | "plan" | "default";

export interface ComposerTrigger {
 kind: ComposerTriggerKind;
Expand DownExpand Up@@ -265,11 +265,12 @@ export function detectComposerTrigger(text: string, cursorInput: number): Compos
export function parseStandaloneComposerSlashCommand(
 text: string,
): Exclude<ComposerSlashCommand, "model"> | null {
 const match = /^\/(plan|default)\s*$/i.exec(text.trim());
 const match = /^\/(new|plan|default)\s*$/i.exec(text.trim());
 if (!match) {
 return null;
 }
 const command = match[1]?.toLowerCase();
 if (command === "new") return "new";
 if (command === "plan") return "plan";
 return "default";
}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add /new command for contextual threads#7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

tim-smart
wants to merge
1
commit into

from

 Open


Add /new command for contextual threads
#7
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


18 changes: 18 additions & 0 deletions
apps/mobile/src/features/threads/NewTaskDraftRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { StaticScreenProps } from "@react-navigation/native";
import { useMemo } from "react";
import { NativeStackScreenOptions } from "../../native/StackHeader";
import type { ComposerDraftWorkspaceSelection } from "../../state/use-composer-drafts";

import { NewTaskDraftScreen } from "./NewTaskDraftScreen";

Expand All@@ -10,8 +11,15 @@ type NewTaskDraftRouteParams = {
 readonly title?: string | string[];
 readonly pendingTaskId?: string | string[];
 readonly incomingShareId?: string | string[];
 readonly workspaceMode?: string | string[];
 readonly branch?: string | string[];
 readonly worktreePath?: string | string[];
};

function firstParam(value: string | string[] | undefined): string | undefined {
 return Array.isArray(value) ? value[0] : value;
}

export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraftRouteParams>) {
 const params = route.params ?? {};

Expand All@@ -27,6 +35,15 @@ export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraf
 }),
 [route.params],
 );
 const initialWorkspaceSelection = useMemo<ComposerDraftWorkspaceSelection | undefined>(() => {
 const mode = firstParam(params.workspaceMode);
 if (mode !== "local" && mode !== "worktree") return undefined;
 return {
 mode,
 branch: firstParam(params.branch) ?? null,
 worktreePath: firstParam(params.worktreePath) ?? null,
 };
 }, [route.params]);

 return (
 <>
Expand All@@ -37,6 +54,7 @@ export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraf
 />
 <NewTaskDraftScreen
 initialProjectRef={initialProjectRef}
 initialWorkspaceSelection={initialWorkspaceSelection}
 incomingShareId={
 Array.isArray(params.incomingShareId) ? params.incomingShareId[0] : params.incomingShareId
 }
Expand Down

30 changes: 30 additions & 0 deletions
apps/mobile/src/features/threads/NewTaskDraftScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,9 @@ import {
 getComposerDraftSnapshot,
 mergeComposerDraftContent,
 restoreComposerDraftSnapshot,
 updateComposerDraftSettings,
 type ComposerDraft,
 type ComposerDraftWorkspaceSelection,
} from "../../state/use-composer-drafts";
import { useProjects } from "../../state/entities";
import { deriveThreadTitleFromPrompt } from "../../lib/projectThreadStartTurn";
Expand DownExpand Up@@ -68,6 +70,7 @@ export function NewTaskDraftScreen(props: {
 readonly environmentId?: string;
 readonly projectId?: string;
 };
 readonly initialWorkspaceSelection?: ComposerDraftWorkspaceSelection;
 /** Queued outbox message id when editing an existing pending task. */
 readonly pendingTaskId?: string;
 /** Durable native share inbox item to merge into this project draft. */
Expand DownExpand Up@@ -294,6 +297,33 @@ export function NewTaskDraftScreen(props: {
 setProject,
 ]);

 const appliedInitialWorkspaceSelectionRef = useRef<ComposerDraftWorkspaceSelection | undefined>(
 undefined,
 );
 useEffect(() => {
 const selection = props.initialWorkspaceSelection;
 const initialEnvironmentId = props.initialProjectRef?.environmentId;
 const initialProjectId = props.initialProjectRef?.projectId;
 if (
 !selection ||
 !flow.draftKey ||
 !selectedProject ||
 selectedProject.environmentId !== initialEnvironmentId ||
 selectedProject.id !== initialProjectId ||
 appliedInitialWorkspaceSelectionRef.current === selection
 ) {
 return;
 }
 appliedInitialWorkspaceSelectionRef.current = selection;
 updateComposerDraftSettings(flow.draftKey, { workspaceSelection: selection });
 }, [
 flow.draftKey,
 props.initialProjectRef?.environmentId,
 props.initialProjectRef?.projectId,
 props.initialWorkspaceSelection,
 selectedProject,
 ]);

 useEffect(() => {
 if (!selectedProject) {
 loadedBranchesProjectKeyRef.current = null;
Expand Down

46 changes: 44 additions & 2 deletions
apps/mobile/src/features/threads/ThreadComposer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import type {
} from "@t3tools/contracts";
import {
 detectComposerTrigger,
 parseStandaloneComposerSlashCommand,
 replaceTextRange,
 serializeComposerFileLink,
 type ComposerTrigger,
Expand DownExpand Up@@ -110,6 +111,7 @@ export interface ThreadComposerProps {
 readonly onRemoveDraftImage: (imageId: string) => void;
 readonly onStopThread: () => void;
 readonly onSendMessage: () => Promise<MessageId | null>;
 readonly onStartNewThread: () => void;
 readonly onUpdateModelSelection: (modelSelection: ModelSelection) => void;
 readonly onUpdateRuntimeMode: (runtimeMode: RuntimeMode) => void;
 readonly onUpdateInteractionMode: (interactionMode: ProviderInteractionMode) => void;
Expand DownExpand Up@@ -372,6 +374,13 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 if (composerTrigger.kind === "slash-command") {
 const q = composerTrigger.query.toLowerCase();
 const allBuiltIn = [
 {
 id: "cmd:new",
 type: "slash-command" as const,
 command: "new",
 label: "/new",
 description: "Start a new thread here",
 },
 {
 id: "cmd:model",
 type: "slash-command" as const,
Expand DownExpand Up@@ -512,9 +521,20 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 }, [composerTrigger, pathSearch.entries, selectedProviderStatus]);

 // ── Handle command selection ──────────────────────────────
 const { onChangeDraftMessage, onUpdateInteractionMode, draftMessage, onSendMessage } = props;
 const {
 onChangeDraftMessage,
 onStartNewThread,
 onUpdateInteractionMode,
 draftMessage,
 onSendMessage,
 } = props;

 const handleSend = useCallback(async () => {
 if (parseStandaloneComposerSlashCommand(draftMessage) === "new") {
 onChangeDraftMessage("");
 onStartNewThread();
 return;
 }
 const threadKey = scopedThreadKey(props.environmentId, props.selectedThread.id);
 if (inFlightThreadIdsRef.current.has(threadKey)) return;
 inFlightThreadIdsRef.current.add(threadKey);
Expand All@@ -533,6 +553,9 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 }
 }, [
 onSendMessage,
 draftMessage,
 onChangeDraftMessage,
 onStartNewThread,
 props.environmentId,
 props.environmentLabel,
 props.selectedThread.id,
Expand All@@ -558,6 +581,19 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 return;
 }

 if (item.type === "slash-command" && item.command === "new") {
 const result = replaceTextRange(
 draftMessage,
 composerTrigger.rangeStart,
 composerTrigger.rangeEnd,
 "",
 );
 setComposerSelection({ start: result.cursor, end: result.cursor });
 onChangeDraftMessage(result.text);
 onStartNewThread();
 return;
 }

 let replacement = "";
 if (item.type === "path") {
 replacement = `${serializeComposerFileLink(item.path)} `;
Expand All@@ -578,7 +614,13 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
 setComposerSelection({ start: result.cursor, end: result.cursor });
 onChangeDraftMessage(result.text);
 },
 [composerTrigger, draftMessage, onChangeDraftMessage, onUpdateInteractionMode],
 [
 composerTrigger,
 draftMessage,
 onChangeDraftMessage,
 onStartNewThread,
 onUpdateInteractionMode,
 ],
 );

 // ── Model menu ───────────────────────────────────────────
Expand Down

2 changes: 2 additions & 0 deletions
apps/mobile/src/features/threads/ThreadDetailScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,6 +77,7 @@ export interface ThreadDetailScreenProps {
 readonly onRemoveDraftImage: (imageId: string) => void;
 readonly onStopThread: () => void;
 readonly onSendMessage: () => Promise<MessageId | null>;
 readonly onStartNewThread: () => void;
 readonly onReconnectEnvironment: () => void;
 readonly onUpdateThreadModelSelection: (modelSelection: ModelSelection) => void;
 readonly onUpdateThreadRuntimeMode: (runtimeMode: RuntimeMode) => void;
Expand DownExpand Up@@ -439,6 +440,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 onRemoveDraftImage={props.onRemoveDraftImage}
 onStopThread={props.onStopThread}
 onSendMessage={handleSendMessage}
 onStartNewThread={props.onStartNewThread}
 onReconnectEnvironment={props.onReconnectEnvironment}
 onUpdateModelSelection={props.onUpdateThreadModelSelection}
 onUpdateRuntimeMode={props.onUpdateThreadRuntimeMode}
Expand Down

19 changes: 19 additions & 0 deletions
apps/mobile/src/features/threads/ThreadRouteScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -308,6 +308,24 @@ function ThreadRouteContent(
 [knownTerminalSessions, selectedThreadProject?.workspaceRoot],
 );
 const selectedThreadDetailWorktreePath = selectedThreadDetail?.worktreePath ?? null;
 const handleStartNewThread = useCallback(() => {
 if (!selectedThread || !selectedThreadProject) return;
 const worktreePath = resolvePreferredThreadWorktreePath({
 threadShellWorktreePath: selectedThread.worktreePath ?? null,
 threadDetailWorktreePath: selectedThreadDetailWorktreePath,
 });
 navigation.navigate("NewTaskSheet", {
 screen: "NewTaskDraft",
 params: {
 environmentId: String(selectedThread.environmentId),
 projectId: String(selectedThread.projectId),
 title: selectedThreadProject.title,
 workspaceMode: "local",
 branch: selectedThread.branch ?? undefined,
 worktreePath: worktreePath ?? undefined,
 },
 });
 }, [navigation, selectedThread, selectedThreadDetailWorktreePath, selectedThreadProject]);
 const handleReconnectEnvironment = useCallback(() => {
 if (!environmentId) {
 return;
Expand DownExpand Up@@ -781,6 +799,7 @@ function ThreadRouteContent(
 serverConfig={serverConfig}
 onStopThread={handleStopThread}
 onSendMessage={composer.onSendMessage}
 onStartNewThread={handleStartNewThread}
 onReconnectEnvironment={handleReconnectEnvironment}
 onUpdateThreadModelSelection={composer.onUpdateModelSelection}
 onUpdateThreadRuntimeMode={composer.onUpdateRuntimeMode}
Expand Down

23 changes: 22 additions & 1 deletion
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3927,6 +3927,22 @@ function ChatViewContent(props: ChatViewProps) {
 ? (pendingServerThreadStartFromOriginByThreadId[activeThread?.id ?? ""] ??
 primaryServerSettings.newWorktreesStartFromOrigin)
 : false;
 const handleStartNewThread = useCallback(() => {
 if (!activeProjectRef) return;
 void handleNewThread(activeProjectRef, {
 branch: activeThreadBranch,
 worktreePath: activeWorktreePath,
 envMode,
 startFromOrigin,
 });
 }, [
 activeProjectRef,
 activeThreadBranch,
 activeWorktreePath,
 envMode,
 handleNewThread,
 startFromOrigin,
 ]);
 const sendEnvMode = resolveSendEnvMode({
 requestedEnvMode: envMode,
 isGitRepo,
Expand DownExpand Up@@ -4609,10 +4625,14 @@ function ChatViewContent(props: ChatViewProps) {
 ? parseStandaloneComposerSlashCommand(trimmed)
 : null;
 if (standaloneSlashCommand) {
 handleInteractionModeChange(standaloneSlashCommand);
 promptRef.current = "";
 clearComposerDraftContent(composerDraftTarget);
 composerRef.current?.resetCursorState();
 if (standaloneSlashCommand === "new") {
 handleStartNewThread();
 } else {
 handleInteractionModeChange(standaloneSlashCommand);
 }
 return;
 }
 if (!hasSendableContent) {
Expand DownExpand Up@@ -5949,6 +5969,7 @@ function ChatViewContent(props: ChatViewProps) {
 composerTerminalContextsRef={composerTerminalContextsRef}
 composerElementContextsRef={composerElementContextsRef}
 onSend={onSend}
 onStartNewThread={handleStartNewThread}
 onInterrupt={onInterrupt}
 onImplementPlanInNewThread={onImplementPlanInNewThread}
 onRespondToApproval={onRespondToApproval}
Expand Down

27 changes: 26 additions & 1 deletion
apps/web/src/components/chat/ChatComposer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -587,6 +587,7 @@ export interface ChatComposerProps {

 // Callbacks
 onSend: (e?: { preventDefault: () => void }) => void;
 onStartNewThread: () => void;
 onInterrupt: () => void;
 onImplementPlanInNewThread: () => void;
 onRespondToApproval: (
Expand DownExpand Up@@ -674,6 +675,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 composerTerminalContextsRef,
 composerElementContextsRef,
 onSend,
 onStartNewThread,
 onInterrupt,
 onImplementPlanInNewThread,
 onRespondToApproval,
Expand DownExpand Up@@ -1062,6 +1064,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 }
 if (composerTrigger.kind === "slash-command") {
 const builtInSlashCommandItems = [
 {
 id: "slash:new",
 type: "slash-command",
 command: "new",
 label: "/new",
 description: "Start a new thread in this worktree or directory",
 },
 {
 id: "slash:model",
 type: "slash-command",
Expand DownExpand Up@@ -1692,6 +1701,17 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 return;
 }
 if (item.type === "slash-command") {
 if (item.command === "new") {
 const applied = applyPromptReplacement(trigger.rangeStart, trigger.rangeEnd, "", {
 expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd),
 focusEditorAfterReplace: false,
 });
 if (applied) {
 setComposerHighlightedItemId(null);
 onStartNewThread();
 }
 return;
 }
 if (item.command === "model") {
 const applied = applyPromptReplacement(trigger.rangeStart, trigger.rangeEnd, "", {
 expectedText: snapshot.value.slice(trigger.rangeStart, trigger.rangeEnd),
Expand DownExpand Up@@ -1749,7 +1769,12 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 return;
 }
 },
 [applyPromptReplacement, handleInteractionModeChange, resolveActiveComposerTrigger],
 [
 applyPromptReplacement,
 handleInteractionModeChange,
 onStartNewThread,
 resolveActiveComposerTrigger,
 ],
 );

 const onComposerMenuItemHighlighted = useCallback(
Expand Down

6 changes: 5 additions & 1 deletion
apps/web/src/composer-logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -360,6 +360,10 @@ describe("isCollapsedCursorAdjacentToInlineToken", () => {
});

describe("parseStandaloneComposerSlashCommand", () => {
 it("parses standalone /new command", () => {
 expect(parseStandaloneComposerSlashCommand(" /NEW ")).toBe("new");
 });

 it("parses standalone /plan command", () => {
 expect(parseStandaloneComposerSlashCommand(" /plan ")).toBe("plan");
 });
Expand All@@ -369,6 +373,6 @@ describe("parseStandaloneComposerSlashCommand", () => {
 });

 it("ignores slash commands with extra message text", () => {
 expect(parseStandaloneComposerSlashCommand("/plan explain this")).toBeNull();
 expect(parseStandaloneComposerSlashCommand("/new explain this")).toBeNull();
 });
});

5 changes: 3 additions & 2 deletions
apps/web/src/composer-logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@ import { splitPromptIntoComposerSegments } from "./composer-editor-mentions";
import { INLINE_TERMINAL_CONTEXT_PLACEHOLDER } from "./lib/terminalContext";

export type ComposerTriggerKind = "path" | "slash-command" | "skill";
export type ComposerSlashCommand = "model" | "plan" | "default";
export type ComposerSlashCommand = "new" | "model" | "plan" | "default";

export interface ComposerTrigger {
 kind: ComposerTriggerKind;
Expand DownExpand Up@@ -265,11 +265,12 @@ export function detectComposerTrigger(text: string, cursorInput: number): Compos
export function parseStandaloneComposerSlashCommand(
 text: string,
): Exclude<ComposerSlashCommand, "model"> | null {
 const match = /^\/(plan|default)\s*$/i.exec(text.trim());
 const match = /^\/(new|plan|default)\s*$/i.exec(text.trim());
 if (!match) {
 return null;
 }
 const command = match[1]?.toLowerCase();
 if (command === "new") return "new";
 if (command === "plan") return "plan";
 return "default";
}
Expand Down
Loading
Loading