getcompanion-ai/co-mono
1
0
Fork 0
mirror of https://github.com/getcompanion-ai/co-mono.git synced 2026-04-16 16:00:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename /branch command to /fork

Browse source 
- RPC: branch -> fork, get_branch_messages -> get_fork_messages
- SDK: branch() -> fork(), getBranchMessages() -> getForkMessages()
- AgentSession: branch() -> fork(), getUserMessagesForBranching() -> getUserMessagesForForking()
- Extension events: session_before_branch -> session_before_fork, session_branch -> session_fork
- Settings: doubleEscapeAction 'branch' -> 'fork'

fixes #641
This commit is contained in:
Mario Zechner 2026-01-11 23:12:18 +01:00
parent e7352a50bf
commit df3f5f41c0
27 changed files with 162 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

8
packages/coding-agent/src/modes/interactive/components/settings-selector.ts
View file

@ -35,7 +35,7 @@ export interface SettingsConfig {
availableThemes: string[];
hideThinkingBlock: boolean;
collapseChangelog: boolean;
doubleEscapeAction: "branch" | "tree";
doubleEscapeAction: "fork" | "tree";
}
export interface SettingsCallbacks {
@ -51,7 +51,7 @@ export interface SettingsCallbacks {
onThemePreview?: (theme: string) => void;
onHideThinkingBlockChange: (hidden: boolean) => void;
onCollapseChangelogChange: (collapsed: boolean) => void;
onDoubleEscapeActionChange: (action: "branch" | "tree") => void;
onDoubleEscapeActionChange: (action: "fork" | "tree") => void;
onCancel: () => void;
}
@ -171,7 +171,7 @@ export class SettingsSelectorComponent extends Container {
label: "Double-escape action",
description: "Action when pressing Escape twice with empty editor",
currentValue: config.doubleEscapeAction,
values: ["tree", "branch"],
values: ["tree", "fork"],
},
{
id: "thinking",
@ -304,7 +304,7 @@ export class SettingsSelectorComponent extends Container {
callbacks.onCollapseChangelogChange(newValue === "true");
break;
case "double-escape-action":
callbacks.onDoubleEscapeActionChange(newValue as "branch" | "tree");
callbacks.onDoubleEscapeActionChange(newValue as "fork" | "tree");
break;
}
},

20
packages/coding-agent/src/modes/interactive/interactive-mode.ts
View file

@ -289,7 +289,7 @@ export class InteractiveMode {
{ name: "session", description: "Show session info and stats" },
{ name: "changelog", description: "Show changelog entries" },
{ name: "hotkeys", description: "Show all keyboard shortcuts" },
{ name: "branch", description: "Create a new branch from a previous message" },
{ name: "fork", description: "Create a new fork from a previous message" },
{ name: "tree", description: "Navigate session tree (switch branches)" },
{ name: "login", description: "Login with OAuth provider" },
{ name: "logout", description: "Logout from OAuth provider" },
@ -730,8 +730,8 @@ export class InteractiveMode {
return { cancelled: false };
},
branch: async (entryId) => {
const result = await this.session.branch(entryId);
fork: async (entryId) => {
const result = await this.session.fork(entryId);
if (result.cancelled) {
return { cancelled: true };
}
@ -739,7 +739,7 @@ export class InteractiveMode {
this.chatContainer.clear();
this.renderInitialMessages();
this.editor.setText(result.selectedText);
this.showStatus("Branched to new session");
this.showStatus("Forked to new session");
return { cancelled: false };
},
@ -1336,7 +1336,7 @@ export class InteractiveMode {
this.isBashMode = false;
this.updateEditorBorderColor();
} else if (!this.editor.getText().trim()) {
// Double-escape with empty editor triggers /tree or /branch based on setting
// Double-escape with empty editor triggers /tree or /fork based on setting
const now = Date.now();
if (now - this.lastEscapeTime < 500) {
if (this.settingsManager.getDoubleEscapeAction() === "tree") {
@ -1456,7 +1456,7 @@ export class InteractiveMode {
this.editor.setText("");
return;
}
if (text === "/branch") {
if (text === "/fork") {
this.showUserMessageSelector();
this.editor.setText("");
return;
@ -2738,10 +2738,10 @@ export class InteractiveMode {
}
private showUserMessageSelector(): void {
const userMessages = this.session.getUserMessagesForBranching();
const userMessages = this.session.getUserMessagesForForking();
if (userMessages.length === 0) {
this.showStatus("No messages to branch from");
this.showStatus("No messages to fork from");
return;
}
@ -2749,9 +2749,9 @@ export class InteractiveMode {
const selector = new UserMessageSelectorComponent(
userMessages.map((m) => ({ id: m.entryId, text: m.text })),
async (entryId) => {
const result = await this.session.branch(entryId);
const result = await this.session.fork(entryId);
if (result.cancelled) {
// Extension cancelled the branch
// Extension cancelled the fork
done();
this.ui.requestRender();
return;

4
packages/coding-agent/src/modes/print-mode.ts
View file

@ -78,8 +78,8 @@ export async function runPrintMode(session: AgentSession, options: PrintModeOpti
}
return { cancelled: !success };
},
branch: async (entryId) => {
const result = await session.branch(entryId);
fork: async (entryId) => {
const result = await session.fork(entryId);
return { cancelled: result.cancelled };
},
navigateTree: async (targetId, options) => {

12
packages/coding-agent/src/modes/rpc/rpc-client.ts
View file

@ -338,19 +338,19 @@ export class RpcClient {
}
/**
* Branch from a specific message.
* Fork from a specific message.
* @returns Object with `text` (the message text) and `cancelled` (if extension cancelled)
*/
async branch(entryId: string): Promise<{ text: string; cancelled: boolean }> {
const response = await this.send({ type: "branch", entryId });
async fork(entryId: string): Promise<{ text: string; cancelled: boolean }> {
const response = await this.send({ type: "fork", entryId });
return this.getData(response);
}
/**
* Get messages available for branching.
* Get messages available for forking.
*/
async getBranchMessages(): Promise<Array<{ entryId: string; text: string }>> {
const response = await this.send({ type: "get_branch_messages" });
async getForkMessages(): Promise<Array<{ entryId: string; text: string }>> {
const response = await this.send({ type: "get_fork_messages" });
return this.getData<{ messages: Array<{ entryId: string; text: string }> }>(response).messages;
}

16
packages/coding-agent/src/modes/rpc/rpc-mode.ts
View file

@ -300,8 +300,8 @@ export async function runRpcMode(session: AgentSession): Promise<never> {
}
return { cancelled: !success };
},
branch: async (entryId) => {
const result = await session.branch(entryId);
fork: async (entryId) => {
const result = await session.fork(entryId);
return { cancelled: result.cancelled };
},
navigateTree: async (targetId, options) => {
@ -508,14 +508,14 @@ export async function runRpcMode(session: AgentSession): Promise<never> {
return success(id, "switch_session", { cancelled });
}
case "branch": {
const result = await session.branch(command.entryId);
return success(id, "branch", { text: result.selectedText, cancelled: result.cancelled });
case "fork": {
const result = await session.fork(command.entryId);
return success(id, "fork", { text: result.selectedText, cancelled: result.cancelled });
}
case "get_branch_messages": {
const messages = session.getUserMessagesForBranching();
return success(id, "get_branch_messages", { messages });
case "get_fork_messages": {
const messages = session.getUserMessagesForForking();
return success(id, "get_fork_messages", { messages });
}
case "get_last_assistant_text": {

8
packages/coding-agent/src/modes/rpc/rpc-types.ts
View file

@ -55,8 +55,8 @@ export type RpcCommand =
| { id?: string; type: "get_session_stats" }
| { id?: string; type: "export_html"; outputPath?: string }
| { id?: string; type: "switch_session"; sessionPath: string }
| { id?: string; type: "branch"; entryId: string }
| { id?: string; type: "get_branch_messages" }
| { id?: string; type: "fork"; entryId: string }
| { id?: string; type: "get_fork_messages" }
| { id?: string; type: "get_last_assistant_text" }
// Messages
@ -149,11 +149,11 @@ export type RpcResponse =
| { id?: string; type: "response"; command: "get_session_stats"; success: true; data: SessionStats }
| { id?: string; type: "response"; command: "export_html"; success: true; data: { path: string } }
| { id?: string; type: "response"; command: "switch_session"; success: true; data: { cancelled: boolean } }
| { id?: string; type: "response"; command: "branch"; success: true; data: { text: string; cancelled: boolean } }
| { id?: string; type: "response"; command: "fork"; success: true; data: { text: string; cancelled: boolean } }
| {
id?: string;
type: "response";
command: "get_branch_messages";
command: "get_fork_messages";
success: true;
data: { messages: Array<{ entryId: string; text: string }> };
}