Skip to content

feat: support folders without git #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MaicolBen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: support folders without git #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/components/CloseTaskDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export function CloseTaskDialog(props: CloseTaskDialogProps) {
title="Close Task"
message={
<div>
<Show when={props.task.gitIsolation === 'direct'}>
<Show when={props.task.gitIsolation !== 'worktree'}>
<p style={{ margin: '0' }}>
This will stop all running agents and shells for this task. No git operations will be
performed.
Expand Down Expand Up @@ -108,7 +108,7 @@ export function CloseTaskDialog(props: CloseTaskDialogProps) {
</Show>
</div>
}
confirmLabel={props.task.gitIsolation === 'direct' ? 'Close' : 'Delete'}
confirmLabel={props.task.gitIsolation === 'worktree' ? 'Delete' : 'Close'}
danger={props.task.gitIsolation === 'worktree'}
onConfirm={() => {
props.onDone();
Expand Down
203 changes: 104 additions & 99 deletions src/components/EditProjectDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,54 +222,56 @@ export function EditProjectDialog(props: EditProjectDialogProps) {
/>
</div>

{/* Branch prefix */}
<div style={{ display: 'flex', 'flex-direction': 'column', gap: '8px' }}>
<label style={sectionLabelStyle}>Branch prefix</label>
<input
class="input-field"
type="text"
value={branchPrefix()}
onInput={(e) => setBranchPrefix(e.currentTarget.value)}
onKeyDown={(e) => {
if (e.key === 'Enter' && canSave()) handleSave();
}}
placeholder="task"
style={{
background: theme.bgInput,
border: `1px solid ${theme.border}`,
'border-radius': '8px',
padding: '10px 14px',
color: theme.fg,
'font-size': '13px',
'font-family': "'JetBrains Mono', monospace",
outline: 'none',
}}
/>
<Show when={branchPrefix().trim()}>
<div
{/* Branch prefix — git projects only */}
<Show when={props.project?.isGitRepo !== false}>
<div style={{ display: 'flex', 'flex-direction': 'column', gap: '8px' }}>
<label style={sectionLabelStyle}>Branch prefix</label>
<input
class="input-field"
type="text"
value={branchPrefix()}
onInput={(e) => setBranchPrefix(e.currentTarget.value)}
onKeyDown={(e) => {
if (e.key === 'Enter' && canSave()) handleSave();
}}
placeholder="task"
style={{
'font-size': '11px',
background: theme.bgInput,
border: `1px solid ${theme.border}`,
'border-radius': '8px',
padding: '10px 14px',
color: theme.fg,
'font-size': '13px',
'font-family': "'JetBrains Mono', monospace",
color: theme.fgSubtle,
padding: '2px 2px 0',
display: 'flex',
'align-items': 'center',
gap: '6px',
outline: 'none',
}}
>
<svg
width="11"
height="11"
viewBox="0 0 16 16"
fill="currentColor"
style={{ 'flex-shrink': '0' }}
/>
<Show when={branchPrefix().trim()}>
<div
style={{
'font-size': '11px',
'font-family': "'JetBrains Mono', monospace",
color: theme.fgSubtle,
padding: '2px 2px 0',
display: 'flex',
'align-items': 'center',
gap: '6px',
}}
>
<path d="M5 3.25a.75.75 0 1 1-1.5 0 .75.75 0 0 1 1.5 0Zm6.25 7.5a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5ZM5 7.75a.75.75 0 1 1-1.5 0 .75.75 0 0 1 1.5 0Zm0 0h5.5a2.5 2.5 0 0 0 2.5-2.5v-.5a.75.75 0 0 0-1.5 0v.5a1 1 0 0 1-1 1H5a3.25 3.25 0 1 0 0 6.5h6.25a.75.75 0 0 0 0-1.5H5a1.75 1.75 0 1 1 0-3.5Z" />
</svg>
{sanitizeBranchPrefix(branchPrefix())}/{toBranchName('example-branch-name')}
</div>
</Show>
</div>
<svg
width="11"
height="11"
viewBox="0 0 16 16"
fill="currentColor"
style={{ 'flex-shrink': '0' }}
>
<path d="M5 3.25a.75.75 0 1 1-1.5 0 .75.75 0 0 1 1.5 0Zm6.25 7.5a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5ZM5 7.75a.75.75 0 1 1-1.5 0 .75.75 0 0 1 1.5 0Zm0 0h5.5a2.5 2.5 0 0 0 2.5-2.5v-.5a.75.75 0 0 0-1.5 0v.5a1 1 0 0 1-1 1H5a3.25 3.25 0 1 0 0 6.5h6.25a.75.75 0 0 0 0-1.5H5a1.75 1.75 0 1 1 0-3.5Z" />
</svg>
{sanitizeBranchPrefix(branchPrefix())}/{toBranchName('example-branch-name')}
</div>
</Show>
</div>
</Show>

{/* Color palette */}
<div style={{ display: 'flex', 'flex-direction': 'column', gap: '8px' }}>
Expand Down Expand Up @@ -303,64 +305,67 @@ export function EditProjectDialog(props: EditProjectDialogProps) {
</div>
</div>

{/* Merge cleanup preference */}
<label
style={{
display: 'flex',
'align-items': 'center',
gap: '8px',
cursor: 'pointer',
'font-size': '13px',
color: theme.fg,
}}
>
<input
type="checkbox"
checked={deleteBranchOnClose()}
onChange={(e) => setDeleteBranchOnClose(e.currentTarget.checked)}
style={{ cursor: 'pointer' }}
/>
Always delete branch and worklog on merge
</label>

{/* Default isolation mode */}
<div style={{ display: 'flex', 'flex-direction': 'column', gap: '8px' }}>
<label style={sectionLabelStyle}>Default Git Isolation</label>
<SegmentedButtons
options={[
{ value: 'worktree', label: 'Worktree' },
{ value: 'direct', label: 'Current Branch' },
]}
value={defaultGitIsolation()}
onChange={setDefaultGitIsolation}
/>
</div>

{/* Default base branch */}
<div style={{ display: 'flex', 'flex-direction': 'column', gap: '8px' }}>
<label style={sectionLabelStyle}>
Default base branch{' '}
<span style={{ opacity: '0.5', 'text-transform': 'none' }}>
(blank = auto-detect main)
</span>
</label>
<input
class="input-field"
type="text"
value={defaultBaseBranch()}
onInput={(e) => setDefaultBaseBranch(e.currentTarget.value)}
placeholder="main"
{/* Git-specific settings — hidden for non-git projects */}
<Show when={props.project?.isGitRepo !== false}>
{/* Merge cleanup preference */}
<label
style={{
background: theme.bgInput,
border: `1px solid ${theme.border}`,
'border-radius': '8px',
padding: '10px 14px',
color: theme.fg,
display: 'flex',
'align-items': 'center',
gap: '8px',
cursor: 'pointer',
'font-size': '13px',
outline: 'none',
color: theme.fg,
}}
/>
</div>
>
<input
type="checkbox"
checked={deleteBranchOnClose()}
onChange={(e) => setDeleteBranchOnClose(e.currentTarget.checked)}
style={{ cursor: 'pointer' }}
/>
Always delete branch and worklog on merge
</label>

{/* Default isolation mode */}
<div style={{ display: 'flex', 'flex-direction': 'column', gap: '8px' }}>
<label style={sectionLabelStyle}>Default Git Isolation</label>
<SegmentedButtons
options={[
{ value: 'worktree', label: 'Worktree' },
{ value: 'direct', label: 'Current Branch' },
]}
value={defaultGitIsolation()}
onChange={setDefaultGitIsolation}
/>
</div>

{/* Default base branch */}
<div style={{ display: 'flex', 'flex-direction': 'column', gap: '8px' }}>
<label style={sectionLabelStyle}>
Default base branch{' '}
<span style={{ opacity: '0.5', 'text-transform': 'none' }}>
(blank = auto-detect main)
</span>
</label>
<input
class="input-field"
type="text"
value={defaultBaseBranch()}
onInput={(e) => setDefaultBaseBranch(e.currentTarget.value)}
placeholder="main"
style={{
background: theme.bgInput,
border: `1px solid ${theme.border}`,
'border-radius': '8px',
padding: '10px 14px',
color: theme.fg,
'font-size': '13px',
outline: 'none',
}}
/>
</div>
</Show>

{/* Command Bookmarks */}
<div style={{ display: 'flex', 'flex-direction': 'column', gap: '8px' }}>
Expand Down
Loading