Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
54 changes: 54 additions & 0 deletions web/app-ui/src/app/new-session-model.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ import {
NEW_SESSION_TITLE_FALLBACK,
NEW_SESSION_TITLE_MAX_LENGTH,
NEW_THREAD_TITLE_FALLBACK,
resolveNewSessionBaseRef,
resolveNewSessionModel,
resolveNewThreadDefaults,
sessionTitleFallback,
thinkingOption,
threadTitleFallback,
Expand Down Expand Up @@ -133,6 +135,58 @@ describe("new session model", () => {
expect(resolveNewSessionModel(undefined, undefined, providers(" "))).toBeUndefined();
});

it("resolves concrete mode, model, thinking, and permission defaults", () => {
const codeMode: ProtocolAgentMode = {
...mode(),
default_permission_mode: "allow_list",
default_thinking_level: "high",
};
const globalProviders: ProtocolProvidersResponse = {
...providers("provider/global"),
default_permission_mode: "ask",
default_thinking_level: "medium",
};
const models = [model({
properties: {
thinking_level: {
type: "string",
enum: ["low", "medium", "high"],
default: "low",
},
},
}, "provider/global")];
expect(resolveNewThreadDefaults([codeMode], models, globalProviders)).toEqual({
modeId: "code",
modelId: "provider/global",
thinking: "high",
permissionMode: "allow_list",
});
});

it("falls back to an advertised model when inherited defaults are stale", () => {
const available = model({}, "provider/available");
expect(resolveNewThreadDefaults(
[mode("provider/stale-mode")],
[available],
providers("provider/stale-global"),
).modelId).toBe("provider/available");
expect(resolveNewThreadDefaults(
[mode(null)],
[available],
providers("provider/stale-global"),
).modelId).toBe("provider/available");
expect(resolveNewThreadDefaults([], [], providers("provider/stale-global")).modelId)
.toBe("");
});

it("chooses main, master, then literal HEAD for a new session base", () => {
expect(resolveNewSessionBaseRef(["feature", "master", "main"])).toBe("main");
expect(resolveNewSessionBaseRef(["feature", "master"])).toBe("master");
expect(resolveNewSessionBaseRef(["feature"])).toBe("HEAD");
expect(resolveNewSessionBaseRef(["main", "release"], "release")).toBe("release");
expect(resolveNewSessionBaseRef(["main"], "missing")).toBe("main");
});

it("composes a complete request with an advertised thinking override", () => {
const modelInfo = model({
properties: {
Expand Down
60 changes: 60 additions & 0 deletions web/app-ui/src/app/new-session-model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@ export interface ThinkingOption {
readonly defaultValue?: string;
}

export type ResolvedPermissionMode = "ask" | "allow_list" | "yolo";

export interface ResolvedNewThreadDefaults {
readonly modeId: string;
readonly modelId: string;
readonly thinking: string;
readonly permissionMode: ResolvedPermissionMode;
}

export interface NewSessionThreadRequestInput {
readonly sessionId: string;
readonly title?: string | null;
Expand Down Expand Up @@ -129,6 +138,57 @@ export const resolveNewSessionModel = (
?? nonEmpty(selectedMode?.default_model)
?? nonEmpty(providers?.default_model);

const validPermissionMode = (value: unknown): ResolvedPermissionMode | undefined =>
value === "ask" || value === "allow_list" || value === "yolo" ? value : undefined;

/** Resolve every inherited new-thread option to the concrete value the server uses. */
export const resolveNewThreadDefaults = (
modes: readonly ProtocolAgentMode[],
models: readonly ProtocolModelInfo[],
providers: ProtocolProvidersResponse | null | undefined,
overrides: { readonly modeId?: string; readonly modelId?: string } = {},
): ResolvedNewThreadDefaults => {
const requestedModeId = nonEmpty(overrides.modeId);
const mode = modes.find((candidate) => candidate.id === requestedModeId)
?? modes.find((candidate) => candidate.id === "code")
?? modes[0];
const resolvedModelId = resolveNewSessionModel(overrides.modelId, mode, providers);
const modelId = resolvedModelId !== undefined
&& models.some((candidate) => candidate.id === resolvedModelId)
? resolvedModelId
: models[0]?.id ?? "";
const model = models.find((candidate) => candidate.id === modelId);
const option = thinkingOption(model);
const thinking = [
nonEmpty(mode?.default_thinking_level),
nonEmpty(providers?.default_thinking_level),
option?.defaultValue,
option?.values[0],
].find((candidate): candidate is string =>
candidate !== undefined && option?.values.includes(candidate) === true) ?? "";
const permissionMode = validPermissionMode(mode?.default_permission_mode)
?? validPermissionMode(providers?.default_permission_mode)
?? "ask";
return {
modeId: mode?.id ?? "code",
modelId,
thinking,
permissionMode,
};
};

/** Prefer conventional trunk branches, then the repository's literal HEAD ref. */
export const resolveNewSessionBaseRef = (
branches: readonly string[],
preferredBaseRef = "",
): string => {
const preferred = nonEmpty(preferredBaseRef);
if (preferred !== undefined && branches.includes(preferred)) return preferred;
if (branches.includes("main")) return "main";
if (branches.includes("master")) return "master";
return "HEAD";
};

/**
* Builds the initial thread request while preserving server-side inheritance.
* A thinking override is sent only when the effective model advertises both its
Expand Down
Loading
Loading