Skip to content

Commit 0f554d6

Browse files
authored
Merge branch 'main' into fix-gitlab-context-review-comments
2 parents 7d846ac + 97db94c commit 0f554d6

4 files changed

Lines changed: 23 additions & 11 deletions

File tree

‎apps/server/src/provider/CodexDeveloperInstructions.ts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,17 +120,25 @@ Example:
120120
plan content
121121
</proposed_plan>
122122
123-
plan content should be human and agent digestible. The final plan must be plan-only and include:
123+
plan content should be human and agent digestible. The final plan must be plan-only, concise by default, and include:
124124
125125
* A clear title
126126
* A brief summary section
127127
* Important changes or additions to public APIs/interfaces/types
128128
* Test cases and scenarios
129129
* Explicit assumptions and defaults chosen where needed
130130
131+
When possible, prefer a compact structure with 3-5 short sections, usually: Summary, Key Changes or Implementation Changes, Test Plan, and Assumptions. Do not include a separate Scope section unless scope boundaries are genuinely important to avoid mistakes.
132+
133+
Prefer grouped implementation bullets by subsystem or behavior over file-by-file inventories. Mention files only when needed to disambiguate a non-obvious change, and avoid naming more than 3 paths unless extra specificity is necessary to prevent mistakes. Prefer behavior-level descriptions over symbol-by-symbol removal lists. For v1 feature-addition plans, do not invent detailed schema, validation, precedence, fallback, or wire-shape policy unless the request establishes it or it is needed to prevent a concrete implementation mistake; prefer the intended capability and minimum interface/behavior changes.
134+
135+
Keep bullets short and avoid explanatory sub-bullets unless they are needed to prevent ambiguity. Prefer the minimum detail needed for implementation safety, not exhaustive coverage. Within each section, compress related changes into a few high-signal bullets and omit branch-by-branch logic, repeated invariants, and long lists of unaffected behavior unless they are necessary to prevent a likely implementation mistake. Avoid repeated repo facts and irrelevant edge-case or rollout detail. For straightforward refactors, keep the plan to a compact summary, key edits, tests, and assumptions. If the user asks for more detail, then expand.
136+
131137
Do not ask "should I proceed?" in the final output. The user can easily switch out of Plan mode and request implementation if you have included a \`<proposed_plan>\` block in your response. Alternatively, they can decide to stay in Plan mode and continue refining the plan.
132138
133139
Only produce at most one \`<proposed_plan>\` block per turn, and only when you are presenting a complete spec.
140+
141+
If the user stays in Plan mode and asks for revisions after a prior \`<proposed_plan>\`, any new \`<proposed_plan>\` must be a complete replacement. If the user indicates that the prior plan is not acceptable but does not provide enough information to produce a complete replacement, address the concern and continue planning without producing a \`<proposed_plan>\` block. If the follow-up neither requires changes nor calls the plan into question (e.g. clarifying question), answer it before the block, then reproduce the prior \`<proposed_plan>\` unchanged.
134142
${T3_CODE_BROWSER_TOOL_INSTRUCTIONS}
135143
</collaboration_mode>`;
136144

@@ -142,7 +150,7 @@ Your active mode changes only when new developer instructions with a different \
142150
143151
## request_user_input availability
144152
145-
The \`request_user_input\` tool is unavailable in Default mode. If you call it while in Default mode, it will return an error.
153+
Use the \`request_user_input\` tool only when it is listed in the available tools for this turn.
146154
147155
In Default mode, strongly prefer making reasonable assumptions and executing the user's request rather than stopping to ask questions. If you absolutely must ask a question because the answer cannot be discovered from local context and a reasonable assumption would be risky, ask the user directly with a concise plain-text question. Never write a multiple choice question as a textual assistant message.
148156
${T3_CODE_BROWSER_TOOL_INSTRUCTIONS}

‎apps/web/src/components/chat/MessagesTimeline.tsx‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,6 @@ export const MessagesTimeline = memo(function MessagesTimeline({
610610
/>
611611
<TimelineMinimap
612612
items={minimapItems}
613-
bottomInset={contentInsetEndAdjustment}
614613
hasPersistentGutter={minimapHasPersistentGutter}
615614
hitStripWidth={minimapHitStripWidth}
616615
stripMap={minimapStripMap}
@@ -712,14 +711,12 @@ function timelineMinimapEventTargetsPreview(target: EventTarget): boolean {
712711
}
713712

714713
function TimelineMinimap({
715-
bottomInset,
716714
hasPersistentGutter,
717715
hitStripWidth,
718716
items,
719717
stripMap,
720718
onSelect,
721719
}: {
722-
bottomInset: number;
723720
hasPersistentGutter: boolean;
724721
hitStripWidth: number;
725722
items: ReadonlyArray<TimelineMinimapItem>;
@@ -779,19 +776,16 @@ function TimelineMinimap({
779776
return null;
780777
}
781778

782-
const safeBottomInset = Math.max(0, Math.ceil(bottomInset));
783-
784779
return (
785780
<div
786781
className={cn(
787-
"group/minimap pointer-events-none absolute top-0 left-0 z-40 hidden w-18 [@media(pointer:fine)]:block",
782+
"group/minimap pointer-events-none absolute inset-y-0 left-0 z-40 hidden w-18 [@media(pointer:fine)]:block",
788783
hasPersistentGutter
789784
? "opacity-100"
790785
: "opacity-0 transition-opacity duration-150 hover:opacity-100 focus-within:opacity-100",
791786
)}
792787
data-testid="timeline-minimap"
793788
data-persistent-gutter={hasPersistentGutter ? "true" : "false"}
794-
style={{ bottom: safeBottomInset }}
795789
>
796790
<div className="relative h-full w-full select-none">
797791
<button

‎apps/web/src/components/preview/PreviewPanelShell.test.ts‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import { jsx } from "react/jsx-runtime";
2+
import { renderToStaticMarkup } from "react-dom/server";
13
import { describe, expect, it } from "vite-plus/test";
24

3-
import { getPreviewPanelMaxWidth } from "./PreviewPanelShell";
5+
import { getPreviewPanelMaxWidth, PreviewPanelShell } from "./PreviewPanelShell";
46

57
describe("getPreviewPanelMaxWidth", () => {
68
it("allows the panel to use 70% of an ultra-wide viewport without a pixel ceiling", () => {
@@ -10,4 +12,12 @@ describe("getPreviewPanelMaxWidth", () => {
1012
it("rounds fractional CSS pixels down", () => {
1113
expect(getPreviewPanelMaxWidth(2_001)).toBe(1_400);
1214
});
15+
16+
it("keeps inline panels inside their containing workspace", () => {
17+
const markup = renderToStaticMarkup(
18+
jsx(PreviewPanelShell, { mode: "inline", defaultWidth: 1_000, children: "Panel" }),
19+
);
20+
21+
expect(markup).toContain("max-w-full");
22+
});
1323
});

‎apps/web/src/components/preview/PreviewPanelShell.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export function PreviewPanelShell(props: {
5151
return (
5252
<div
5353
className={cn(
54-
"relative flex h-full min-h-0 min-w-0 flex-col self-stretch bg-background",
54+
"relative flex h-full min-h-0 min-w-0 max-w-full flex-col self-stretch bg-background",
5555
isInline
5656
? props.maximized
5757
? "flex-1 border-l border-border"

0 commit comments

Comments
 (0)