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
31 changes: 25 additions & 6 deletions apps/desktop/src-tauri/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ use codetwo_core::keymap::{Action as KeyAction, Keymap};
use codetwo_core::models::builtin_models;
use codetwo_core::permission::{ExecutionPolicy, PermissionMode, SandboxPolicy};
use codetwo_core::plugin::{self, InstalledPlugin, PluginCounts, PluginScaffold};
use codetwo_core::project::{self, ProjectScript};
use codetwo_core::project::{self, ProjectScript, ProjectWorktreeMode};
use codetwo_core::provider::{default_registry, Provider, ProviderId};
use codetwo_core::skill::{builtin_skills, DocBlock, Skill, SkillKind, SkillLibrary};
use codetwo_core::source_control::{self, SourceControlInfo};
Expand DownExpand Up@@ -1133,6 +1133,20 @@ fn rename_project(state: State<'_, AppState>, path: String, name: String) -> Res
}
}

#[tauri::command]
fn set_project_worktree_mode(
state: State<'_, AppState>,
path: String,
mode: Option<ProjectWorktreeMode>,
) -> Result<(), String> {
match state.engine.store() {
Some(store) => store
.set_project_worktree_mode(&path, mode)
.map_err(|e| e.to_string()),
None => Ok(()),
}
}

#[tauri::command]
fn remove_project(state: State<'_, AppState>, path: String) -> Result<(), String> {
match state.engine.store() {
Expand DownExpand Up@@ -1297,14 +1311,18 @@ struct UsageReport {

/// Scan local provider transcripts and report rolling usage windows (CodexBar-style).
#[tauri::command]
fn usage_report() -> UsageReport {
let records = codetwo_core::usage::scan_all();
async fn usage_report() -> UsageReport {
// A cold 30-day transcript walk can take noticeable time. Keep it off Tauri's command/UI
// thread; subsequent requests normally hit the core's bounded per-file cache.
let scan = tokio::task::spawn_blocking(codetwo_core::usage::scan_all_with_count)
.await
.unwrap_or_default();
let now = codetwo_core::session::now_millis();
let limits = codetwo_core::usage::Limits::from_env();
UsageReport {
windows: codetwo_core::usage::windows(&records, now, &limits),
by_source: codetwo_core::usage::by_source(&records),
transcripts: records.len(),
windows: codetwo_core::usage::windows(&scan.records, now, &limits),
by_source: codetwo_core::usage::by_source(&scan.records),
transcripts: scan.transcripts,
}
}

Expand DownExpand Up@@ -1710,6 +1728,7 @@ pub fn run() {
add_project,
open_project,
rename_project,
set_project_worktree_mode,
remove_project,
cancel_turn,
pty_spawn,
Expand Down
80 changes: 76 additions & 4 deletions apps/desktop/src/App.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,11 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { Archive, CircleAlert, Folder, Keyboard, PanelLeft, PanelRight } from "lucide-react";

import { DocEditor } from "./editor/Editor";
import {
loadBrowserHistory,
removeBrowserProject,
saveBrowserHistory,
} from "./browser/history";
import {
answerPermission,
applyPluginScaffold,
Expand DownExpand Up@@ -53,6 +58,7 @@ import {
setConfigOption,
setKeymap,
setModel,
setProjectWorktreeMode,
setSessionMemoryPolicy,
setExecutionPolicy,
submitPrompt,
Expand All@@ -74,6 +80,7 @@ import {
type PluginInfo,
type Project,
type ProjectScript,
type ProjectWorktreeMode,
type ProviderInfo,
type PermissionMode,
type Sandbox,
Expand DownExpand Up@@ -108,6 +115,10 @@ import {
type SessionMode,
} from "./session/mode";
import { Composer } from "./session/Composer";
import {
nextSessionWorktreeBaseline,
projectSwitchWorktreeBaseline,
} from "./session/projectDefaults";
import { TranscriptPane } from "./session/TranscriptPane";
import { useTranscriptScroll } from "./session/useTranscriptScroll";
import {
Expand DownExpand Up@@ -405,6 +416,10 @@ export default function App() {
// Mirrors `activeProject` so `selectProject` can tell a real switch from a re-click without
// remaking its callback (and the rail rows' props) on every project change.
const activeProjectRef = useRef<string | null>(null);
// Project list reads can overlap local preference writes. A read that started before or during
// a write must never restore the older SQLite snapshot after the write completes.
const projectLoadSeqRef = useRef(0);
const projectMutationVersionRef = useRef(0);
const memoryReadRef = useRef<MemoryAccess>("inherit");
const memoryWriteRef = useRef<MemoryAccess>("inherit");
const memoryReceiptsRef = useRef<MemoryReceipt[]>([]);
Expand DownExpand Up@@ -620,9 +635,42 @@ export default function App() {
}, [t, toast]);

const refreshProjects = useCallback(() => {
listProjects().then(setProjects).catch(() => {});
const seq = ++projectLoadSeqRef.current;
const mutationVersion = projectMutationVersionRef.current;
listProjects()
.then((items) => {
if (
seq === projectLoadSeqRef.current &&
mutationVersion === projectMutationVersionRef.current
) {
setProjects(items);
}
})
.catch(() => {});
}, []);

const updateProjectWorktreeMode = useCallback(
async (path: string, nextMode: ProjectWorktreeMode | null) => {
const patchMode = (mode: ProjectWorktreeMode | null) => (items: Project[]) =>
items.map((project) =>
project.path === path ? { ...project, default_worktree_mode: mode } : project,
);

projectMutationVersionRef.current += 1;
try {
await setProjectWorktreeMode(path, nextMode);
projectMutationVersionRef.current += 1;
// A project default seeds future drafts. It must not overwrite an explicit choice in the
// current Composer while Settings is open or while this native write is in flight.
setProjects(patchMode(nextMode));
} catch (error) {
projectMutationVersionRef.current += 1;
toast(t("toast.projectDefaultFailed", { error: String(error) }), "error");
}
},
[t, toast],
);

/** Switch projects: the working directory, the conversation list and the git section all follow. */
const selectProject = useCallback(
(path: string) => {
Expand All@@ -631,6 +679,8 @@ export default function App() {
invalidatePendingCreation();
setActiveProject(path);
setCwd(path);
const project = projects.find((item) => item.path === path);
setWorktreeBase(projectSwitchWorktreeBaseline(project?.default_worktree_mode ?? null));
// Selecting a project always opens a blank source-checkout draft, including a re-click of the
// current project. Keeping an active worktree session while `cwd` switches to the source would
// make file/Git/terminal surfaces show one checkout while the agent keeps editing another.
Expand All@@ -653,7 +703,7 @@ export default function App() {
setMemoryWrite("inherit");
void openProject(path).then(refreshProjects);
},
[invalidatePendingCreation, refreshProjects],
[invalidatePendingCreation, projects, refreshProjects],
);

const addProjectFolder = useCallback(async () => {
Expand DownExpand Up@@ -1150,8 +1200,19 @@ export default function App() {
setMemoryRead("inherit");
setMemoryWrite("inherit");
setCwd(source);
const baseline = sessionCreationBaseline(currentSession);
if (baseline !== undefined) setWorktreeBase(baseline);
// Pressing New while already on the unsent blank draft is a focus/reset no-op for workspace
// selection: keep the explicit Composer choice. Leaving a durable session starts a new draft
// and seeds that draft from the project preference or the prior session's baseline kind.
if (currentSessionId !== null) {
const projectMode = projects.find(
(project) => project.path === activeProjectRef.current,
)?.default_worktree_mode ?? null;
const baseline = nextSessionWorktreeBaseline(
projectMode,
sessionCreationBaseline(currentSession),
);
if (baseline !== undefined) setWorktreeBase(baseline);
}
// Caret into the document; whichever mode you're in stays yours.
setTimeout(() => focusEditorRef.current?.(), 0);
// A New action opens a configurable blank draft. The first Run creates the durable session,
Expand All@@ -1160,6 +1221,7 @@ export default function App() {
cwd,
sessions,
archivedSessions,
projects,
toast,
t,
invalidatePendingCreation,
Expand DownExpand Up@@ -1834,6 +1896,7 @@ export default function App() {
activeProjectRef.current = last.path;
setActiveProject(last.path);
setCwd(last.path);
setWorktreeBase(projectSwitchWorktreeBaseline(last.default_worktree_mode));
return;
}
const here = await defaultCwd();
Expand DownExpand Up@@ -1963,6 +2026,8 @@ export default function App() {
onResetAll={resetAllBindings}
providers={providers}
projectPath={activeProject ?? cwd}
project={projects.find((project) => project.path === activeProject) ?? null}
onProjectWorktreeMode={updateProjectWorktreeMode}
onClose={() => {
setShowSettings(false);
setCapturing(null);
Expand DownExpand Up@@ -1992,6 +2057,12 @@ export default function App() {
onRenameProject={(p, name) => void renameProject(p, name).then(refreshProjects)}
onRemoveProject={(p) => {
void removeProject(p).then(() => {
try {
const history = loadBrowserHistory(window.localStorage);
saveBrowserHistory(window.localStorage, removeBrowserProject(history, p));
} catch {
// Browser history is a convenience; a blocked local store must not block removal.
}
refreshProjects();
// Dropping the project you were in leaves nothing selected; fall back to the next one
// rather than stranding the rail on a project that's no longer listed.
Expand DownExpand Up@@ -2269,6 +2340,7 @@ export default function App() {
onTab={setDockTab}
onClose={() => setDockTab(null)}
cwd={cwd || null}
projectPath={activeProject ?? cwd ?? null}
sessionKey={activeSession ?? "main"}
git={git}
onRefreshGit={refreshGit}
Expand Down
10 changes: 10 additions & 0 deletions apps/desktop/src/bridge.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@ export interface SessionActivity {
}

export type WorktreeBaselineKind = "current" | "origin_default";
export type ProjectWorktreeMode = "local" | WorktreeBaselineKind;

export interface ResolvedWorktreeBaseline {
kind: WorktreeBaselineKind;
Expand All@@ -113,6 +114,8 @@ export interface Project {
path: string;
name: string;
last_opened_at: number;
/** Null follows the current draft/session; local is an explicit no-worktree default. */
default_worktree_mode: ProjectWorktreeMode | null;
}

export interface MemorySettings {
Expand DownExpand Up@@ -762,6 +765,13 @@ export async function renameProject(path: string, name: string): Promise<void> {
if (inTauri) await invoke("rename_project", { path, name });
}

export async function setProjectWorktreeMode(
path: string,
mode: ProjectWorktreeMode | null,
): Promise<void> {
if (inTauri) await invoke("set_project_worktree_mode", { path, mode });
}

export async function removeProject(path: string): Promise<void> {
if (inTauri) await invoke("remove_project", { path });
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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
31 changes: 25 additions & 6 deletions apps/desktop/src-tauri/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ use codetwo_core::keymap::{Action as KeyAction, Keymap};
use codetwo_core::models::builtin_models;
use codetwo_core::permission::{ExecutionPolicy, PermissionMode, SandboxPolicy};
use codetwo_core::plugin::{self, InstalledPlugin, PluginCounts, PluginScaffold};
use codetwo_core::project::{self, ProjectScript};
use codetwo_core::project::{self, ProjectScript, ProjectWorktreeMode};
use codetwo_core::provider::{default_registry, Provider, ProviderId};
use codetwo_core::skill::{builtin_skills, DocBlock, Skill, SkillKind, SkillLibrary};
use codetwo_core::source_control::{self, SourceControlInfo};
Expand DownExpand Up@@ -1133,6 +1133,20 @@ fn rename_project(state: State<'_, AppState>, path: String, name: String) -> Res
}
}

#[tauri::command]
fn set_project_worktree_mode(
state: State<'_, AppState>,
path: String,
mode: Option<ProjectWorktreeMode>,
) -> Result<(), String> {
match state.engine.store() {
Some(store) => store
.set_project_worktree_mode(&path, mode)
.map_err(|e| e.to_string()),
None => Ok(()),
}
}

#[tauri::command]
fn remove_project(state: State<'_, AppState>, path: String) -> Result<(), String> {
match state.engine.store() {
Expand DownExpand Up@@ -1297,14 +1311,18 @@ struct UsageReport {

/// Scan local provider transcripts and report rolling usage windows (CodexBar-style).
#[tauri::command]
fn usage_report() -> UsageReport {
let records = codetwo_core::usage::scan_all();
async fn usage_report() -> UsageReport {
// A cold 30-day transcript walk can take noticeable time. Keep it off Tauri's command/UI
// thread; subsequent requests normally hit the core's bounded per-file cache.
let scan = tokio::task::spawn_blocking(codetwo_core::usage::scan_all_with_count)
.await
.unwrap_or_default();
let now = codetwo_core::session::now_millis();
let limits = codetwo_core::usage::Limits::from_env();
UsageReport {
windows: codetwo_core::usage::windows(&records, now, &limits),
by_source: codetwo_core::usage::by_source(&records),
transcripts: records.len(),
windows: codetwo_core::usage::windows(&scan.records, now, &limits),
by_source: codetwo_core::usage::by_source(&scan.records),
transcripts: scan.transcripts,
}
}

Expand DownExpand Up@@ -1710,6 +1728,7 @@ pub fn run() {
add_project,
open_project,
rename_project,
set_project_worktree_mode,
remove_project,
cancel_turn,
pty_spawn,
Expand Down
80 changes: 76 additions & 4 deletions apps/desktop/src/App.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,11 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { Archive, CircleAlert, Folder, Keyboard, PanelLeft, PanelRight } from "lucide-react";

import { DocEditor } from "./editor/Editor";
import {
loadBrowserHistory,
removeBrowserProject,
saveBrowserHistory,
} from "./browser/history";
import {
answerPermission,
applyPluginScaffold,
Expand DownExpand Up@@ -53,6 +58,7 @@ import {
setConfigOption,
setKeymap,
setModel,
setProjectWorktreeMode,
setSessionMemoryPolicy,
setExecutionPolicy,
submitPrompt,
Expand All@@ -74,6 +80,7 @@ import {
type PluginInfo,
type Project,
type ProjectScript,
type ProjectWorktreeMode,
type ProviderInfo,
type PermissionMode,
type Sandbox,
Expand DownExpand Up@@ -108,6 +115,10 @@ import {
type SessionMode,
} from "./session/mode";
import { Composer } from "./session/Composer";
import {
nextSessionWorktreeBaseline,
projectSwitchWorktreeBaseline,
} from "./session/projectDefaults";
import { TranscriptPane } from "./session/TranscriptPane";
import { useTranscriptScroll } from "./session/useTranscriptScroll";
import {
Expand DownExpand Up@@ -405,6 +416,10 @@ export default function App() {
// Mirrors `activeProject` so `selectProject` can tell a real switch from a re-click without
// remaking its callback (and the rail rows' props) on every project change.
const activeProjectRef = useRef<string | null>(null);
// Project list reads can overlap local preference writes. A read that started before or during
// a write must never restore the older SQLite snapshot after the write completes.
const projectLoadSeqRef = useRef(0);
const projectMutationVersionRef = useRef(0);
const memoryReadRef = useRef<MemoryAccess>("inherit");
const memoryWriteRef = useRef<MemoryAccess>("inherit");
const memoryReceiptsRef = useRef<MemoryReceipt[]>([]);
Expand DownExpand Up@@ -620,9 +635,42 @@ export default function App() {
}, [t, toast]);

const refreshProjects = useCallback(() => {
listProjects().then(setProjects).catch(() => {});
const seq = ++projectLoadSeqRef.current;
const mutationVersion = projectMutationVersionRef.current;
listProjects()
.then((items) => {
if (
seq === projectLoadSeqRef.current &&
mutationVersion === projectMutationVersionRef.current
) {
setProjects(items);
}
})
.catch(() => {});
}, []);

const updateProjectWorktreeMode = useCallback(
async (path: string, nextMode: ProjectWorktreeMode | null) => {
const patchMode = (mode: ProjectWorktreeMode | null) => (items: Project[]) =>
items.map((project) =>
project.path === path ? { ...project, default_worktree_mode: mode } : project,
);

projectMutationVersionRef.current += 1;
try {
await setProjectWorktreeMode(path, nextMode);
projectMutationVersionRef.current += 1;
// A project default seeds future drafts. It must not overwrite an explicit choice in the
// current Composer while Settings is open or while this native write is in flight.
setProjects(patchMode(nextMode));
} catch (error) {
projectMutationVersionRef.current += 1;
toast(t("toast.projectDefaultFailed", { error: String(error) }), "error");
}
},
[t, toast],
);

/** Switch projects: the working directory, the conversation list and the git section all follow. */
const selectProject = useCallback(
(path: string) => {
Expand All@@ -631,6 +679,8 @@ export default function App() {
invalidatePendingCreation();
setActiveProject(path);
setCwd(path);
const project = projects.find((item) => item.path === path);
setWorktreeBase(projectSwitchWorktreeBaseline(project?.default_worktree_mode ?? null));
// Selecting a project always opens a blank source-checkout draft, including a re-click of the
// current project. Keeping an active worktree session while `cwd` switches to the source would
// make file/Git/terminal surfaces show one checkout while the agent keeps editing another.
Expand All@@ -653,7 +703,7 @@ export default function App() {
setMemoryWrite("inherit");
void openProject(path).then(refreshProjects);
},
[invalidatePendingCreation, refreshProjects],
[invalidatePendingCreation, projects, refreshProjects],
);

const addProjectFolder = useCallback(async () => {
Expand DownExpand Up@@ -1150,8 +1200,19 @@ export default function App() {
setMemoryRead("inherit");
setMemoryWrite("inherit");
setCwd(source);
const baseline = sessionCreationBaseline(currentSession);
if (baseline !== undefined) setWorktreeBase(baseline);
// Pressing New while already on the unsent blank draft is a focus/reset no-op for workspace
// selection: keep the explicit Composer choice. Leaving a durable session starts a new draft
// and seeds that draft from the project preference or the prior session's baseline kind.
if (currentSessionId !== null) {
const projectMode = projects.find(
(project) => project.path === activeProjectRef.current,
)?.default_worktree_mode ?? null;
const baseline = nextSessionWorktreeBaseline(
projectMode,
sessionCreationBaseline(currentSession),
);
if (baseline !== undefined) setWorktreeBase(baseline);
}
// Caret into the document; whichever mode you're in stays yours.
setTimeout(() => focusEditorRef.current?.(), 0);
// A New action opens a configurable blank draft. The first Run creates the durable session,
Expand All@@ -1160,6 +1221,7 @@ export default function App() {
cwd,
sessions,
archivedSessions,
projects,
toast,
t,
invalidatePendingCreation,
Expand DownExpand Up@@ -1834,6 +1896,7 @@ export default function App() {
activeProjectRef.current = last.path;
setActiveProject(last.path);
setCwd(last.path);
setWorktreeBase(projectSwitchWorktreeBaseline(last.default_worktree_mode));
return;
}
const here = await defaultCwd();
Expand DownExpand Up@@ -1963,6 +2026,8 @@ export default function App() {
onResetAll={resetAllBindings}
providers={providers}
projectPath={activeProject ?? cwd}
project={projects.find((project) => project.path === activeProject) ?? null}
onProjectWorktreeMode={updateProjectWorktreeMode}
onClose={() => {
setShowSettings(false);
setCapturing(null);
Expand DownExpand Up@@ -1992,6 +2057,12 @@ export default function App() {
onRenameProject={(p, name) => void renameProject(p, name).then(refreshProjects)}
onRemoveProject={(p) => {
void removeProject(p).then(() => {
try {
const history = loadBrowserHistory(window.localStorage);
saveBrowserHistory(window.localStorage, removeBrowserProject(history, p));
} catch {
// Browser history is a convenience; a blocked local store must not block removal.
}
refreshProjects();
// Dropping the project you were in leaves nothing selected; fall back to the next one
// rather than stranding the rail on a project that's no longer listed.
Expand DownExpand Up@@ -2269,6 +2340,7 @@ export default function App() {
onTab={setDockTab}
onClose={() => setDockTab(null)}
cwd={cwd || null}
projectPath={activeProject ?? cwd ?? null}
sessionKey={activeSession ?? "main"}
git={git}
onRefreshGit={refreshGit}
Expand Down
10 changes: 10 additions & 0 deletions apps/desktop/src/bridge.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@ export interface SessionActivity {
}

export type WorktreeBaselineKind = "current" | "origin_default";
export type ProjectWorktreeMode = "local" | WorktreeBaselineKind;

export interface ResolvedWorktreeBaseline {
kind: WorktreeBaselineKind;
Expand All@@ -113,6 +114,8 @@ export interface Project {
path: string;
name: string;
last_opened_at: number;
/** Null follows the current draft/session; local is an explicit no-worktree default. */
default_worktree_mode: ProjectWorktreeMode | null;
}

export interface MemorySettings {
Expand DownExpand Up@@ -762,6 +765,13 @@ export async function renameProject(path: string, name: string): Promise<void> {
if (inTauri) await invoke("rename_project", { path, name });
}

export async function setProjectWorktreeMode(
path: string,
mode: ProjectWorktreeMode | null,
): Promise<void> {
if (inTauri) await invoke("set_project_worktree_mode", { path, mode });
}

export async function removeProject(path: string): Promise<void> {
if (inTauri) await invoke("remove_project", { path });
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
31 changes: 25 additions & 6 deletions apps/desktop/src-tauri/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ use codetwo_core::keymap::{Action as KeyAction, Keymap};
use codetwo_core::models::builtin_models;
use codetwo_core::permission::{ExecutionPolicy, PermissionMode, SandboxPolicy};
use codetwo_core::plugin::{self, InstalledPlugin, PluginCounts, PluginScaffold};
use codetwo_core::project::{self, ProjectScript};
use codetwo_core::project::{self, ProjectScript, ProjectWorktreeMode};
use codetwo_core::provider::{default_registry, Provider, ProviderId};
use codetwo_core::skill::{builtin_skills, DocBlock, Skill, SkillKind, SkillLibrary};
use codetwo_core::source_control::{self, SourceControlInfo};
Expand DownExpand Up@@ -1133,6 +1133,20 @@ fn rename_project(state: State<'_, AppState>, path: String, name: String) -> Res
}
}

#[tauri::command]
fn set_project_worktree_mode(
state: State<'_, AppState>,
path: String,
mode: Option<ProjectWorktreeMode>,
) -> Result<(), String> {
match state.engine.store() {
Some(store) => store
.set_project_worktree_mode(&path, mode)
.map_err(|e| e.to_string()),
None => Ok(()),
}
}

#[tauri::command]
fn remove_project(state: State<'_, AppState>, path: String) -> Result<(), String> {
match state.engine.store() {
Expand DownExpand Up@@ -1297,14 +1311,18 @@ struct UsageReport {

/// Scan local provider transcripts and report rolling usage windows (CodexBar-style).
#[tauri::command]
fn usage_report() -> UsageReport {
let records = codetwo_core::usage::scan_all();
async fn usage_report() -> UsageReport {
// A cold 30-day transcript walk can take noticeable time. Keep it off Tauri's command/UI
// thread; subsequent requests normally hit the core's bounded per-file cache.
let scan = tokio::task::spawn_blocking(codetwo_core::usage::scan_all_with_count)
.await
.unwrap_or_default();
let now = codetwo_core::session::now_millis();
let limits = codetwo_core::usage::Limits::from_env();
UsageReport {
windows: codetwo_core::usage::windows(&records, now, &limits),
by_source: codetwo_core::usage::by_source(&records),
transcripts: records.len(),
windows: codetwo_core::usage::windows(&scan.records, now, &limits),
by_source: codetwo_core::usage::by_source(&scan.records),
transcripts: scan.transcripts,
}
}

Expand DownExpand Up@@ -1710,6 +1728,7 @@ pub fn run() {
add_project,
open_project,
rename_project,
set_project_worktree_mode,
remove_project,
cancel_turn,
pty_spawn,
Expand Down
80 changes: 76 additions & 4 deletions apps/desktop/src/App.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,11 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { Archive, CircleAlert, Folder, Keyboard, PanelLeft, PanelRight } from "lucide-react";

import { DocEditor } from "./editor/Editor";
import {
loadBrowserHistory,
removeBrowserProject,
saveBrowserHistory,
} from "./browser/history";
import {
answerPermission,
applyPluginScaffold,
Expand DownExpand Up@@ -53,6 +58,7 @@ import {
setConfigOption,
setKeymap,
setModel,
setProjectWorktreeMode,
setSessionMemoryPolicy,
setExecutionPolicy,
submitPrompt,
Expand All@@ -74,6 +80,7 @@ import {
type PluginInfo,
type Project,
type ProjectScript,
type ProjectWorktreeMode,
type ProviderInfo,
type PermissionMode,
type Sandbox,
Expand DownExpand Up@@ -108,6 +115,10 @@ import {
type SessionMode,
} from "./session/mode";
import { Composer } from "./session/Composer";
import {
nextSessionWorktreeBaseline,
projectSwitchWorktreeBaseline,
} from "./session/projectDefaults";
import { TranscriptPane } from "./session/TranscriptPane";
import { useTranscriptScroll } from "./session/useTranscriptScroll";
import {
Expand DownExpand Up@@ -405,6 +416,10 @@ export default function App() {
// Mirrors `activeProject` so `selectProject` can tell a real switch from a re-click without
// remaking its callback (and the rail rows' props) on every project change.
const activeProjectRef = useRef<string | null>(null);
// Project list reads can overlap local preference writes. A read that started before or during
// a write must never restore the older SQLite snapshot after the write completes.
const projectLoadSeqRef = useRef(0);
const projectMutationVersionRef = useRef(0);
const memoryReadRef = useRef<MemoryAccess>("inherit");
const memoryWriteRef = useRef<MemoryAccess>("inherit");
const memoryReceiptsRef = useRef<MemoryReceipt[]>([]);
Expand DownExpand Up@@ -620,9 +635,42 @@ export default function App() {
}, [t, toast]);

const refreshProjects = useCallback(() => {
listProjects().then(setProjects).catch(() => {});
const seq = ++projectLoadSeqRef.current;
const mutationVersion = projectMutationVersionRef.current;
listProjects()
.then((items) => {
if (
seq === projectLoadSeqRef.current &&
mutationVersion === projectMutationVersionRef.current
) {
setProjects(items);
}
})
.catch(() => {});
}, []);

const updateProjectWorktreeMode = useCallback(
async (path: string, nextMode: ProjectWorktreeMode | null) => {
const patchMode = (mode: ProjectWorktreeMode | null) => (items: Project[]) =>
items.map((project) =>
project.path === path ? { ...project, default_worktree_mode: mode } : project,
);

projectMutationVersionRef.current += 1;
try {
await setProjectWorktreeMode(path, nextMode);
projectMutationVersionRef.current += 1;
// A project default seeds future drafts. It must not overwrite an explicit choice in the
// current Composer while Settings is open or while this native write is in flight.
setProjects(patchMode(nextMode));
} catch (error) {
projectMutationVersionRef.current += 1;
toast(t("toast.projectDefaultFailed", { error: String(error) }), "error");
}
},
[t, toast],
);

/** Switch projects: the working directory, the conversation list and the git section all follow. */
const selectProject = useCallback(
(path: string) => {
Expand All@@ -631,6 +679,8 @@ export default function App() {
invalidatePendingCreation();
setActiveProject(path);
setCwd(path);
const project = projects.find((item) => item.path === path);
setWorktreeBase(projectSwitchWorktreeBaseline(project?.default_worktree_mode ?? null));
// Selecting a project always opens a blank source-checkout draft, including a re-click of the
// current project. Keeping an active worktree session while `cwd` switches to the source would
// make file/Git/terminal surfaces show one checkout while the agent keeps editing another.
Expand All@@ -653,7 +703,7 @@ export default function App() {
setMemoryWrite("inherit");
void openProject(path).then(refreshProjects);
},
[invalidatePendingCreation, refreshProjects],
[invalidatePendingCreation, projects, refreshProjects],
);

const addProjectFolder = useCallback(async () => {
Expand DownExpand Up@@ -1150,8 +1200,19 @@ export default function App() {
setMemoryRead("inherit");
setMemoryWrite("inherit");
setCwd(source);
const baseline = sessionCreationBaseline(currentSession);
if (baseline !== undefined) setWorktreeBase(baseline);
// Pressing New while already on the unsent blank draft is a focus/reset no-op for workspace
// selection: keep the explicit Composer choice. Leaving a durable session starts a new draft
// and seeds that draft from the project preference or the prior session's baseline kind.
if (currentSessionId !== null) {
const projectMode = projects.find(
(project) => project.path === activeProjectRef.current,
)?.default_worktree_mode ?? null;
const baseline = nextSessionWorktreeBaseline(
projectMode,
sessionCreationBaseline(currentSession),
);
if (baseline !== undefined) setWorktreeBase(baseline);
}
// Caret into the document; whichever mode you're in stays yours.
setTimeout(() => focusEditorRef.current?.(), 0);
// A New action opens a configurable blank draft. The first Run creates the durable session,
Expand All@@ -1160,6 +1221,7 @@ export default function App() {
cwd,
sessions,
archivedSessions,
projects,
toast,
t,
invalidatePendingCreation,
Expand DownExpand Up@@ -1834,6 +1896,7 @@ export default function App() {
activeProjectRef.current = last.path;
setActiveProject(last.path);
setCwd(last.path);
setWorktreeBase(projectSwitchWorktreeBaseline(last.default_worktree_mode));
return;
}
const here = await defaultCwd();
Expand DownExpand Up@@ -1963,6 +2026,8 @@ export default function App() {
onResetAll={resetAllBindings}
providers={providers}
projectPath={activeProject ?? cwd}
project={projects.find((project) => project.path === activeProject) ?? null}
onProjectWorktreeMode={updateProjectWorktreeMode}
onClose={() => {
setShowSettings(false);
setCapturing(null);
Expand DownExpand Up@@ -1992,6 +2057,12 @@ export default function App() {
onRenameProject={(p, name) => void renameProject(p, name).then(refreshProjects)}
onRemoveProject={(p) => {
void removeProject(p).then(() => {
try {
const history = loadBrowserHistory(window.localStorage);
saveBrowserHistory(window.localStorage, removeBrowserProject(history, p));
} catch {
// Browser history is a convenience; a blocked local store must not block removal.
}
refreshProjects();
// Dropping the project you were in leaves nothing selected; fall back to the next one
// rather than stranding the rail on a project that's no longer listed.
Expand DownExpand Up@@ -2269,6 +2340,7 @@ export default function App() {
onTab={setDockTab}
onClose={() => setDockTab(null)}
cwd={cwd || null}
projectPath={activeProject ?? cwd ?? null}
sessionKey={activeSession ?? "main"}
git={git}
onRefreshGit={refreshGit}
Expand Down
10 changes: 10 additions & 0 deletions apps/desktop/src/bridge.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@ export interface SessionActivity {
}

export type WorktreeBaselineKind = "current" | "origin_default";
export type ProjectWorktreeMode = "local" | WorktreeBaselineKind;

export interface ResolvedWorktreeBaseline {
kind: WorktreeBaselineKind;
Expand All@@ -113,6 +114,8 @@ export interface Project {
path: string;
name: string;
last_opened_at: number;
/** Null follows the current draft/session; local is an explicit no-worktree default. */
default_worktree_mode: ProjectWorktreeMode | null;
}

export interface MemorySettings {
Expand DownExpand Up@@ -762,6 +765,13 @@ export async function renameProject(path: string, name: string): Promise<void> {
if (inTauri) await invoke("rename_project", { path, name });
}

export async function setProjectWorktreeMode(
path: string,
mode: ProjectWorktreeMode | null,
): Promise<void> {
if (inTauri) await invoke("set_project_worktree_mode", { path, mode });
}

export async function removeProject(path: string): Promise<void> {
if (inTauri) await invoke("remove_project", { path });
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
31 changes: 25 additions & 6 deletions apps/desktop/src-tauri/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ use codetwo_core::keymap::{Action as KeyAction, Keymap};
use codetwo_core::models::builtin_models;
use codetwo_core::permission::{ExecutionPolicy, PermissionMode, SandboxPolicy};
use codetwo_core::plugin::{self, InstalledPlugin, PluginCounts, PluginScaffold};
use codetwo_core::project::{self, ProjectScript};
use codetwo_core::project::{self, ProjectScript, ProjectWorktreeMode};
use codetwo_core::provider::{default_registry, Provider, ProviderId};
use codetwo_core::skill::{builtin_skills, DocBlock, Skill, SkillKind, SkillLibrary};
use codetwo_core::source_control::{self, SourceControlInfo};
Expand DownExpand Up@@ -1133,6 +1133,20 @@ fn rename_project(state: State<'_, AppState>, path: String, name: String) -> Res
}
}

#[tauri::command]
fn set_project_worktree_mode(
state: State<'_, AppState>,
path: String,
mode: Option<ProjectWorktreeMode>,
) -> Result<(), String> {
match state.engine.store() {
Some(store) => store
.set_project_worktree_mode(&path, mode)
.map_err(|e| e.to_string()),
None => Ok(()),
}
}

#[tauri::command]
fn remove_project(state: State<'_, AppState>, path: String) -> Result<(), String> {
match state.engine.store() {
Expand DownExpand Up@@ -1297,14 +1311,18 @@ struct UsageReport {

/// Scan local provider transcripts and report rolling usage windows (CodexBar-style).
#[tauri::command]
fn usage_report() -> UsageReport {
let records = codetwo_core::usage::scan_all();
async fn usage_report() -> UsageReport {
// A cold 30-day transcript walk can take noticeable time. Keep it off Tauri's command/UI
// thread; subsequent requests normally hit the core's bounded per-file cache.
let scan = tokio::task::spawn_blocking(codetwo_core::usage::scan_all_with_count)
.await
.unwrap_or_default();
let now = codetwo_core::session::now_millis();
let limits = codetwo_core::usage::Limits::from_env();
UsageReport {
windows: codetwo_core::usage::windows(&records, now, &limits),
by_source: codetwo_core::usage::by_source(&records),
transcripts: records.len(),
windows: codetwo_core::usage::windows(&scan.records, now, &limits),
by_source: codetwo_core::usage::by_source(&scan.records),
transcripts: scan.transcripts,
}
}

Expand DownExpand Up@@ -1710,6 +1728,7 @@ pub fn run() {
add_project,
open_project,
rename_project,
set_project_worktree_mode,
remove_project,
cancel_turn,
pty_spawn,
Expand Down
80 changes: 76 additions & 4 deletions apps/desktop/src/App.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,11 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { Archive, CircleAlert, Folder, Keyboard, PanelLeft, PanelRight } from "lucide-react";

import { DocEditor } from "./editor/Editor";
import {
loadBrowserHistory,
removeBrowserProject,
saveBrowserHistory,
} from "./browser/history";
import {
answerPermission,
applyPluginScaffold,
Expand DownExpand Up@@ -53,6 +58,7 @@ import {
setConfigOption,
setKeymap,
setModel,
setProjectWorktreeMode,
setSessionMemoryPolicy,
setExecutionPolicy,
submitPrompt,
Expand All@@ -74,6 +80,7 @@ import {
type PluginInfo,
type Project,
type ProjectScript,
type ProjectWorktreeMode,
type ProviderInfo,
type PermissionMode,
type Sandbox,
Expand DownExpand Up@@ -108,6 +115,10 @@ import {
type SessionMode,
} from "./session/mode";
import { Composer } from "./session/Composer";
import {
nextSessionWorktreeBaseline,
projectSwitchWorktreeBaseline,
} from "./session/projectDefaults";
import { TranscriptPane } from "./session/TranscriptPane";
import { useTranscriptScroll } from "./session/useTranscriptScroll";
import {
Expand DownExpand Up@@ -405,6 +416,10 @@ export default function App() {
// Mirrors `activeProject` so `selectProject` can tell a real switch from a re-click without
// remaking its callback (and the rail rows' props) on every project change.
const activeProjectRef = useRef<string | null>(null);
// Project list reads can overlap local preference writes. A read that started before or during
// a write must never restore the older SQLite snapshot after the write completes.
const projectLoadSeqRef = useRef(0);
const projectMutationVersionRef = useRef(0);
const memoryReadRef = useRef<MemoryAccess>("inherit");
const memoryWriteRef = useRef<MemoryAccess>("inherit");
const memoryReceiptsRef = useRef<MemoryReceipt[]>([]);
Expand DownExpand Up@@ -620,9 +635,42 @@ export default function App() {
}, [t, toast]);

const refreshProjects = useCallback(() => {
listProjects().then(setProjects).catch(() => {});
const seq = ++projectLoadSeqRef.current;
const mutationVersion = projectMutationVersionRef.current;
listProjects()
.then((items) => {
if (
seq === projectLoadSeqRef.current &&
mutationVersion === projectMutationVersionRef.current
) {
setProjects(items);
}
})
.catch(() => {});
}, []);

const updateProjectWorktreeMode = useCallback(
async (path: string, nextMode: ProjectWorktreeMode | null) => {
const patchMode = (mode: ProjectWorktreeMode | null) => (items: Project[]) =>
items.map((project) =>
project.path === path ? { ...project, default_worktree_mode: mode } : project,
);

projectMutationVersionRef.current += 1;
try {
await setProjectWorktreeMode(path, nextMode);
projectMutationVersionRef.current += 1;
// A project default seeds future drafts. It must not overwrite an explicit choice in the
// current Composer while Settings is open or while this native write is in flight.
setProjects(patchMode(nextMode));
} catch (error) {
projectMutationVersionRef.current += 1;
toast(t("toast.projectDefaultFailed", { error: String(error) }), "error");
}
},
[t, toast],
);

/** Switch projects: the working directory, the conversation list and the git section all follow. */
const selectProject = useCallback(
(path: string) => {
Expand All@@ -631,6 +679,8 @@ export default function App() {
invalidatePendingCreation();
setActiveProject(path);
setCwd(path);
const project = projects.find((item) => item.path === path);
setWorktreeBase(projectSwitchWorktreeBaseline(project?.default_worktree_mode ?? null));
// Selecting a project always opens a blank source-checkout draft, including a re-click of the
// current project. Keeping an active worktree session while `cwd` switches to the source would
// make file/Git/terminal surfaces show one checkout while the agent keeps editing another.
Expand All@@ -653,7 +703,7 @@ export default function App() {
setMemoryWrite("inherit");
void openProject(path).then(refreshProjects);
},
[invalidatePendingCreation, refreshProjects],
[invalidatePendingCreation, projects, refreshProjects],
);

const addProjectFolder = useCallback(async () => {
Expand DownExpand Up@@ -1150,8 +1200,19 @@ export default function App() {
setMemoryRead("inherit");
setMemoryWrite("inherit");
setCwd(source);
const baseline = sessionCreationBaseline(currentSession);
if (baseline !== undefined) setWorktreeBase(baseline);
// Pressing New while already on the unsent blank draft is a focus/reset no-op for workspace
// selection: keep the explicit Composer choice. Leaving a durable session starts a new draft
// and seeds that draft from the project preference or the prior session's baseline kind.
if (currentSessionId !== null) {
const projectMode = projects.find(
(project) => project.path === activeProjectRef.current,
)?.default_worktree_mode ?? null;
const baseline = nextSessionWorktreeBaseline(
projectMode,
sessionCreationBaseline(currentSession),
);
if (baseline !== undefined) setWorktreeBase(baseline);
}
// Caret into the document; whichever mode you're in stays yours.
setTimeout(() => focusEditorRef.current?.(), 0);
// A New action opens a configurable blank draft. The first Run creates the durable session,
Expand All@@ -1160,6 +1221,7 @@ export default function App() {
cwd,
sessions,
archivedSessions,
projects,
toast,
t,
invalidatePendingCreation,
Expand DownExpand Up@@ -1834,6 +1896,7 @@ export default function App() {
activeProjectRef.current = last.path;
setActiveProject(last.path);
setCwd(last.path);
setWorktreeBase(projectSwitchWorktreeBaseline(last.default_worktree_mode));
return;
}
const here = await defaultCwd();
Expand DownExpand Up@@ -1963,6 +2026,8 @@ export default function App() {
onResetAll={resetAllBindings}
providers={providers}
projectPath={activeProject ?? cwd}
project={projects.find((project) => project.path === activeProject) ?? null}
onProjectWorktreeMode={updateProjectWorktreeMode}
onClose={() => {
setShowSettings(false);
setCapturing(null);
Expand DownExpand Up@@ -1992,6 +2057,12 @@ export default function App() {
onRenameProject={(p, name) => void renameProject(p, name).then(refreshProjects)}
onRemoveProject={(p) => {
void removeProject(p).then(() => {
try {
const history = loadBrowserHistory(window.localStorage);
saveBrowserHistory(window.localStorage, removeBrowserProject(history, p));
} catch {
// Browser history is a convenience; a blocked local store must not block removal.
}
refreshProjects();
// Dropping the project you were in leaves nothing selected; fall back to the next one
// rather than stranding the rail on a project that's no longer listed.
Expand DownExpand Up@@ -2269,6 +2340,7 @@ export default function App() {
onTab={setDockTab}
onClose={() => setDockTab(null)}
cwd={cwd || null}
projectPath={activeProject ?? cwd ?? null}
sessionKey={activeSession ?? "main"}
git={git}
onRefreshGit={refreshGit}
Expand Down
10 changes: 10 additions & 0 deletions apps/desktop/src/bridge.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@ export interface SessionActivity {
}

export type WorktreeBaselineKind = "current" | "origin_default";
export type ProjectWorktreeMode = "local" | WorktreeBaselineKind;

export interface ResolvedWorktreeBaseline {
kind: WorktreeBaselineKind;
Expand All@@ -113,6 +114,8 @@ export interface Project {
path: string;
name: string;
last_opened_at: number;
/** Null follows the current draft/session; local is an explicit no-worktree default. */
default_worktree_mode: ProjectWorktreeMode | null;
}

export interface MemorySettings {
Expand DownExpand Up@@ -762,6 +765,13 @@ export async function renameProject(path: string, name: string): Promise<void> {
if (inTauri) await invoke("rename_project", { path, name });
}

export async function setProjectWorktreeMode(
path: string,
mode: ProjectWorktreeMode | null,
): Promise<void> {
if (inTauri) await invoke("set_project_worktree_mode", { path, mode });
}

export async function removeProject(path: string): Promise<void> {
if (inTauri) await invoke("remove_project", { path });
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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
31 changes: 25 additions & 6 deletions apps/desktop/src-tauri/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ use codetwo_core::keymap::{Action as KeyAction, Keymap};
use codetwo_core::models::builtin_models;
use codetwo_core::permission::{ExecutionPolicy, PermissionMode, SandboxPolicy};
use codetwo_core::plugin::{self, InstalledPlugin, PluginCounts, PluginScaffold};
use codetwo_core::project::{self, ProjectScript};
use codetwo_core::project::{self, ProjectScript, ProjectWorktreeMode};
use codetwo_core::provider::{default_registry, Provider, ProviderId};
use codetwo_core::skill::{builtin_skills, DocBlock, Skill, SkillKind, SkillLibrary};
use codetwo_core::source_control::{self, SourceControlInfo};
Expand DownExpand Up@@ -1133,6 +1133,20 @@ fn rename_project(state: State<'_, AppState>, path: String, name: String) -> Res
}
}

#[tauri::command]
fn set_project_worktree_mode(
state: State<'_, AppState>,
path: String,
mode: Option<ProjectWorktreeMode>,
) -> Result<(), String> {
match state.engine.store() {
Some(store) => store
.set_project_worktree_mode(&path, mode)
.map_err(|e| e.to_string()),
None => Ok(()),
}
}

#[tauri::command]
fn remove_project(state: State<'_, AppState>, path: String) -> Result<(), String> {
match state.engine.store() {
Expand DownExpand Up@@ -1297,14 +1311,18 @@ struct UsageReport {

/// Scan local provider transcripts and report rolling usage windows (CodexBar-style).
#[tauri::command]
fn usage_report() -> UsageReport {
let records = codetwo_core::usage::scan_all();
async fn usage_report() -> UsageReport {
// A cold 30-day transcript walk can take noticeable time. Keep it off Tauri's command/UI
// thread; subsequent requests normally hit the core's bounded per-file cache.
let scan = tokio::task::spawn_blocking(codetwo_core::usage::scan_all_with_count)
.await
.unwrap_or_default();
let now = codetwo_core::session::now_millis();
let limits = codetwo_core::usage::Limits::from_env();
UsageReport {
windows: codetwo_core::usage::windows(&records, now, &limits),
by_source: codetwo_core::usage::by_source(&records),
transcripts: records.len(),
windows: codetwo_core::usage::windows(&scan.records, now, &limits),
by_source: codetwo_core::usage::by_source(&scan.records),
transcripts: scan.transcripts,
}
}

Expand DownExpand Up@@ -1710,6 +1728,7 @@ pub fn run() {
add_project,
open_project,
rename_project,
set_project_worktree_mode,
remove_project,
cancel_turn,
pty_spawn,
Expand Down
80 changes: 76 additions & 4 deletions apps/desktop/src/App.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,11 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { Archive, CircleAlert, Folder, Keyboard, PanelLeft, PanelRight } from "lucide-react";

import { DocEditor } from "./editor/Editor";
import {
loadBrowserHistory,
removeBrowserProject,
saveBrowserHistory,
} from "./browser/history";
import {
answerPermission,
applyPluginScaffold,
Expand DownExpand Up@@ -53,6 +58,7 @@ import {
setConfigOption,
setKeymap,
setModel,
setProjectWorktreeMode,
setSessionMemoryPolicy,
setExecutionPolicy,
submitPrompt,
Expand All@@ -74,6 +80,7 @@ import {
type PluginInfo,
type Project,
type ProjectScript,
type ProjectWorktreeMode,
type ProviderInfo,
type PermissionMode,
type Sandbox,
Expand DownExpand Up@@ -108,6 +115,10 @@ import {
type SessionMode,
} from "./session/mode";
import { Composer } from "./session/Composer";
import {
nextSessionWorktreeBaseline,
projectSwitchWorktreeBaseline,
} from "./session/projectDefaults";
import { TranscriptPane } from "./session/TranscriptPane";
import { useTranscriptScroll } from "./session/useTranscriptScroll";
import {
Expand DownExpand Up@@ -405,6 +416,10 @@ export default function App() {
// Mirrors `activeProject` so `selectProject` can tell a real switch from a re-click without
// remaking its callback (and the rail rows' props) on every project change.
const activeProjectRef = useRef<string | null>(null);
// Project list reads can overlap local preference writes. A read that started before or during
// a write must never restore the older SQLite snapshot after the write completes.
const projectLoadSeqRef = useRef(0);
const projectMutationVersionRef = useRef(0);
const memoryReadRef = useRef<MemoryAccess>("inherit");
const memoryWriteRef = useRef<MemoryAccess>("inherit");
const memoryReceiptsRef = useRef<MemoryReceipt[]>([]);
Expand DownExpand Up@@ -620,9 +635,42 @@ export default function App() {
}, [t, toast]);

const refreshProjects = useCallback(() => {
listProjects().then(setProjects).catch(() => {});
const seq = ++projectLoadSeqRef.current;
const mutationVersion = projectMutationVersionRef.current;
listProjects()
.then((items) => {
if (
seq === projectLoadSeqRef.current &&
mutationVersion === projectMutationVersionRef.current
) {
setProjects(items);
}
})
.catch(() => {});
}, []);

const updateProjectWorktreeMode = useCallback(
async (path: string, nextMode: ProjectWorktreeMode | null) => {
const patchMode = (mode: ProjectWorktreeMode | null) => (items: Project[]) =>
items.map((project) =>
project.path === path ? { ...project, default_worktree_mode: mode } : project,
);

projectMutationVersionRef.current += 1;
try {
await setProjectWorktreeMode(path, nextMode);
projectMutationVersionRef.current += 1;
// A project default seeds future drafts. It must not overwrite an explicit choice in the
// current Composer while Settings is open or while this native write is in flight.
setProjects(patchMode(nextMode));
} catch (error) {
projectMutationVersionRef.current += 1;
toast(t("toast.projectDefaultFailed", { error: String(error) }), "error");
}
},
[t, toast],
);

/** Switch projects: the working directory, the conversation list and the git section all follow. */
const selectProject = useCallback(
(path: string) => {
Expand All@@ -631,6 +679,8 @@ export default function App() {
invalidatePendingCreation();
setActiveProject(path);
setCwd(path);
const project = projects.find((item) => item.path === path);
setWorktreeBase(projectSwitchWorktreeBaseline(project?.default_worktree_mode ?? null));
// Selecting a project always opens a blank source-checkout draft, including a re-click of the
// current project. Keeping an active worktree session while `cwd` switches to the source would
// make file/Git/terminal surfaces show one checkout while the agent keeps editing another.
Expand All@@ -653,7 +703,7 @@ export default function App() {
setMemoryWrite("inherit");
void openProject(path).then(refreshProjects);
},
[invalidatePendingCreation, refreshProjects],
[invalidatePendingCreation, projects, refreshProjects],
);

const addProjectFolder = useCallback(async () => {
Expand DownExpand Up@@ -1150,8 +1200,19 @@ export default function App() {
setMemoryRead("inherit");
setMemoryWrite("inherit");
setCwd(source);
const baseline = sessionCreationBaseline(currentSession);
if (baseline !== undefined) setWorktreeBase(baseline);
// Pressing New while already on the unsent blank draft is a focus/reset no-op for workspace
// selection: keep the explicit Composer choice. Leaving a durable session starts a new draft
// and seeds that draft from the project preference or the prior session's baseline kind.
if (currentSessionId !== null) {
const projectMode = projects.find(
(project) => project.path === activeProjectRef.current,
)?.default_worktree_mode ?? null;
const baseline = nextSessionWorktreeBaseline(
projectMode,
sessionCreationBaseline(currentSession),
);
if (baseline !== undefined) setWorktreeBase(baseline);
}
// Caret into the document; whichever mode you're in stays yours.
setTimeout(() => focusEditorRef.current?.(), 0);
// A New action opens a configurable blank draft. The first Run creates the durable session,
Expand All@@ -1160,6 +1221,7 @@ export default function App() {
cwd,
sessions,
archivedSessions,
projects,
toast,
t,
invalidatePendingCreation,
Expand DownExpand Up@@ -1834,6 +1896,7 @@ export default function App() {
activeProjectRef.current = last.path;
setActiveProject(last.path);
setCwd(last.path);
setWorktreeBase(projectSwitchWorktreeBaseline(last.default_worktree_mode));
return;
}
const here = await defaultCwd();
Expand DownExpand Up@@ -1963,6 +2026,8 @@ export default function App() {
onResetAll={resetAllBindings}
providers={providers}
projectPath={activeProject ?? cwd}
project={projects.find((project) => project.path === activeProject) ?? null}
onProjectWorktreeMode={updateProjectWorktreeMode}
onClose={() => {
setShowSettings(false);
setCapturing(null);
Expand DownExpand Up@@ -1992,6 +2057,12 @@ export default function App() {
onRenameProject={(p, name) => void renameProject(p, name).then(refreshProjects)}
onRemoveProject={(p) => {
void removeProject(p).then(() => {
try {
const history = loadBrowserHistory(window.localStorage);
saveBrowserHistory(window.localStorage, removeBrowserProject(history, p));
} catch {
// Browser history is a convenience; a blocked local store must not block removal.
}
refreshProjects();
// Dropping the project you were in leaves nothing selected; fall back to the next one
// rather than stranding the rail on a project that's no longer listed.
Expand DownExpand Up@@ -2269,6 +2340,7 @@ export default function App() {
onTab={setDockTab}
onClose={() => setDockTab(null)}
cwd={cwd || null}
projectPath={activeProject ?? cwd ?? null}
sessionKey={activeSession ?? "main"}
git={git}
onRefreshGit={refreshGit}
Expand Down
10 changes: 10 additions & 0 deletions apps/desktop/src/bridge.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@ export interface SessionActivity {
}

export type WorktreeBaselineKind = "current" | "origin_default";
export type ProjectWorktreeMode = "local" | WorktreeBaselineKind;

export interface ResolvedWorktreeBaseline {
kind: WorktreeBaselineKind;
Expand All@@ -113,6 +114,8 @@ export interface Project {
path: string;
name: string;
last_opened_at: number;
/** Null follows the current draft/session; local is an explicit no-worktree default. */
default_worktree_mode: ProjectWorktreeMode | null;
}

export interface MemorySettings {
Expand DownExpand Up@@ -762,6 +765,13 @@ export async function renameProject(path: string, name: string): Promise<void> {
if (inTauri) await invoke("rename_project", { path, name });
}

export async function setProjectWorktreeMode(
path: string,
mode: ProjectWorktreeMode | null,
): Promise<void> {
if (inTauri) await invoke("set_project_worktree_mode", { path, mode });
}

export async function removeProject(path: string): Promise<void> {
if (inTauri) await invoke("remove_project", { path });
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
31 changes: 25 additions & 6 deletions apps/desktop/src-tauri/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ use codetwo_core::keymap::{Action as KeyAction, Keymap};
use codetwo_core::models::builtin_models;
use codetwo_core::permission::{ExecutionPolicy, PermissionMode, SandboxPolicy};
use codetwo_core::plugin::{self, InstalledPlugin, PluginCounts, PluginScaffold};
use codetwo_core::project::{self, ProjectScript};
use codetwo_core::project::{self, ProjectScript, ProjectWorktreeMode};
use codetwo_core::provider::{default_registry, Provider, ProviderId};
use codetwo_core::skill::{builtin_skills, DocBlock, Skill, SkillKind, SkillLibrary};
use codetwo_core::source_control::{self, SourceControlInfo};
Expand DownExpand Up@@ -1133,6 +1133,20 @@ fn rename_project(state: State<'_, AppState>, path: String, name: String) -> Res
}
}

#[tauri::command]
fn set_project_worktree_mode(
state: State<'_, AppState>,
path: String,
mode: Option<ProjectWorktreeMode>,
) -> Result<(), String> {
match state.engine.store() {
Some(store) => store
.set_project_worktree_mode(&path, mode)
.map_err(|e| e.to_string()),
None => Ok(()),
}
}

#[tauri::command]
fn remove_project(state: State<'_, AppState>, path: String) -> Result<(), String> {
match state.engine.store() {
Expand DownExpand Up@@ -1297,14 +1311,18 @@ struct UsageReport {

/// Scan local provider transcripts and report rolling usage windows (CodexBar-style).
#[tauri::command]
fn usage_report() -> UsageReport {
let records = codetwo_core::usage::scan_all();
async fn usage_report() -> UsageReport {
// A cold 30-day transcript walk can take noticeable time. Keep it off Tauri's command/UI
// thread; subsequent requests normally hit the core's bounded per-file cache.
let scan = tokio::task::spawn_blocking(codetwo_core::usage::scan_all_with_count)
.await
.unwrap_or_default();
let now = codetwo_core::session::now_millis();
let limits = codetwo_core::usage::Limits::from_env();
UsageReport {
windows: codetwo_core::usage::windows(&records, now, &limits),
by_source: codetwo_core::usage::by_source(&records),
transcripts: records.len(),
windows: codetwo_core::usage::windows(&scan.records, now, &limits),
by_source: codetwo_core::usage::by_source(&scan.records),
transcripts: scan.transcripts,
}
}

Expand DownExpand Up@@ -1710,6 +1728,7 @@ pub fn run() {
add_project,
open_project,
rename_project,
set_project_worktree_mode,
remove_project,
cancel_turn,
pty_spawn,
Expand Down
80 changes: 76 additions & 4 deletions apps/desktop/src/App.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,11 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { Archive, CircleAlert, Folder, Keyboard, PanelLeft, PanelRight } from "lucide-react";

import { DocEditor } from "./editor/Editor";
import {
loadBrowserHistory,
removeBrowserProject,
saveBrowserHistory,
} from "./browser/history";
import {
answerPermission,
applyPluginScaffold,
Expand DownExpand Up@@ -53,6 +58,7 @@ import {
setConfigOption,
setKeymap,
setModel,
setProjectWorktreeMode,
setSessionMemoryPolicy,
setExecutionPolicy,
submitPrompt,
Expand All@@ -74,6 +80,7 @@ import {
type PluginInfo,
type Project,
type ProjectScript,
type ProjectWorktreeMode,
type ProviderInfo,
type PermissionMode,
type Sandbox,
Expand DownExpand Up@@ -108,6 +115,10 @@ import {
type SessionMode,
} from "./session/mode";
import { Composer } from "./session/Composer";
import {
nextSessionWorktreeBaseline,
projectSwitchWorktreeBaseline,
} from "./session/projectDefaults";
import { TranscriptPane } from "./session/TranscriptPane";
import { useTranscriptScroll } from "./session/useTranscriptScroll";
import {
Expand DownExpand Up@@ -405,6 +416,10 @@ export default function App() {
// Mirrors `activeProject` so `selectProject` can tell a real switch from a re-click without
// remaking its callback (and the rail rows' props) on every project change.
const activeProjectRef = useRef<string | null>(null);
// Project list reads can overlap local preference writes. A read that started before or during
// a write must never restore the older SQLite snapshot after the write completes.
const projectLoadSeqRef = useRef(0);
const projectMutationVersionRef = useRef(0);
const memoryReadRef = useRef<MemoryAccess>("inherit");
const memoryWriteRef = useRef<MemoryAccess>("inherit");
const memoryReceiptsRef = useRef<MemoryReceipt[]>([]);
Expand DownExpand Up@@ -620,9 +635,42 @@ export default function App() {
}, [t, toast]);

const refreshProjects = useCallback(() => {
listProjects().then(setProjects).catch(() => {});
const seq = ++projectLoadSeqRef.current;
const mutationVersion = projectMutationVersionRef.current;
listProjects()
.then((items) => {
if (
seq === projectLoadSeqRef.current &&
mutationVersion === projectMutationVersionRef.current
) {
setProjects(items);
}
})
.catch(() => {});
}, []);

const updateProjectWorktreeMode = useCallback(
async (path: string, nextMode: ProjectWorktreeMode | null) => {
const patchMode = (mode: ProjectWorktreeMode | null) => (items: Project[]) =>
items.map((project) =>
project.path === path ? { ...project, default_worktree_mode: mode } : project,
);

projectMutationVersionRef.current += 1;
try {
await setProjectWorktreeMode(path, nextMode);
projectMutationVersionRef.current += 1;
// A project default seeds future drafts. It must not overwrite an explicit choice in the
// current Composer while Settings is open or while this native write is in flight.
setProjects(patchMode(nextMode));
} catch (error) {
projectMutationVersionRef.current += 1;
toast(t("toast.projectDefaultFailed", { error: String(error) }), "error");
}
},
[t, toast],
);

/** Switch projects: the working directory, the conversation list and the git section all follow. */
const selectProject = useCallback(
(path: string) => {
Expand All@@ -631,6 +679,8 @@ export default function App() {
invalidatePendingCreation();
setActiveProject(path);
setCwd(path);
const project = projects.find((item) => item.path === path);
setWorktreeBase(projectSwitchWorktreeBaseline(project?.default_worktree_mode ?? null));
// Selecting a project always opens a blank source-checkout draft, including a re-click of the
// current project. Keeping an active worktree session while `cwd` switches to the source would
// make file/Git/terminal surfaces show one checkout while the agent keeps editing another.
Expand All@@ -653,7 +703,7 @@ export default function App() {
setMemoryWrite("inherit");
void openProject(path).then(refreshProjects);
},
[invalidatePendingCreation, refreshProjects],
[invalidatePendingCreation, projects, refreshProjects],
);

const addProjectFolder = useCallback(async () => {
Expand DownExpand Up@@ -1150,8 +1200,19 @@ export default function App() {
setMemoryRead("inherit");
setMemoryWrite("inherit");
setCwd(source);
const baseline = sessionCreationBaseline(currentSession);
if (baseline !== undefined) setWorktreeBase(baseline);
// Pressing New while already on the unsent blank draft is a focus/reset no-op for workspace
// selection: keep the explicit Composer choice. Leaving a durable session starts a new draft
// and seeds that draft from the project preference or the prior session's baseline kind.
if (currentSessionId !== null) {
const projectMode = projects.find(
(project) => project.path === activeProjectRef.current,
)?.default_worktree_mode ?? null;
const baseline = nextSessionWorktreeBaseline(
projectMode,
sessionCreationBaseline(currentSession),
);
if (baseline !== undefined) setWorktreeBase(baseline);
}
// Caret into the document; whichever mode you're in stays yours.
setTimeout(() => focusEditorRef.current?.(), 0);
// A New action opens a configurable blank draft. The first Run creates the durable session,
Expand All@@ -1160,6 +1221,7 @@ export default function App() {
cwd,
sessions,
archivedSessions,
projects,
toast,
t,
invalidatePendingCreation,
Expand DownExpand Up@@ -1834,6 +1896,7 @@ export default function App() {
activeProjectRef.current = last.path;
setActiveProject(last.path);
setCwd(last.path);
setWorktreeBase(projectSwitchWorktreeBaseline(last.default_worktree_mode));
return;
}
const here = await defaultCwd();
Expand DownExpand Up@@ -1963,6 +2026,8 @@ export default function App() {
onResetAll={resetAllBindings}
providers={providers}
projectPath={activeProject ?? cwd}
project={projects.find((project) => project.path === activeProject) ?? null}
onProjectWorktreeMode={updateProjectWorktreeMode}
onClose={() => {
setShowSettings(false);
setCapturing(null);
Expand DownExpand Up@@ -1992,6 +2057,12 @@ export default function App() {
onRenameProject={(p, name) => void renameProject(p, name).then(refreshProjects)}
onRemoveProject={(p) => {
void removeProject(p).then(() => {
try {
const history = loadBrowserHistory(window.localStorage);
saveBrowserHistory(window.localStorage, removeBrowserProject(history, p));
} catch {
// Browser history is a convenience; a blocked local store must not block removal.
}
refreshProjects();
// Dropping the project you were in leaves nothing selected; fall back to the next one
// rather than stranding the rail on a project that's no longer listed.
Expand DownExpand Up@@ -2269,6 +2340,7 @@ export default function App() {
onTab={setDockTab}
onClose={() => setDockTab(null)}
cwd={cwd || null}
projectPath={activeProject ?? cwd ?? null}
sessionKey={activeSession ?? "main"}
git={git}
onRefreshGit={refreshGit}
Expand Down
10 changes: 10 additions & 0 deletions apps/desktop/src/bridge.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@ export interface SessionActivity {
}

export type WorktreeBaselineKind = "current" | "origin_default";
export type ProjectWorktreeMode = "local" | WorktreeBaselineKind;

export interface ResolvedWorktreeBaseline {
kind: WorktreeBaselineKind;
Expand All@@ -113,6 +114,8 @@ export interface Project {
path: string;
name: string;
last_opened_at: number;
/** Null follows the current draft/session; local is an explicit no-worktree default. */
default_worktree_mode: ProjectWorktreeMode | null;
}

export interface MemorySettings {
Expand DownExpand Up@@ -762,6 +765,13 @@ export async function renameProject(path: string, name: string): Promise<void> {
if (inTauri) await invoke("rename_project", { path, name });
}

export async function setProjectWorktreeMode(
path: string,
mode: ProjectWorktreeMode | null,
): Promise<void> {
if (inTauri) await invoke("set_project_worktree_mode", { path, mode });
}

export async function removeProject(path: string): Promise<void> {
if (inTauri) await invoke("remove_project", { path });
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
31 changes: 25 additions & 6 deletions apps/desktop/src-tauri/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ use codetwo_core::keymap::{Action as KeyAction, Keymap};
use codetwo_core::models::builtin_models;
use codetwo_core::permission::{ExecutionPolicy, PermissionMode, SandboxPolicy};
use codetwo_core::plugin::{self, InstalledPlugin, PluginCounts, PluginScaffold};
use codetwo_core::project::{self, ProjectScript};
use codetwo_core::project::{self, ProjectScript, ProjectWorktreeMode};
use codetwo_core::provider::{default_registry, Provider, ProviderId};
use codetwo_core::skill::{builtin_skills, DocBlock, Skill, SkillKind, SkillLibrary};
use codetwo_core::source_control::{self, SourceControlInfo};
Expand DownExpand Up@@ -1133,6 +1133,20 @@ fn rename_project(state: State<'_, AppState>, path: String, name: String) -> Res
}
}

#[tauri::command]
fn set_project_worktree_mode(
state: State<'_, AppState>,
path: String,
mode: Option<ProjectWorktreeMode>,
) -> Result<(), String> {
match state.engine.store() {
Some(store) => store
.set_project_worktree_mode(&path, mode)
.map_err(|e| e.to_string()),
None => Ok(()),
}
}

#[tauri::command]
fn remove_project(state: State<'_, AppState>, path: String) -> Result<(), String> {
match state.engine.store() {
Expand DownExpand Up@@ -1297,14 +1311,18 @@ struct UsageReport {

/// Scan local provider transcripts and report rolling usage windows (CodexBar-style).
#[tauri::command]
fn usage_report() -> UsageReport {
let records = codetwo_core::usage::scan_all();
async fn usage_report() -> UsageReport {
// A cold 30-day transcript walk can take noticeable time. Keep it off Tauri's command/UI
// thread; subsequent requests normally hit the core's bounded per-file cache.
let scan = tokio::task::spawn_blocking(codetwo_core::usage::scan_all_with_count)
.await
.unwrap_or_default();
let now = codetwo_core::session::now_millis();
let limits = codetwo_core::usage::Limits::from_env();
UsageReport {
windows: codetwo_core::usage::windows(&records, now, &limits),
by_source: codetwo_core::usage::by_source(&records),
transcripts: records.len(),
windows: codetwo_core::usage::windows(&scan.records, now, &limits),
by_source: codetwo_core::usage::by_source(&scan.records),
transcripts: scan.transcripts,
}
}

Expand DownExpand Up@@ -1710,6 +1728,7 @@ pub fn run() {
add_project,
open_project,
rename_project,
set_project_worktree_mode,
remove_project,
cancel_turn,
pty_spawn,
Expand Down
80 changes: 76 additions & 4 deletions apps/desktop/src/App.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,11 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { Archive, CircleAlert, Folder, Keyboard, PanelLeft, PanelRight } from "lucide-react";

import { DocEditor } from "./editor/Editor";
import {
loadBrowserHistory,
removeBrowserProject,
saveBrowserHistory,
} from "./browser/history";
import {
answerPermission,
applyPluginScaffold,
Expand DownExpand Up@@ -53,6 +58,7 @@ import {
setConfigOption,
setKeymap,
setModel,
setProjectWorktreeMode,
setSessionMemoryPolicy,
setExecutionPolicy,
submitPrompt,
Expand All@@ -74,6 +80,7 @@ import {
type PluginInfo,
type Project,
type ProjectScript,
type ProjectWorktreeMode,
type ProviderInfo,
type PermissionMode,
type Sandbox,
Expand DownExpand Up@@ -108,6 +115,10 @@ import {
type SessionMode,
} from "./session/mode";
import { Composer } from "./session/Composer";
import {
nextSessionWorktreeBaseline,
projectSwitchWorktreeBaseline,
} from "./session/projectDefaults";
import { TranscriptPane } from "./session/TranscriptPane";
import { useTranscriptScroll } from "./session/useTranscriptScroll";
import {
Expand DownExpand Up@@ -405,6 +416,10 @@ export default function App() {
// Mirrors `activeProject` so `selectProject` can tell a real switch from a re-click without
// remaking its callback (and the rail rows' props) on every project change.
const activeProjectRef = useRef<string | null>(null);
// Project list reads can overlap local preference writes. A read that started before or during
// a write must never restore the older SQLite snapshot after the write completes.
const projectLoadSeqRef = useRef(0);
const projectMutationVersionRef = useRef(0);
const memoryReadRef = useRef<MemoryAccess>("inherit");
const memoryWriteRef = useRef<MemoryAccess>("inherit");
const memoryReceiptsRef = useRef<MemoryReceipt[]>([]);
Expand DownExpand Up@@ -620,9 +635,42 @@ export default function App() {
}, [t, toast]);

const refreshProjects = useCallback(() => {
listProjects().then(setProjects).catch(() => {});
const seq = ++projectLoadSeqRef.current;
const mutationVersion = projectMutationVersionRef.current;
listProjects()
.then((items) => {
if (
seq === projectLoadSeqRef.current &&
mutationVersion === projectMutationVersionRef.current
) {
setProjects(items);
}
})
.catch(() => {});
}, []);

const updateProjectWorktreeMode = useCallback(
async (path: string, nextMode: ProjectWorktreeMode | null) => {
const patchMode = (mode: ProjectWorktreeMode | null) => (items: Project[]) =>
items.map((project) =>
project.path === path ? { ...project, default_worktree_mode: mode } : project,
);

projectMutationVersionRef.current += 1;
try {
await setProjectWorktreeMode(path, nextMode);
projectMutationVersionRef.current += 1;
// A project default seeds future drafts. It must not overwrite an explicit choice in the
// current Composer while Settings is open or while this native write is in flight.
setProjects(patchMode(nextMode));
} catch (error) {
projectMutationVersionRef.current += 1;
toast(t("toast.projectDefaultFailed", { error: String(error) }), "error");
}
},
[t, toast],
);

/** Switch projects: the working directory, the conversation list and the git section all follow. */
const selectProject = useCallback(
(path: string) => {
Expand All@@ -631,6 +679,8 @@ export default function App() {
invalidatePendingCreation();
setActiveProject(path);
setCwd(path);
const project = projects.find((item) => item.path === path);
setWorktreeBase(projectSwitchWorktreeBaseline(project?.default_worktree_mode ?? null));
// Selecting a project always opens a blank source-checkout draft, including a re-click of the
// current project. Keeping an active worktree session while `cwd` switches to the source would
// make file/Git/terminal surfaces show one checkout while the agent keeps editing another.
Expand All@@ -653,7 +703,7 @@ export default function App() {
setMemoryWrite("inherit");
void openProject(path).then(refreshProjects);
},
[invalidatePendingCreation, refreshProjects],
[invalidatePendingCreation, projects, refreshProjects],
);

const addProjectFolder = useCallback(async () => {
Expand DownExpand Up@@ -1150,8 +1200,19 @@ export default function App() {
setMemoryRead("inherit");
setMemoryWrite("inherit");
setCwd(source);
const baseline = sessionCreationBaseline(currentSession);
if (baseline !== undefined) setWorktreeBase(baseline);
// Pressing New while already on the unsent blank draft is a focus/reset no-op for workspace
// selection: keep the explicit Composer choice. Leaving a durable session starts a new draft
// and seeds that draft from the project preference or the prior session's baseline kind.
if (currentSessionId !== null) {
const projectMode = projects.find(
(project) => project.path === activeProjectRef.current,
)?.default_worktree_mode ?? null;
const baseline = nextSessionWorktreeBaseline(
projectMode,
sessionCreationBaseline(currentSession),
);
if (baseline !== undefined) setWorktreeBase(baseline);
}
// Caret into the document; whichever mode you're in stays yours.
setTimeout(() => focusEditorRef.current?.(), 0);
// A New action opens a configurable blank draft. The first Run creates the durable session,
Expand All@@ -1160,6 +1221,7 @@ export default function App() {
cwd,
sessions,
archivedSessions,
projects,
toast,
t,
invalidatePendingCreation,
Expand DownExpand Up@@ -1834,6 +1896,7 @@ export default function App() {
activeProjectRef.current = last.path;
setActiveProject(last.path);
setCwd(last.path);
setWorktreeBase(projectSwitchWorktreeBaseline(last.default_worktree_mode));
return;
}
const here = await defaultCwd();
Expand DownExpand Up@@ -1963,6 +2026,8 @@ export default function App() {
onResetAll={resetAllBindings}
providers={providers}
projectPath={activeProject ?? cwd}
project={projects.find((project) => project.path === activeProject) ?? null}
onProjectWorktreeMode={updateProjectWorktreeMode}
onClose={() => {
setShowSettings(false);
setCapturing(null);
Expand DownExpand Up@@ -1992,6 +2057,12 @@ export default function App() {
onRenameProject={(p, name) => void renameProject(p, name).then(refreshProjects)}
onRemoveProject={(p) => {
void removeProject(p).then(() => {
try {
const history = loadBrowserHistory(window.localStorage);
saveBrowserHistory(window.localStorage, removeBrowserProject(history, p));
} catch {
// Browser history is a convenience; a blocked local store must not block removal.
}
refreshProjects();
// Dropping the project you were in leaves nothing selected; fall back to the next one
// rather than stranding the rail on a project that's no longer listed.
Expand DownExpand Up@@ -2269,6 +2340,7 @@ export default function App() {
onTab={setDockTab}
onClose={() => setDockTab(null)}
cwd={cwd || null}
projectPath={activeProject ?? cwd ?? null}
sessionKey={activeSession ?? "main"}
git={git}
onRefreshGit={refreshGit}
Expand Down
10 changes: 10 additions & 0 deletions apps/desktop/src/bridge.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@ export interface SessionActivity {
}

export type WorktreeBaselineKind = "current" | "origin_default";
export type ProjectWorktreeMode = "local" | WorktreeBaselineKind;

export interface ResolvedWorktreeBaseline {
kind: WorktreeBaselineKind;
Expand All@@ -113,6 +114,8 @@ export interface Project {
path: string;
name: string;
last_opened_at: number;
/** Null follows the current draft/session; local is an explicit no-worktree default. */
default_worktree_mode: ProjectWorktreeMode | null;
}

export interface MemorySettings {
Expand DownExpand Up@@ -762,6 +765,13 @@ export async function renameProject(path: string, name: string): Promise<void> {
if (inTauri) await invoke("rename_project", { path, name });
}

export async function setProjectWorktreeMode(
path: string,
mode: ProjectWorktreeMode | null,
): Promise<void> {
if (inTauri) await invoke("set_project_worktree_mode", { path, mode });
}

export async function removeProject(path: string): Promise<void> {
if (inTauri) await invoke("remove_project", { path });
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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
31 changes: 25 additions & 6 deletions apps/desktop/src-tauri/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ use codetwo_core::keymap::{Action as KeyAction, Keymap};
use codetwo_core::models::builtin_models;
use codetwo_core::permission::{ExecutionPolicy, PermissionMode, SandboxPolicy};
use codetwo_core::plugin::{self, InstalledPlugin, PluginCounts, PluginScaffold};
use codetwo_core::project::{self, ProjectScript};
use codetwo_core::project::{self, ProjectScript, ProjectWorktreeMode};
use codetwo_core::provider::{default_registry, Provider, ProviderId};
use codetwo_core::skill::{builtin_skills, DocBlock, Skill, SkillKind, SkillLibrary};
use codetwo_core::source_control::{self, SourceControlInfo};
Expand DownExpand Up@@ -1133,6 +1133,20 @@ fn rename_project(state: State<'_, AppState>, path: String, name: String) -> Res
}
}

#[tauri::command]
fn set_project_worktree_mode(
state: State<'_, AppState>,
path: String,
mode: Option<ProjectWorktreeMode>,
) -> Result<(), String> {
match state.engine.store() {
Some(store) => store
.set_project_worktree_mode(&path, mode)
.map_err(|e| e.to_string()),
None => Ok(()),
}
}

#[tauri::command]
fn remove_project(state: State<'_, AppState>, path: String) -> Result<(), String> {
match state.engine.store() {
Expand DownExpand Up@@ -1297,14 +1311,18 @@ struct UsageReport {

/// Scan local provider transcripts and report rolling usage windows (CodexBar-style).
#[tauri::command]
fn usage_report() -> UsageReport {
let records = codetwo_core::usage::scan_all();
async fn usage_report() -> UsageReport {
// A cold 30-day transcript walk can take noticeable time. Keep it off Tauri's command/UI
// thread; subsequent requests normally hit the core's bounded per-file cache.
let scan = tokio::task::spawn_blocking(codetwo_core::usage::scan_all_with_count)
.await
.unwrap_or_default();
let now = codetwo_core::session::now_millis();
let limits = codetwo_core::usage::Limits::from_env();
UsageReport {
windows: codetwo_core::usage::windows(&records, now, &limits),
by_source: codetwo_core::usage::by_source(&records),
transcripts: records.len(),
windows: codetwo_core::usage::windows(&scan.records, now, &limits),
by_source: codetwo_core::usage::by_source(&scan.records),
transcripts: scan.transcripts,
}
}

Expand DownExpand Up@@ -1710,6 +1728,7 @@ pub fn run() {
add_project,
open_project,
rename_project,
set_project_worktree_mode,
remove_project,
cancel_turn,
pty_spawn,
Expand Down
80 changes: 76 additions & 4 deletions apps/desktop/src/App.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,11 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { Archive, CircleAlert, Folder, Keyboard, PanelLeft, PanelRight } from "lucide-react";

import { DocEditor } from "./editor/Editor";
import {
loadBrowserHistory,
removeBrowserProject,
saveBrowserHistory,
} from "./browser/history";
import {
answerPermission,
applyPluginScaffold,
Expand DownExpand Up@@ -53,6 +58,7 @@ import {
setConfigOption,
setKeymap,
setModel,
setProjectWorktreeMode,
setSessionMemoryPolicy,
setExecutionPolicy,
submitPrompt,
Expand All@@ -74,6 +80,7 @@ import {
type PluginInfo,
type Project,
type ProjectScript,
type ProjectWorktreeMode,
type ProviderInfo,
type PermissionMode,
type Sandbox,
Expand DownExpand Up@@ -108,6 +115,10 @@ import {
type SessionMode,
} from "./session/mode";
import { Composer } from "./session/Composer";
import {
nextSessionWorktreeBaseline,
projectSwitchWorktreeBaseline,
} from "./session/projectDefaults";
import { TranscriptPane } from "./session/TranscriptPane";
import { useTranscriptScroll } from "./session/useTranscriptScroll";
import {
Expand DownExpand Up@@ -405,6 +416,10 @@ export default function App() {
// Mirrors `activeProject` so `selectProject` can tell a real switch from a re-click without
// remaking its callback (and the rail rows' props) on every project change.
const activeProjectRef = useRef<string | null>(null);
// Project list reads can overlap local preference writes. A read that started before or during
// a write must never restore the older SQLite snapshot after the write completes.
const projectLoadSeqRef = useRef(0);
const projectMutationVersionRef = useRef(0);
const memoryReadRef = useRef<MemoryAccess>("inherit");
const memoryWriteRef = useRef<MemoryAccess>("inherit");
const memoryReceiptsRef = useRef<MemoryReceipt[]>([]);
Expand DownExpand Up@@ -620,9 +635,42 @@ export default function App() {
}, [t, toast]);

const refreshProjects = useCallback(() => {
listProjects().then(setProjects).catch(() => {});
const seq = ++projectLoadSeqRef.current;
const mutationVersion = projectMutationVersionRef.current;
listProjects()
.then((items) => {
if (
seq === projectLoadSeqRef.current &&
mutationVersion === projectMutationVersionRef.current
) {
setProjects(items);
}
})
.catch(() => {});
}, []);

const updateProjectWorktreeMode = useCallback(
async (path: string, nextMode: ProjectWorktreeMode | null) => {
const patchMode = (mode: ProjectWorktreeMode | null) => (items: Project[]) =>
items.map((project) =>
project.path === path ? { ...project, default_worktree_mode: mode } : project,
);

projectMutationVersionRef.current += 1;
try {
await setProjectWorktreeMode(path, nextMode);
projectMutationVersionRef.current += 1;
// A project default seeds future drafts. It must not overwrite an explicit choice in the
// current Composer while Settings is open or while this native write is in flight.
setProjects(patchMode(nextMode));
} catch (error) {
projectMutationVersionRef.current += 1;
toast(t("toast.projectDefaultFailed", { error: String(error) }), "error");
}
},
[t, toast],
);

/** Switch projects: the working directory, the conversation list and the git section all follow. */
const selectProject = useCallback(
(path: string) => {
Expand All@@ -631,6 +679,8 @@ export default function App() {
invalidatePendingCreation();
setActiveProject(path);
setCwd(path);
const project = projects.find((item) => item.path === path);
setWorktreeBase(projectSwitchWorktreeBaseline(project?.default_worktree_mode ?? null));
// Selecting a project always opens a blank source-checkout draft, including a re-click of the
// current project. Keeping an active worktree session while `cwd` switches to the source would
// make file/Git/terminal surfaces show one checkout while the agent keeps editing another.
Expand All@@ -653,7 +703,7 @@ export default function App() {
setMemoryWrite("inherit");
void openProject(path).then(refreshProjects);
},
[invalidatePendingCreation, refreshProjects],
[invalidatePendingCreation, projects, refreshProjects],
);

const addProjectFolder = useCallback(async () => {
Expand DownExpand Up@@ -1150,8 +1200,19 @@ export default function App() {
setMemoryRead("inherit");
setMemoryWrite("inherit");
setCwd(source);
const baseline = sessionCreationBaseline(currentSession);
if (baseline !== undefined) setWorktreeBase(baseline);
// Pressing New while already on the unsent blank draft is a focus/reset no-op for workspace
// selection: keep the explicit Composer choice. Leaving a durable session starts a new draft
// and seeds that draft from the project preference or the prior session's baseline kind.
if (currentSessionId !== null) {
const projectMode = projects.find(
(project) => project.path === activeProjectRef.current,
)?.default_worktree_mode ?? null;
const baseline = nextSessionWorktreeBaseline(
projectMode,
sessionCreationBaseline(currentSession),
);
if (baseline !== undefined) setWorktreeBase(baseline);
}
// Caret into the document; whichever mode you're in stays yours.
setTimeout(() => focusEditorRef.current?.(), 0);
// A New action opens a configurable blank draft. The first Run creates the durable session,
Expand All@@ -1160,6 +1221,7 @@ export default function App() {
cwd,
sessions,
archivedSessions,
projects,
toast,
t,
invalidatePendingCreation,
Expand DownExpand Up@@ -1834,6 +1896,7 @@ export default function App() {
activeProjectRef.current = last.path;
setActiveProject(last.path);
setCwd(last.path);
setWorktreeBase(projectSwitchWorktreeBaseline(last.default_worktree_mode));
return;
}
const here = await defaultCwd();
Expand DownExpand Up@@ -1963,6 +2026,8 @@ export default function App() {
onResetAll={resetAllBindings}
providers={providers}
projectPath={activeProject ?? cwd}
project={projects.find((project) => project.path === activeProject) ?? null}
onProjectWorktreeMode={updateProjectWorktreeMode}
onClose={() => {
setShowSettings(false);
setCapturing(null);
Expand DownExpand Up@@ -1992,6 +2057,12 @@ export default function App() {
onRenameProject={(p, name) => void renameProject(p, name).then(refreshProjects)}
onRemoveProject={(p) => {
void removeProject(p).then(() => {
try {
const history = loadBrowserHistory(window.localStorage);
saveBrowserHistory(window.localStorage, removeBrowserProject(history, p));
} catch {
// Browser history is a convenience; a blocked local store must not block removal.
}
refreshProjects();
// Dropping the project you were in leaves nothing selected; fall back to the next one
// rather than stranding the rail on a project that's no longer listed.
Expand DownExpand Up@@ -2269,6 +2340,7 @@ export default function App() {
onTab={setDockTab}
onClose={() => setDockTab(null)}
cwd={cwd || null}
projectPath={activeProject ?? cwd ?? null}
sessionKey={activeSession ?? "main"}
git={git}
onRefreshGit={refreshGit}
Expand Down
10 changes: 10 additions & 0 deletions apps/desktop/src/bridge.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,6 +92,7 @@ export interface SessionActivity {
}

export type WorktreeBaselineKind = "current" | "origin_default";
export type ProjectWorktreeMode = "local" | WorktreeBaselineKind;

export interface ResolvedWorktreeBaseline {
kind: WorktreeBaselineKind;
Expand All@@ -113,6 +114,8 @@ export interface Project {
path: string;
name: string;
last_opened_at: number;
/** Null follows the current draft/session; local is an explicit no-worktree default. */
default_worktree_mode: ProjectWorktreeMode | null;
}

export interface MemorySettings {
Expand DownExpand Up@@ -762,6 +765,13 @@ export async function renameProject(path: string, name: string): Promise<void> {
if (inTauri) await invoke("rename_project", { path, name });
}

export async function setProjectWorktreeMode(
path: string,
mode: ProjectWorktreeMode | null,
): Promise<void> {
if (inTauri) await invoke("set_project_worktree_mode", { path, mode });
}

export async function removeProject(path: string): Promise<void> {
if (inTauri) await invoke("remove_project", { path });
}
Expand Down
Loading