Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1320,6 +1320,7 @@ export const CODEX_THREAD_CONFIG = {
mcp_optional_startup_grace_ms: 10_000,
} as const;

// Coder: exported for CodexAdapterV2.test.ts, which checks T3CODE_THREAD_ID without the MCP servers.
export function codexThreadRuntimeParams(input: {
readonly threadId: ThreadId | null;
readonly mcpSession: McpProviderSession.McpProviderSessionConfig | undefined;
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/components/pullRequest/PullRequestStackMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ export function PullRequestStackMenu({
}
/>
<TooltipPopup>
View stack !{stack.number}, layer {position} of {stack.layers.length}
View stack #{stack.number}, layer {position} of {stack.layers.length}
{notice ? ` · ${notice}` : null}
</TooltipPopup>
</Tooltip>
Expand Down Expand Up @@ -249,7 +249,7 @@ export function PullRequestStackMenu({
</DialogTitle>
<DialogDescription>
{confirmation === "merge"
? `Merge !${reference.number} and its unmerged layers below into ${stack.base} using ${mergeMethod}. ${hostLabel} checks their rules before merging or queueing them and rebases the remaining stack after merging.`
? `Merge #${reference.number} and its unmerged layers below into ${stack.base} using ${mergeMethod}. ${hostLabel} checks their rules before merging or queueing them and rebases the remaining stack after merging.`
: `Rebase the remote branches from bottom to top onto ${stack.base}. This rewrites branch history and may restart checks. If a layer fails, earlier updates remain.`}
</DialogDescription>
</DialogHeader>
Expand Down
2 changes: 1 addition & 1 deletion docs/internals/coder-only.md
Original file line number Diff line number Diff line change
Expand Up @@ -1063,7 +1063,7 @@ checks that every name here still exists and that every modified upstream file i
`AgentScope.test.ts` drops the launcher check (`agentScopeLauncherScript` is cut);
`GitLabPullRequestCli.legacy.test.ts` expects `DIFF_MAX_OUTPUT_BYTES`; `ProviderReplayFixtures.ts`
lists only the carried drivers; `CodexAdapterV2.test.ts` expects `T3CODE_THREAD_ID` without
the MCP servers; client-runtime's `assets.test.ts` builds the gateway `ConnectionTarget` in
the MCP servers (through `codexThreadRuntimeParams`, exported for it); client-runtime's `assets.test.ts` builds the gateway `ConnectionTarget` in
place of upstream's primary target; `ChatView.logic.test.ts` drops preview annotations,
`useThreadActions.permissions.test.ts` the mini-player state, `mediaContent.test.ts` the desktop
media read, and `settingsSearch.test.ts` the browser search row.
Expand Down
1 change: 1 addition & 0 deletions knip.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
"packages/provider-core/src/server/maintenanceResolver.ts": ["exports", "nsExports"],
"packages/provider-core/src/server/mcpSession.ts": ["exports", "nsExports"],
"packages/provider-core/src/server/orchestrationInstructions.ts": ["exports", "nsExports"],
"packages/provider-core/src/server/runtimeInstructions.ts": ["exports", "nsExports"],
"packages/provider-core/src/server/snapshotProbe.ts": ["exports", "nsExports"],
"packages/provider-core/src/server/textGenerationOperations.ts": ["exports", "nsExports"],
"packages/provider-testing/src/fakeCli.ts": ["exports", "nsExports"],
Expand Down