Skip to content

Commit f4c4403

Browse files
fix(mobile): backspace deletes a model chip instead of expanding it
Deleting the space after a model chip made it stop qualifying as complete, so it turned back into raw `model:` text. A chip already shown now stays one, the same way the editors keep trailing skill and file chips, and the next backspace removes it whole. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 3422280 commit f4c4403

5 files changed

Lines changed: 104 additions & 25 deletions

File tree

‎apps/mobile/src/lib/composerContext.test.ts‎

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
} from "@t3tools/shared/composerContextReferences";
1313
import { describe, expect, it } from "vite-plus/test";
1414
import {
15+
collectComposerModelTokens,
1516
composerContextEditorTokens,
1617
composerSkillLabels,
1718
composerContextSendBlockReason,
@@ -158,7 +159,12 @@ describe("mobile composer context", () => {
158159
it("chips a model reference only once it is complete and names a known model", () => {
159160
const known = new Set(["model:codex/gpt-6.1"]);
160161
const modelTokens = (text: string) =>
161-
composerContextEditorTokens(text, collectComposerInlineTokens(text), new Set(), known)
162+
composerContextEditorTokens(
163+
text,
164+
collectComposerInlineTokens(text),
165+
new Set(),
166+
collectComposerModelTokens(text, known),
167+
)
162168
.filter((token) => token.type === "model")
163169
.map((token) => [token.source, token.start, token.end]);
164170

@@ -171,13 +177,30 @@ describe("mobile composer context", () => {
171177
expect(modelTokens("Use `model:codex/gpt-6.1` then stop")).toEqual([]);
172178
expect(modelTokens(String.raw`\[\text{use model:codex/gpt-6.1 here}\] then stop`)).toEqual([]);
173179
const reference = formatComposerContextReference(terminal);
180+
const withContext = `${reference} model:codex/gpt-6.1 `;
174181
expect(
175-
composerContextEditorTokens(`${reference} model:codex/gpt-6.1 `, [], new Set(), known).map(
176-
(token) => token.type,
177-
),
182+
composerContextEditorTokens(
183+
withContext,
184+
[],
185+
new Set(),
186+
collectComposerModelTokens(withContext, known),
187+
).map((token) => token.type),
178188
).toEqual(["context", "model"]);
179189
});
180190

191+
it("keeps a confirmed model chip when backspace removes the space after it", () => {
192+
const known = new Set(["model:codex/gpt-6.1"]);
193+
const chip = collectComposerModelTokens("Use model:codex/gpt-6.1 ", known);
194+
expect(chip.map((token) => token.source)).toEqual(["model:codex/gpt-6.1"]);
195+
196+
const kept = collectComposerModelTokens("Use model:codex/gpt-6.1", known, chip);
197+
expect(kept.map((token) => [token.start, token.end])).toEqual([[4, 23]]);
198+
// Still kept on the next render, until the chip itself is edited.
199+
expect(collectComposerModelTokens("Use model:codex/gpt-6.1", known, kept)).toHaveLength(1);
200+
expect(collectComposerModelTokens("Use model:codex/gpt-6.1x", known, kept)).toEqual([]);
201+
expect(collectComposerModelTokens("model:codex/gpt-6.1", known, kept)).toEqual([]);
202+
});
203+
181204
it("keeps exact source positions and repeated references alongside existing native tokens", () => {
182205
const reference = formatComposerContextReference(terminal);
183206
const text = `Use $babysit with $disabled $agentOnly $HOME $PATH $anything $notaskill $20 $20k and [app.ts](src/app.ts) with ${reference} then ${reference}`;

‎apps/mobile/src/lib/composerContext.ts‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
import { collectComposerModelMentions } from "@t3tools/client-runtime/composerModelMentions";
1+
import {
2+
collectComposerModelMentions,
3+
type ComposerModelMentionOccurrence,
4+
} from "@t3tools/client-runtime/composerModelMentions";
25
import { isProviderSkillUserInvocable } from "@t3tools/client-runtime/providerSkills";
36
import { sourceControlClients } from "@t3tools/client-runtime/source-control-clients";
47
import { filePreviewKind } from "@t3tools/shared/filePreview";
@@ -165,13 +168,30 @@ export function composerSkillLabels(
165168
);
166169
}
167170

168-
const NO_KNOWN_MODELS: ReadonlySet<string> = new Set();
171+
/**
172+
* Like `$skill`, a typed reference waits for whitespace so `gpt-6` cannot chip on the way to
173+
* `gpt-6.1`. A chip already shown stays one when backspace removes the space after it.
174+
*/
175+
export function collectComposerModelTokens(
176+
text: string,
177+
knownModels: { has(source: string): boolean },
178+
preserveTrailingFrom: ReadonlyArray<ComposerModelMentionOccurrence> = [],
179+
): ReadonlyArray<ComposerModelMentionOccurrence> {
180+
return collectComposerModelMentions(text).filter(
181+
(mention) =>
182+
knownModels.has(mention.source) &&
183+
(/\s/u.test(text[mention.end] ?? "") ||
184+
preserveTrailingFrom.some(
185+
(token) => token.start === mention.start && token.source === mention.source,
186+
)),
187+
);
188+
}
169189

170190
export function composerContextEditorTokens(
171191
text: string,
172192
tokens: readonly ComposerInlineToken[],
173193
knownSkills: { has(name: string): boolean },
174-
knownModels: { has(source: string): boolean } = NO_KNOWN_MODELS,
194+
modelTokens: ReadonlyArray<ComposerModelMentionOccurrence> = [],
175195
) {
176196
const references = collectComposerContextReferences(text);
177197
const inlineTokens = tokens.filter(
@@ -181,12 +201,8 @@ export function composerContextEditorTokens(
181201
!references.some((ref) => token.start < ref.end && token.end > ref.start),
182202
);
183203
const taken = [...inlineTokens, ...references, ...composerMathRanges(text)];
184-
const models = collectComposerModelMentions(text).filter(
185-
(mention) =>
186-
// Like `$skill`, a typed reference waits for whitespace so `gpt-6` cannot chip on the way to `gpt-6.1`.
187-
/\s/u.test(text[mention.end] ?? "") &&
188-
knownModels.has(mention.source) &&
189-
!taken.some((range) => mention.start < range.end && mention.end > range.start),
204+
const models = modelTokens.filter(
205+
(mention) => !taken.some((range) => mention.start < range.end && mention.end > range.start),
190206
);
191207
return [
192208
...inlineTokens,

‎apps/mobile/src/native/T3ComposerEditor.ios.tsx‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { PASTED_TEXT_ATTACHMENT_THRESHOLD_BYTES } from "@t3tools/client-runtime/
22
import { PROVIDER_SEND_TURN_MAX_INPUT_CHARS } from "@t3tools/contracts";
33
import { collectComposerInlineTokens } from "@t3tools/shared/composerInlineTokens";
44
import { composerContextEditorTokens, composerSkillLabels } from "../lib/composerContext";
5+
import { useComposerModelTokens } from "./useComposerModelTokens";
56
import { requireNativeView } from "expo";
67
import {
78
useCallback,
@@ -177,14 +178,11 @@ export function ComposerEditor({
177178
);
178179

179180
const skillLabels = useMemo(() => composerSkillLabels(skills), [skills]);
180-
const modelsBySource = useMemo(
181-
() => new Map(models.map((model) => [model.source, model])),
182-
[models],
183-
);
181+
const { modelsBySource, modelTokens } = useComposerModelTokens(props.value, models);
184182
const chipTextColor = createNativeComposerTheme(theme).text;
185183
const tokensJson = useMemo(() => {
186184
return JSON.stringify(
187-
composerContextEditorTokens(props.value, tokens, skillLabels, modelsBySource).map((token) => {
185+
composerContextEditorTokens(props.value, tokens, skillLabels, modelTokens).map((token) => {
188186
const model = token.type === "model" ? modelsBySource.get(token.source) : undefined;
189187
const record =
190188
token.type === "context"
@@ -219,7 +217,16 @@ export function ComposerEditor({
219217
};
220218
}),
221219
);
222-
}, [props.value, tokens, props.context, skillLabels, modelsBySource, theme, chipTextColor]);
220+
}, [
221+
props.value,
222+
tokens,
223+
props.context,
224+
skillLabels,
225+
modelsBySource,
226+
modelTokens,
227+
theme,
228+
chipTextColor,
229+
]);
223230
// Every render resolves against the snapshot history, so a render whose
224231
// (value, selection) lags the acknowledged native state is stamped behind
225232
// the native revision and rejected by the editor instead of re-applying a

‎apps/mobile/src/native/T3ComposerEditor.native.tsx‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { PASTED_TEXT_ATTACHMENT_THRESHOLD_BYTES } from "@t3tools/client-runtime/
22
import { PROVIDER_SEND_TURN_MAX_INPUT_CHARS } from "@t3tools/contracts";
33
import { collectComposerInlineTokens } from "@t3tools/shared/composerInlineTokens";
44
import { composerContextEditorTokens, composerSkillLabels } from "../lib/composerContext";
5+
import { useComposerModelTokens } from "./useComposerModelTokens";
56
import { requireNativeView } from "expo";
67
import { TextInputWrapper } from "expo-paste-input";
78
import {
@@ -174,14 +175,11 @@ export function ComposerEditor({
174175
);
175176

176177
const skillLabels = useMemo(() => composerSkillLabels(skills), [skills]);
177-
const modelsBySource = useMemo(
178-
() => new Map(models.map((model) => [model.source, model])),
179-
[models],
180-
);
178+
const { modelsBySource, modelTokens } = useComposerModelTokens(props.value, models);
181179
const chipTextColor = createNativeComposerTheme(theme).text;
182180
const tokensJson = useMemo(() => {
183181
return JSON.stringify(
184-
composerContextEditorTokens(props.value, tokens, skillLabels, modelsBySource).map((token) => {
182+
composerContextEditorTokens(props.value, tokens, skillLabels, modelTokens).map((token) => {
185183
const model = token.type === "model" ? modelsBySource.get(token.source) : undefined;
186184
const record =
187185
token.type === "context"
@@ -216,7 +214,16 @@ export function ComposerEditor({
216214
};
217215
}),
218216
);
219-
}, [props.value, tokens, props.context, skillLabels, modelsBySource, theme, chipTextColor]);
217+
}, [
218+
props.value,
219+
tokens,
220+
props.context,
221+
skillLabels,
222+
modelsBySource,
223+
modelTokens,
224+
theme,
225+
chipTextColor,
226+
]);
220227
// Every render resolves against the snapshot history, so a render whose
221228
// (value, selection) lags the acknowledged native state is stamped behind
222229
// the native revision and rejected by the editor instead of re-applying a
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import { useMemo, useState } from "react";
2+
3+
import { collectComposerModelTokens } from "../lib/composerContext";
4+
import type { SelectableMarkdownModel } from "./SelectableMarkdownText.types";
5+
6+
/** Render-phase state, like the editors' inline tokens, so an abandoned render leaves no chip behind. */
7+
export function useComposerModelTokens(
8+
value: string,
9+
models: ReadonlyArray<SelectableMarkdownModel>,
10+
) {
11+
const modelsBySource = useMemo(
12+
() => new Map(models.map((model) => [model.source, model])),
13+
[models],
14+
);
15+
const [confirmed, setConfirmed] = useState(() => ({
16+
value,
17+
modelsBySource,
18+
tokens: collectComposerModelTokens(value, modelsBySource),
19+
}));
20+
let tokens = confirmed.tokens;
21+
if (confirmed.value !== value || confirmed.modelsBySource !== modelsBySource) {
22+
tokens = collectComposerModelTokens(value, modelsBySource, confirmed.tokens);
23+
setConfirmed({ value, modelsBySource, tokens });
24+
}
25+
return { modelsBySource, modelTokens: tokens };
26+
}

0 commit comments

Comments
 (0)