Skip to content

Commit 94212aa

Browse files
fix(web): scratch drafts with file links stay on their machine
The composer writes @ file picks as Markdown file links in the prompt, so they are neither attachments nor thread contexts. A scratch draft holding one now keeps automatic routing off until a balanced machine is settled, the same way attachments do, and a link added while the target's folder is still opening drops the pending move. AI-assisted; verified with the tests and tools listed above. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 9b35643 commit 94212aa

3 files changed

Lines changed: 103 additions & 12 deletions

File tree

‎apps/web/src/components/ChatView.logic.test.ts‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@ import {
66
snapshotComposerSend,
77
withMessageContext,
88
deriveAvailableRevertTurnCounts,
9+
promptHasFileReferences,
10+
resolveAutomaticEnvironment,
911
} from "./ChatView.logic";
1012
import { recallCheckoutIsRepo, rememberCheckoutIsRepo } from "./ChatView.logic";
1113
import { ProviderDriverKind, type ServerProvider } from "@t3tools/contracts";
14+
import { serializeComposerFileLink } from "@t3tools/shared/composerTrigger";
1215
import { deriveProviderInstanceEntries } from "../providerInstances";
1316
import { ensureInlineContextReferences } from "../lib/composerContextReferences";
1417
import { terminalContextReference } from "../lib/composerContextRecords";
@@ -1216,3 +1219,54 @@ describe("deriveAvailableRevertTurnCounts", () => {
12161219
expect(deriveAvailableRevertTurnCounts(null).size).toBe(0);
12171220
});
12181221
});
1222+
1223+
describe("resolveAutomaticEnvironment", () => {
1224+
const fileLink = `Read ${serializeComposerFileLink("notes/plan.md")} first`;
1225+
const unbalanced = {
1226+
loadBalancedEnvironmentId: null,
1227+
branch: null,
1228+
worktreePath: null,
1229+
};
1230+
it.each([
1231+
{
1232+
name: "a scratch draft with a file link stays put",
1233+
isScratch: true,
1234+
prompt: fileLink,
1235+
balanced: null,
1236+
expected: false,
1237+
},
1238+
{
1239+
name: "a file link added after balancing settled keeps auto",
1240+
isScratch: true,
1241+
prompt: fileLink,
1242+
balanced: EnvironmentId.make("box"),
1243+
expected: true,
1244+
},
1245+
{
1246+
name: "a project draft with a file link still balances",
1247+
isScratch: false,
1248+
prompt: fileLink,
1249+
balanced: null,
1250+
expected: true,
1251+
},
1252+
{
1253+
name: "a web link is not a file reference",
1254+
isScratch: true,
1255+
prompt: "See [docs](https://t3.codes/docs)",
1256+
balanced: null,
1257+
expected: true,
1258+
},
1259+
])("$name", ({ isScratch, prompt, balanced, expected }) => {
1260+
expect(
1261+
resolveAutomaticEnvironment({
1262+
ready: true,
1263+
hasMultipleEnvironments: true,
1264+
loadBalancingEnabled: true,
1265+
isScratch,
1266+
hasAttachments: false,
1267+
hasFileReferences: promptHasFileReferences(prompt),
1268+
draft: { ...unbalanced, loadBalancedEnvironmentId: balanced },
1269+
}),
1270+
).toBe(expected);
1271+
});
1272+
});

‎apps/web/src/components/ChatView.logic.ts‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
usageLimitRunPresentedAsLatest,
1212
} from "@t3tools/shared/orchestrationV2ThreadError";
1313
import * as Option from "effect/Option";
14+
import { extractMarkdownLinkHrefs, parseMarkdownFileLink } from "@t3tools/shared/markdownLinks";
1415
import type { SetStateAction } from "react";
1516
import { applyClaudePromptEffortPrefix, resolvePromptInjectedEffort } from "@t3tools/shared/model";
1617
import { getProviderModelCapabilities } from "../providerModels";
@@ -67,6 +68,7 @@ import {
6768
type ComposerFileAttachment,
6869
type ComposerImageAttachment,
6970
type DraftId,
71+
type DraftSessionState,
7072
type DraftThreadState,
7173
} from "../composerDraftStore";
7274
import * as Schema from "effect/Schema";
@@ -1516,3 +1518,33 @@ export function deriveAvailableRevertTurnCounts(projection: ThreadStructure | nu
15161518
}
15171519
return available;
15181520
}
1521+
1522+
export function promptHasFileReferences(prompt: string): boolean {
1523+
return extractMarkdownLinkHrefs(prompt).some((href) => parseMarkdownFileLink(href) !== null);
1524+
}
1525+
1526+
export function resolveAutomaticEnvironment(input: {
1527+
readonly ready: boolean;
1528+
readonly hasMultipleEnvironments: boolean;
1529+
readonly loadBalancingEnabled: boolean;
1530+
readonly isScratch: boolean;
1531+
readonly hasAttachments: boolean;
1532+
readonly hasFileReferences: boolean;
1533+
readonly draft: Pick<
1534+
DraftSessionState,
1535+
"environmentSelection" | "loadBalancedEnvironmentId" | "branch" | "worktreePath"
1536+
> | null;
1537+
}): boolean {
1538+
const { draft } = input;
1539+
// Scratch file links resolve only on the machine the scratch folder lives on.
1540+
const machineLocalContent = input.hasAttachments || (input.isScratch && input.hasFileReferences);
1541+
return (
1542+
input.ready &&
1543+
input.hasMultipleEnvironments &&
1544+
input.loadBalancingEnabled &&
1545+
draft?.environmentSelection !== "manual" &&
1546+
(!machineLocalContent || Boolean(draft?.loadBalancedEnvironmentId)) &&
1547+
(!draft?.branch || draft.environmentSelection === "auto") &&
1548+
!draft?.worktreePath
1549+
);
1550+
}

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ import { ThreadFind, ThreadFindCanvas } from "./chat/ThreadFindProvider";
3232
import { closeThreadFind, openThreadFind, useThreadFindOpen } from "./chat/threadFindStore";
3333
import { THREAD_FIND_BAR_RESERVED_HEIGHT } from "./chat/ThreadFindBar";
3434
import { usageLimitRecoveryBannerItem } from "./chat/UsageLimitRecoveryBanner";
35-
import { resolveDraftHeroState } from "./ChatView.logic";
35+
import {
36+
promptHasFileReferences,
37+
resolveAutomaticEnvironment,
38+
resolveDraftHeroState,
39+
} from "./ChatView.logic";
3640
import { useQueuedRunEdit } from "./chat/useQueuedRunEdit";
3741
import { recallCheckoutIsRepo, rememberCheckoutIsRepo } from "./ChatView.logic";
3842
import { useLogicalProjectEnvironments } from "../hooks/useLogicalProjectEnvironments";
@@ -602,6 +606,9 @@ export default function ChatView(props: ChatViewProps) {
602606
const draft = store.getComposerDraft(composerDraftTarget);
603607
return (draft?.images.length ?? 0) > 0 || (draft?.files.length ?? 0) > 0;
604608
});
609+
const composerHasFileReferences = useComposerDraftStore((store) =>
610+
promptHasFileReferences(store.getComposerDraft(composerDraftTarget)?.prompt ?? ""),
611+
);
605612
const referencedThreadContexts = useComposerDraftStore(
606613
useShallow((store) => {
607614
const draft = store.getComposerDraft(composerDraftTarget);
@@ -1264,17 +1271,15 @@ export default function ChatView(props: ChatViewProps) {
12641271
loadBalancingEnabled: settings.loadBalancingEnabled,
12651272
loadBalancingWeights: settings.loadBalancingWeights,
12661273
}));
1267-
const automaticEnvironment = Boolean(
1268-
clientSettingsHydrated &&
1269-
draftId &&
1270-
!envLocked &&
1271-
hasMultipleEnvironments &&
1272-
loadBalancingSettings.loadBalancingEnabled &&
1273-
draftThread?.environmentSelection !== "manual" &&
1274-
(!composerHasAttachments || Boolean(draftThread?.loadBalancedEnvironmentId)) &&
1275-
(!draftThread?.branch || draftThread.environmentSelection === "auto") &&
1276-
!draftThread?.worktreePath,
1277-
);
1274+
const automaticEnvironment = resolveAutomaticEnvironment({
1275+
ready: clientSettingsHydrated && draftId !== null && !envLocked,
1276+
hasMultipleEnvironments,
1277+
loadBalancingEnabled: loadBalancingSettings.loadBalancingEnabled,
1278+
isScratch: activeProjectIsScratch,
1279+
hasAttachments: composerHasAttachments,
1280+
hasFileReferences: composerHasFileReferences,
1281+
draft: draftThread,
1282+
});
12781283
const autoUpdateEnvironments = automaticEnvironment
12791284
? logicalProjectEnvironments.flatMap(({ environmentId }) => {
12801285
const environment = environmentById.get(environmentId);

0 commit comments

Comments
 (0)