Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

feat(agents): add default repository settings (#7168)

Eric Hayese6f265a7f43f
diff --git a/apps/web/src/features/agents-view/primitives/preferred-repository.test.ts b/apps/web/src/features/agents-view/primitives/preferred-repository.test.ts
new file mode 100644
index 0000000000..979a532880
--- /dev/null
+++ b/apps/web/src/features/agents-view/primitives/preferred-repository.test.ts
@@ -0,0 +1,68 @@
+import { createRoot } from 'solid-js';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { createPreferredRepository } from './preferred-repository';
+
+beforeEach(() => localStorage.clear());
+
+describe('default coding repository', () => {
+ it('defaults to auto, persists by user, and can return to auto', () => {
+ createRoot((dispose) => {
+ const preference = createPreferredRepository('one');
+ expect(preference.repository()).toBeUndefined();
+ preference.select('https://github.com/org/repo');
+ dispose();
+ });
+ createRoot((dispose) => {
+ const preference = createPreferredRepository('one');
+ expect(preference.repository()).toBe('https://github.com/org/repo');
+ expect(createPreferredRepository('two').repository()).toBeUndefined();
+ preference.select(undefined);
+ dispose();
+ });
+ createRoot((dispose) => {
+ expect(createPreferredRepository('one').repository()).toBeUndefined();
+ dispose();
+ });
+ });
+
+ it('updates an already mounted composer when settings change', () => {
+ createRoot((dispose) => {
+ const composer = createPreferredRepository('one');
+ const settings = createPreferredRepository('one');
+ const other = createPreferredRepository('two');
+ settings.select('https://github.com/org/repo');
+ expect(composer.repository()).toBe('https://github.com/org/repo');
+ expect(other.repository()).toBeUndefined();
+ settings.select(undefined);
+ expect(composer.repository()).toBeUndefined();
+ dispose();
+ });
+ });
+
+ it('receives changes from another browser tab', () => {
+ createRoot((dispose) => {
+ const preference = createPreferredRepository('one');
+ const key = 'agents-default-repository-v1:one';
+ localStorage.setItem(key, 'https://github.com/org/repo');
+ window.dispatchEvent(new StorageEvent('storage', { key }));
+ expect(preference.repository()).toBe('https://github.com/org/repo');
+ dispose();
+ });
+ });
+
+ it('keeps live preferences when storage is unavailable', () => {
+ const write = vi
+ .spyOn(Storage.prototype, 'setItem')
+ .mockImplementation(() => {
+ throw new Error('Unavailable');
+ });
+ createRoot((dispose) => {
+ const settings = createPreferredRepository('one');
+ const composer = createPreferredRepository('one');
+ settings.select('https://github.com/org/repo');
+ expect(composer.repository()).toBe('https://github.com/org/repo');
+ dispose();
+ });
+ write.mockRestore();
+ });
+});
diff --git a/apps/web/src/features/agents-view/primitives/preferred-repository.ts b/apps/web/src/features/agents-view/primitives/preferred-repository.ts
new file mode 100644
index 0000000000..a1556fd6a4
--- /dev/null
+++ b/apps/web/src/features/agents-view/primitives/preferred-repository.ts
@@ -0,0 +1,55 @@
+import { makePersistedState } from '@app/lib/persistence';
+import { createUserScopedStorage } from '@core/util/userScopedStorage';
+import { createSignal, onCleanup } from 'solid-js';
+import { parseRepositoryInput } from '../core/repository';
+
+const STORAGE_KEY = 'agents-default-repository-v1';
+const CHANGE_EVENT = 'agents-default-repository-changed';
+
+/** The user's default for new coding conversations on this device; undefined means auto-detect. */
+export function createPreferredRepository(userId: string | undefined) {
+ const storage = createUserScopedStorage(STORAGE_KEY);
+ const [repository, setRepository] = createSignal<string>();
+ const read = () =>
+ userId ? parseRepositoryInput(storage.read(userId) ?? '') : undefined;
+ const [, persist] = makePersistedState([repository, setRepository], {
+ storages: {
+ restore: read,
+ write: (value) => {
+ if (!userId) return;
+ storage.write(userId, value ?? '');
+ window.dispatchEvent(
+ new CustomEvent(CHANGE_EVENT, { detail: { userId, value } })
+ );
+ },
+ },
+ });
+
+ // Settings and a composer may be mounted together in separate splits.
+ // Storage events also pick up a preference changed in another browser tab.
+ const onChange = (event: Event) => {
+ if (!(event instanceof CustomEvent) || event.detail?.userId !== userId)
+ return;
+ setRepository(parseRepositoryInput(event.detail.value ?? ''));
+ };
+ const onStorage = (event: StorageEvent) => {
+ if (
+ userId &&
+ (event.key === null ||
+ event.key === `${STORAGE_KEY}:${encodeURIComponent(userId)}`)
+ )
+ setRepository(read());
+ };
+ window.addEventListener(CHANGE_EVENT, onChange);
+ window.addEventListener('storage', onStorage);
+ onCleanup(() => {
+ window.removeEventListener(CHANGE_EVENT, onChange);
+ window.removeEventListener('storage', onStorage);
+ });
+
+ return {
+ repository,
+ select: (url: string | undefined) =>
+ persist(url ? parseRepositoryInput(url) : undefined),
+ };
+}
diff --git a/apps/web/src/features/agents-view/primitives/recent-repositories.ts b/apps/web/src/features/agents-view/primitives/recent-repositories.ts
index 06dcae0b80..e6ffc8d63f 100644
--- a/apps/web/src/features/agents-view/primitives/recent-repositories.ts
+++ b/apps/web/src/features/agents-view/primitives/recent-repositories.ts
@@ -7,7 +7,7 @@ const RECENT_REPOSITORY_LIMIT = 8;
/**
* Repositories handed to coders from this composer, newest first and scoped
* to the signed-in user. The picker offers listed recents ahead of the rest
- * of the GitHub App listing. A new conversation still starts on Automatic.
+ * of the GitHub App listing. The default repository is a separate preference.
*/
export function createRecentRepositories(userId: string | undefined) {
const storage = createUserScopedStorage('agents-view-repositories-v1');
diff --git a/apps/web/src/features/agents-view/views/NewChatPage.test.tsx b/apps/web/src/features/agents-view/views/NewChatPage.test.tsx
index 7789dfc657..c32d9e15ed 100644
--- a/apps/web/src/features/agents-view/views/NewChatPage.test.tsx
+++ b/apps/web/src/features/agents-view/views/NewChatPage.test.tsx
@@ -9,7 +9,7 @@ import {
waitFor,
within,
} from '@solidjs/testing-library';
-import { createSignal, type JSX } from 'solid-js';
+import { createRoot, createSignal, type JSX } from 'solid-js';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import type { ComposerMode } from '../core/mode';
import {
@@ -18,6 +18,7 @@ import {
type RuntimeLike,
} from '../core/roster';
import { NEW_CONVERSATION_ATTACHMENTS_KEY } from '../primitives/composer-draft';
+import { createPreferredRepository } from '../primitives/preferred-repository';
import { AgentPicker } from './AgentPicker';
import { NewChatPage } from './NewChatPage';
@@ -321,6 +322,7 @@ describe('agent-led new conversation', () => {
mocks.tier = 'max';
mocks.currentEffort = 'low';
mocks.touch = false;
+ localStorage.clear();
mocks.attachments = [];
mocks.recentIds = [MACRO_CODER_BOT_ID];
mocks.recentUrls = [];
@@ -648,13 +650,13 @@ describe('agent-led new conversation', () => {
(screen.getByRole('textbox', { name: 'Draft' }) as HTMLInputElement).value
).toBe('Keep this prompt');
});
- it('starts a new conversation on Choose automatically, not the last used one', async () => {
+ it('starts a new conversation on Auto-detect, not the last used one', async () => {
mocks.recentIds = [CURSOR_BOT_ID];
mocks.recentUrls = ['https://github.com/macro-inc/macro'];
const send = page(true, [], false, [], 'code');
expect(
screen.getByRole('button', { name: 'Repository' }).textContent
- ).toContain('Choose automatically');
+ ).toContain('Auto-detect');
expect(
screen.getByRole('button', { name: 'Repository' }).textContent
).not.toContain('macro-inc/macro');
@@ -666,6 +668,100 @@ describe('agent-led new conversation', () => {
repoUrl: undefined,
});
});
+ it('preselects the saved default and sends its default branch', () => {
+ createRoot((dispose) => {
+ createPreferredRepository('user').select(
+ 'https://github.com/macro-inc/macro'
+ );
+ dispose();
+ });
+ mocks.recentIds = [CURSOR_BOT_ID];
+ const send = page(true, [], false, [], 'code');
+ expect(
+ screen.getByRole('button', { name: 'Repository' }).textContent
+ ).toContain('macro-inc/macro');
+ fireEvent.click(screen.getByRole('button', { name: 'Send' }));
+ expect(send).toHaveBeenLastCalledWith({
+ botId: CURSOR_BOT_ID,
+ onFailure: expect.any(Function),
+ prompt: 'Prompt',
+ repoUrl: 'https://github.com/macro-inc/macro',
+ repoBranch: 'develop',
+ });
+ });
+
+ it('lets a conversation override the default with Auto-detect without changing settings', () => {
+ createRoot((dispose) => {
+ createPreferredRepository('user').select(
+ 'https://github.com/macro-inc/macro'
+ );
+ dispose();
+ });
+ mocks.recentIds = [CURSOR_BOT_ID];
+ const send = page(true, [], false, [], 'code');
+ fireEvent.click(screen.getByRole('button', { name: 'Repository' }));
+ fireEvent.click(screen.getByRole('option', { name: 'Auto-detect' }));
+ fireEvent.click(screen.getByRole('button', { name: 'Send' }));
+ expect(send).toHaveBeenLastCalledWith({
+ botId: CURSOR_BOT_ID,
+ onFailure: expect.any(Function),
+ prompt: 'Prompt',
+ repoUrl: undefined,
+ });
+ createRoot((dispose) => {
+ expect(createPreferredRepository('user').repository()).toBe(
+ 'https://github.com/macro-inc/macro'
+ );
+ dispose();
+ });
+ });
+
+ it('uses Auto-detect when the saved repository is no longer accessible', () => {
+ createRoot((dispose) => {
+ createPreferredRepository('user').select(
+ 'https://github.com/org/removed'
+ );
+ dispose();
+ });
+ mocks.recentIds = [CURSOR_BOT_ID];
+ const send = page(true, [], false, [], 'code');
+ expect(
+ screen.getByRole('button', { name: 'Repository' }).textContent
+ ).toContain('Auto-detect');
+ fireEvent.click(screen.getByRole('button', { name: 'Send' }));
+ expect(send).toHaveBeenLastCalledWith({
+ botId: CURSOR_BOT_ID,
+ onFailure: expect.any(Function),
+ prompt: 'Prompt',
+ repoUrl: undefined,
+ });
+ });
+
+ it('updates the mounted composer when settings change until the caller overrides it', () => {
+ mocks.recentIds = [CURSOR_BOT_ID];
+ const send = page(true, [], false, [], 'code');
+ const settings = createRoot((dispose) => ({
+ ...createPreferredRepository('user'),
+ dispose,
+ }));
+ settings.select('https://github.com/macro-inc/macro');
+ expect(
+ screen.getByRole('button', { name: 'Repository' }).textContent
+ ).toContain('macro-inc/macro');
+ fireEvent.click(screen.getByRole('button', { name: 'Repository' }));
+ fireEvent.click(screen.getByRole('option', { name: 'Auto-detect' }));
+ settings.select(undefined);
+ settings.select('https://github.com/macro-inc/macro');
+ fireEvent.click(screen.getByRole('button', { name: 'Send' }));
+ expect(send).toHaveBeenLastCalledWith({
+ botId: CURSOR_BOT_ID,
+ onFailure: expect.any(Function),
+ prompt: 'Prompt',
+ repoUrl: undefined,
+ });
+ settings.dispose();
+ });
+
it('refuses an unlisted repository and starts a listed one on its default branch', async () => {
const send = page(true, [], false, [], 'code');
await selectAgent(/Cursor/);
diff --git a/apps/web/src/features/agents-view/views/NewChatPage.tsx b/apps/web/src/features/agents-view/views/NewChatPage.tsx
index 4d61ad0520..236a61916b 100644
--- a/apps/web/src/features/agents-view/views/NewChatPage.tsx
+++ b/apps/web/src/features/agents-view/views/NewChatPage.tsx
@@ -42,13 +42,14 @@ import {
agentsModeLabel,
type ComposerMode,
} from '../core/mode';
-import { defaultBranchFor } from '../core/repository';
+import { defaultBranchFor, sameRepository } from '../core/repository';
import { MACRO_PERSONA_ID, type RosterAgent } from '../core/roster';
import {
createPersistedComposerDraft,
NEW_CONVERSATION_ATTACHMENTS_KEY,
} from '../primitives/composer-draft';
import { createPreferredInmemModel } from '../primitives/preferred-inmem-model';
+import { createPreferredRepository } from '../primitives/preferred-repository';
import { createRecentRepositories } from '../primitives/recent-repositories';
import { createWorkspaceMode } from '../primitives/workspace-mode';
import { createComposerModels } from '../queries/composer-models';
@@ -117,15 +118,21 @@ export function NewChatPage(props: {
const [modelOverride, setModelOverride] = createSignal<string>();
const [effortPickerOpen, setEffortPickerOpen] = createSignal(false);
const [repositoryPickerOpen, setRepositoryPickerOpen] = createSignal(false);
- // A new conversation starts on Automatic until the caller picks a repository.
- const [repoUrl, setRepoUrl] = createSignal<string | undefined>();
+ const preferredRepository = createPreferredRepository(userId());
+ // An explicit Auto-detect pick must override a saved repository, too.
+ const [repositoryOverride, setRepositoryOverride] = createSignal<{
+ url?: string;
+ }>();
const persistedDraft = createPersistedComposerDraft(undefined, userId);
const draft = () => props.draft ?? persistedDraft.draft();
const setDraft = (text: string) =>
props.onDraftChange
? props.onDraftChange(text)
: persistedDraft.setDraft(text);
- const [branchOverride, setBranchOverride] = createSignal<string>();
+ const [branchOverride, setBranchOverride] = createSignal<{
+ repository: string;
+ branch: string;
+ }>();
/** The picked agent, else the last one used, else Macro, else any that can start. */
const preferredAgent = (kind: AgentsMode, picked?: string) => {
const options = optionsFor(kind);
@@ -217,24 +224,47 @@ export function NewChatPage(props: {
const blocked = () => {
if (choosingMode()) return 'Choosing Chat or Code…';
const agent = selected();
- return agent ? agent.unavailableReason : 'Choose an agent to start';
+ if (!agent) return 'Choose an agent to start';
+ if (agent.unavailableReason) return agent.unavailableReason;
+ if (canSelectRepository() && repoUrl()) {
+ if (reachable.loading()) return 'Loading repositories';
+ if (reachable.error()) return 'Retry loading repositories before sending';
+ }
+ return undefined;
};
// Listed only while the drawer can show them: chat agents never ask.
const reachable = createReachableRepositories(coding);
+ const repoUrl = () => {
+ const override = repositoryOverride();
+ if (override) return override.url;
+ const preferred = preferredRepository.repository();
+ if (!preferred) return undefined;
+ // Keep the saved label while loading; never submit a stale default.
+ if (reachable.loading() || reachable.error()) return preferred;
+ return reachable
+ .repositories()
+ .find((repo) => sameRepository(repo.url, preferred))?.url;
+ };
// Listed only while a repository is chosen: listing costs a GitHub call.
const reachableBranches = createRepositoryBranches(() =>
coding() && !localRuntime() ? repoUrl() : undefined
);
// A chosen branch, or where the selected repository's own clones start.
- const repoBranch = () =>
- localRuntime()
- ? 'main'
- : (branchOverride() ??
- defaultBranchFor(reachable.repositories(), repoUrl()));
+ const repoBranch = () => {
+ if (localRuntime()) return 'main';
+ const override = branchOverride();
+ return override && override.repository === repoUrl()
+ ? override.branch
+ : defaultBranchFor(reachable.repositories(), repoUrl());
+ };
+ const selectBranch = (branch: string) => {
+ const repository = repoUrl();
+ if (repository) setBranchOverride({ repository, branch });
+ };
const selectRepository = (url: string | undefined) => {
// Another repository starts on its own default branch, not the last one's.
if (url !== repoUrl()) setBranchOverride(undefined);
- setRepoUrl(url);
+ setRepositoryOverride({ url });
if (url) repositories.remember(url);
};
@@ -455,7 +485,7 @@ export function NewChatPage(props: {
onRetryBranches={reachableBranches.retry}
onConnectGitHub={() => openSettings('Connected')}
onSelectRepository={selectRepository}
- onSelectBranch={setBranchOverride}
+ onSelectBranch={selectBranch}
/>
);
diff --git a/apps/web/src/features/agents-view/views/RepositoryPicker.test.tsx b/apps/web/src/features/agents-view/views/RepositoryPicker.test.tsx
index bc8fae7767..55cd0a20a8 100644
--- a/apps/web/src/features/agents-view/views/RepositoryPicker.test.tsx
+++ b/apps/web/src/features/agents-view/views/RepositoryPicker.test.tsx
@@ -134,7 +134,7 @@ describe('RepositoryPicker', () => {
).toContain('macro-inc/infra');
openRepositories();
expect(optionNames()).toEqual([
- 'Choose automatically',
+ 'Auto-detect',
'macro-inc/infra',
'macro-inc/macro',
]);
@@ -161,7 +161,7 @@ describe('RepositoryPicker', () => {
openRepositories();
expect(
screen
- .getByRole('option', { name: 'Choose automatically' })
+ .getByRole('option', { name: 'Auto-detect' })
.getAttribute('aria-selected')
).toBe('true');
fireEvent.keyDown(search(), { key: 'ArrowDown' });
@@ -195,7 +195,7 @@ describe('RepositoryPicker', () => {
});
openRepositories();
expect(optionNames()).toEqual([
- 'Choose automatically',
+ 'Auto-detect',
'macro-inc/macro',
'macro-inc/infra',
]);
@@ -222,12 +222,10 @@ describe('RepositoryPicker', () => {
expect(handlers.onSelectRepository).not.toHaveBeenCalled();
});
- it('leaves the choice to the coder with Choose automatically', () => {
+ it('leaves the choice to the coder with Auto-detect', () => {
const handlers = picker({ repoUrl: macro.url });
openRepositories();
- fireEvent.click(
- screen.getByRole('option', { name: 'Choose automatically' })
- );
+ fireEvent.click(screen.getByRole('option', { name: 'Auto-detect' }));
expect(handlers.onSelectRepository).toHaveBeenCalledWith(undefined);
});
diff --git a/apps/web/src/features/agents-view/views/RepositoryPicker.tsx b/apps/web/src/features/agents-view/views/RepositoryPicker.tsx
index e213c3eae3..98e4af4bd4 100644
--- a/apps/web/src/features/agents-view/views/RepositoryPicker.tsx
+++ b/apps/web/src/features/agents-view/views/RepositoryPicker.tsx
@@ -115,7 +115,7 @@ export function RepositoryPicker(props: {
: !!props.repoUrl && sameRepository(props.repoUrl, choice.url);
const rowLabel = (choice: RepositoryChoice) =>
match(choice)
- .with({ kind: 'automatic' }, () => 'Choose automatically')
+ .with({ kind: 'automatic' }, () => 'Auto-detect')
.with({ kind: 'listed' }, ({ url }) => repositoryLabel(url))
.exhaustive();
const nothingReachable = () =>
@@ -199,9 +199,7 @@ export function RepositoryPicker(props: {
<>
<GithubIcon class="size-4 shrink-0" />
<span class="truncate">
- {props.repoUrl
- ? repositoryLabel(props.repoUrl)
- : 'Choose automatically'}
+ {props.repoUrl ? repositoryLabel(props.repoUrl) : 'Auto-detect'}
</span>
<CaretDownIcon class="size-3 shrink-0" />
</>
diff --git a/apps/web/src/features/settings/DefaultRepository.test.tsx b/apps/web/src/features/settings/DefaultRepository.test.tsx
new file mode 100644
index 0000000000..0675f71edf
--- /dev/null
+++ b/apps/web/src/features/settings/DefaultRepository.test.tsx
@@ -0,0 +1,112 @@
+import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library';
+import { createRoot } from 'solid-js';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { createPreferredRepository } from '../agents-view/primitives/preferred-repository';
+import { DefaultRepository } from './DefaultRepository';
+import { chooseSelectOption } from './tests/select-helpers';
+
+const mocks = vi.hoisted(() => ({
+ loading: false,
+ error: false,
+ repositories: [
+ { url: 'https://github.com/macro-inc/macro', defaultBranch: 'main' },
+ ],
+ retry: vi.fn(),
+ openSettings: vi.fn(),
+}));
+vi.mock('@core/context/user', () => ({ useUserId: () => () => 'user' }));
+vi.mock('@core/constant/SettingsState', () => ({
+ useSettingsState: () => ({ openSettings: mocks.openSettings }),
+}));
+vi.mock('@queries/agent-repositories/repositories', () => ({
+ useAgentRepositoriesQuery: () => ({
+ get isSuccess() {
+ return !mocks.loading && !mocks.error;
+ },
+ get isLoading() {
+ return mocks.loading;
+ },
+ get isError() {
+ return mocks.error;
+ },
+ get data() {
+ if (mocks.loading || mocks.error)
+ throw new Error('Unguarded query data read');
+ return { repositories: mocks.repositories };
+ },
+ refetch: mocks.retry,
+ }),
+}));
+
+beforeEach(() => {
+ localStorage.clear();
+ mocks.loading = false;
+ mocks.error = false;
+ mocks.repositories = [
+ { url: 'https://github.com/macro-inc/macro', defaultBranch: 'main' },
+ ];
+ vi.clearAllMocks();
+});
+afterEach(cleanup);
+
+describe('default repository settings', () => {
+ it('defaults to Auto-detect and persists choices including returning to auto', () => {
+ render(() => <DefaultRepository />);
+ const select = screen.getByRole('button', { name: /^Default repository/ });
+ expect(select.textContent).toContain('Auto-detect');
+ chooseSelectOption(select, 'macro-inc/macro');
+ createRoot((dispose) => {
+ expect(createPreferredRepository('user').repository()).toBe(
+ 'https://github.com/macro-inc/macro'
+ );
+ dispose();
+ });
+ cleanup();
+ render(() => <DefaultRepository />);
+ const restored = screen.getByRole('button', {
+ name: /^Default repository/,
+ });
+ expect(restored.textContent).toContain('macro-inc/macro');
+ chooseSelectOption(restored, 'Auto-detect');
+ createRoot((dispose) => {
+ expect(createPreferredRepository('user').repository()).toBeUndefined();
+ dispose();
+ });
+ });
+
+ it('keeps the setting visible while repositories load', () => {
+ mocks.loading = true;
+ render(() => <DefaultRepository />);
+ expect(
+ screen.getByRole('button', { name: /^Default repository/ }).textContent
+ ).toContain('Auto-detect');
+ expect(screen.getByRole('status').textContent).toContain('Loading');
+ });
+
+ it('offers retry on failure and GitHub connection when no repositories are available', () => {
+ mocks.error = true;
+ render(() => <DefaultRepository />);
+ fireEvent.click(screen.getByRole('button', { name: 'Retry' }));
+ expect(mocks.retry).toHaveBeenCalledOnce();
+ cleanup();
+ mocks.error = false;
+ mocks.repositories = [];
+ render(() => <DefaultRepository />);
+ fireEvent.click(screen.getByRole('button', { name: 'Connect GitHub' }));
+ expect(mocks.openSettings).toHaveBeenCalledWith('Connected');
+ });
+
+ it('explains when a saved repository is no longer accessible', () => {
+ createRoot((dispose) => {
+ createPreferredRepository('user').select(
+ 'https://github.com/removed/repo'
+ );
+ dispose();
+ });
+ render(() => <DefaultRepository />);
+ expect(
+ screen.getByRole('button', { name: /^Default repository/ }).textContent
+ ).toContain('removed/repo (unavailable)');
+ expect(screen.getByRole('status').textContent).toContain('Auto-detect');
+ });
+});
diff --git a/apps/web/src/features/settings/DefaultRepository.tsx b/apps/web/src/features/settings/DefaultRepository.tsx
new file mode 100644
index 0000000000..4b7fb172f0
--- /dev/null
+++ b/apps/web/src/features/settings/DefaultRepository.tsx
@@ -0,0 +1,95 @@
+import {
+ repositoryLabel,
+ sameRepository,
+} from '@app/features/agents-view/core/repository';
+import { createPreferredRepository } from '@app/features/agents-view/primitives/preferred-repository';
+import { createReachableRepositories } from '@app/features/agents-view/queries/reachable-repositories';
+import { useSettingsState } from '@core/constant/SettingsState';
+import { useUserId } from '@core/context/user';
+import { Button } from '@ui';
+import { Show } from 'solid-js';
+import { SettingsSelect } from './components/settings-select';
+import { SettingsRow } from './primitives';
+
+/** Personal repository default row, using the same accessible GitHub listing as the composer. */
+export function DefaultRepository() {
+ const userId = useUserId();
+ const preferred = createPreferredRepository(userId());
+ const reachable = createReachableRepositories(() => true);
+ const { openSettings } = useSettingsState();
+ const listedPreference = () =>
+ reachable.repositories().find((repo) => {
+ const url = preferred.repository();
+ return url && sameRepository(url, repo.url);
+ });
+ const unavailable = () =>
+ !!preferred.repository() &&
+ !reachable.loading() &&
+ !reachable.error() &&
+ !listedPreference();
+ const options = () => {
+ const options = [
+ { id: 'auto', name: 'Auto-detect' },
+ ...reachable
+ .repositories()
+ .map((repo) => ({ id: repo.url, name: repositoryLabel(repo.url) })),
+ ];
+ const saved = preferred.repository();
+ if (saved && !listedPreference())
+ options.push({
+ id: saved,
+ name: `${repositoryLabel(saved)}${unavailable() ? ' (unavailable)' : ''}`,
+ });
+ return options;
+ };
+
+ return (
+ <SettingsRow
+ label="Default repository"
+ description="Preselect a GitHub repository for new coding conversations on this device. Auto-detect chooses from your prompt and recent work."
+ >
+ <div class="w-full min-w-0 max-w-sm">
+ <SettingsSelect
+ label="Default repository"
+ options={options()}
+ value={listedPreference()?.url ?? preferred.repository() ?? 'auto'}
+ onChange={(id) => preferred.select(id === 'auto' ? undefined : id)}
+ />
+ <Show when={reachable.loading()}>
+ <p class="mt-2 text-xs text-ink-muted" role="status">
+ Loading repositories…
+ </p>
+ </Show>
+ <Show when={reachable.error()}>
+ <p class="mt-2 text-xs text-ink-muted" role="status">
+ Could not load GitHub repositories.
+ </p>
+ <Button variant="ghost" size="sm" onClick={reachable.retry}>
+ Retry
+ </Button>
+ </Show>
+ <Show when={unavailable()}>
+ <p class="mt-2 text-xs text-ink-muted" role="status">
+ This repository is no longer accessible. New conversations will use
+ Auto-detect until you choose another repository or restore access.
+ </p>
+ </Show>
+ <Show
+ when={
+ !reachable.loading() &&
+ !reachable.error() &&
+ reachable.repositories().length === 0
+ }
+ >
+ <Button
+ variant="ghost"
+ size="sm"
+ onClick={() => openSettings('Connected')}
+ >
+ Connect GitHub
+ </Button>
+ </Show>
+ </div>
+ </SettingsRow>
+ );
+}
diff --git a/apps/web/src/features/settings/components/coding-preferences-setting.test.tsx b/apps/web/src/features/settings/components/coding-preferences-setting.test.tsx
index dde3fad9e1..3c26c28ef2 100644
--- a/apps/web/src/features/settings/components/coding-preferences-setting.test.tsx
+++ b/apps/web/src/features/settings/components/coding-preferences-setting.test.tsx
@@ -22,6 +22,9 @@ vi.mock('@core/component/Toast/Toast', () => ({
toast: { success: vi.fn(), failure: toastFailure },
}));
+// The repository row has its own suite.
+vi.mock('../DefaultRepository', () => ({ DefaultRepository: () => null }));
+
afterEach(() => {
vi.clearAllMocks();
queryClient.clear();
diff --git a/apps/web/src/features/settings/components/coding-preferences-setting.tsx b/apps/web/src/features/settings/components/coding-preferences-setting.tsx
index 9cf0451561..46c8f28d7a 100644
--- a/apps/web/src/features/settings/components/coding-preferences-setting.tsx
+++ b/apps/web/src/features/settings/components/coding-preferences-setting.tsx
@@ -6,9 +6,10 @@ import {
} from '@queries/agents/coding-preferences';
import type { CodingPreferencesBody } from '@service-agent-harness/client';
import { ToggleSwitch } from '@ui';
+import { DefaultRepository } from '../DefaultRepository';
import { SettingsCard, SettingsRow, SettingsSection } from '../primitives';
-/** What the user's new coding sessions do beyond their assignment. */
+/** Defaults for the user's new coding sessions: repository, tasks, and pull requests. */
export function CodingPreferencesSetting() {
const preferences = useCodingPreferencesQuery();
const setPreferences = useSetCodingPreferencesMutation();
@@ -51,6 +52,7 @@ export function CodingPreferencesSetting() {
return (
<SettingsSection title="Coding sessions">
<SettingsCard>
+ <DefaultRepository />
<PreferenceRow
preference="createTasks"
label="Create tasks"
diff --git a/docs/agent-guide/ai-chat.md b/docs/agent-guide/ai-chat.md
index ab9ea55673..fd3b941c8c 100644
--- a/docs/agent-guide/ai-chat.md
+++ b/docs/agent-guide/ai-chat.md
@@ -474,7 +474,7 @@ the shimmer.
input is briefly blocked (“Choosing Chat or Code…”) while `POST /agent-mode-choice` on the
agent harness asks Cloudflare's Clef Flash whether the prompt needs a coding agent. Code
starts the user's most recently used coding agent (else the first that can start) with its default model and
- **Choose automatically** for the repository; Chat starts the chat agent with the same
+ **Auto-detect** for the repository, not the saved default; Chat starts the chat agent with the same
model Chat mode would use. If no coding agent can start, the prompt goes to Chat
without asking; any failure or a 3s timeout also falls back to Chat. The session opens
under Chat or Code like one started from that mode.
@@ -560,17 +560,21 @@ the shimmer.
Selecting Chat hides the repository controls and keeps the mode switch in
the settings row, without remounting the editor or losing the draft. Reduced-motion
preferences disable the animation. The hidden drawer is inert. **Repository**
- (**Choose automatically** with a GitHub icon until one is picked) opens a searchable list:
- **Choose automatically**, then the repositories the signed-in user reaches
+ (**Auto-detect** with a GitHub icon unless a default was saved) opens a searchable list:
+ **Auto-detect**, then the repositories the signed-in user reaches
through Macro's GitHub App (`GET /agent-repositories` on the agent harness),
- recently used ones first. A new conversation always starts on **Choose
- repository** (Automatic); the last used repository is not preselected.
+ recently used ones first. **Settings → Agents → Coding sessions → Default
+ repository** lets the user save a GitHub repository or **Auto-detect** (the
+ initial default). New Code conversations preselect that choice; changing
+ the composer picker overrides it for that conversation. The preference is
+ saved per user on this device. An inaccessible saved repository falls back
+ to Auto-detect.
Typing filters the list to those reachable repositories. Unlisted GitHub
URLs and recents the listing no longer carries are not offered. Arrow keys
move the highlight and Enter or a click picks it; there is no separate
confirm button. Someone who reaches no repository sees a hint with **Connect
GitHub**, which opens Settings → Connected. Listed recents are remembered
- per user in local storage and offered first, without changing the Automatic
+ per user in local storage and offered first, without changing the saved
default. Automatic selection always chooses an accessible repository, using
the most recent accessible session repository when the prompt is ambiguous,
or the first available repository for users without repository history. Questions
diff --git a/docs/agent-guide/navigation.md b/docs/agent-guide/navigation.md
index 9abbe4ac90..4c6bb32543 100644
--- a/docs/agent-guide/navigation.md
+++ b/docs/agent-guide/navigation.md
@@ -1451,7 +1451,8 @@ restart rules still apply.
Settings → Agents, its Cursor guide, and Runtimes render while their requests are pending.
A pending Cursor model catalog shows `Loading models…` beside a disabled model
picker; a failed catalog shows an inline error. The rest of settings stays usable.
-Settings → Agents → Agents ends with **Coding sessions**: per-user **Create
+Settings → Agents → Agents ends with **Coding sessions**: a **Default repository**
+select saved per user on this device (see the AI chat guide), then per-user **Create
tasks** and **Open pull requests** switches, both off by default. Each saves on
toggle and reverts with a toast if the save fails.