From 9d2907c32c2bb8b9c6f478af23b36c7b89c0f4af Mon Sep 17 00:00:00 2001
From: _Kerman <kermanx@qq.com>
Date: Wed, 27 May 2026 13:35:05 +0800
Subject: [PATCH] fix: show original session command after fork

---
 .changeset/fork-return-command.md                     | 5 +++++
 apps/kimi-code/src/tui/kimi-tui.ts                    | 5 ++++-
 apps/kimi-code/test/tui/kimi-tui-message-flow.test.ts | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/fork-return-command.md

diff --git a/.changeset/fork-return-command.md b/.changeset/fork-return-command.md
new file mode 100644
index 0000000000..108b25263a
--- /dev/null
+++ b/.changeset/fork-return-command.md
@@ -0,0 +1,5 @@
+---
+"@moonshot-ai/kimi-code": patch
+---
+
+Show the original session resume command after forking a session.
diff --git a/apps/kimi-code/src/tui/kimi-tui.ts b/apps/kimi-code/src/tui/kimi-tui.ts
index 79ed27c4b0..e05d51738c 100644
--- a/apps/kimi-code/src/tui/kimi-tui.ts
+++ b/apps/kimi-code/src/tui/kimi-tui.ts
@@ -5504,7 +5504,10 @@ export class KimiTUI {
     }
 
     try {
-      await this.switchToSession(forked, `Session forked (${forked.id}).`);
+      await this.switchToSession(
+        forked,
+        `Session forked (${forked.id}). To return to the original session: kimi -r ${session.id}`,
+      );
     } catch (error) {
       const msg = formatErrorMessage(error);
       this.showError(`Failed to switch to forked session: ${msg}`);
diff --git a/apps/kimi-code/test/tui/kimi-tui-message-flow.test.ts b/apps/kimi-code/test/tui/kimi-tui-message-flow.test.ts
index 7ba1a26a16..59f6369f24 100644
--- a/apps/kimi-code/test/tui/kimi-tui-message-flow.test.ts
+++ b/apps/kimi-code/test/tui/kimi-tui-message-flow.test.ts
@@ -1476,7 +1476,7 @@ describe('KimiTUI message flow', () => {
       expect(forked.onEvent).toHaveBeenCalledOnce();
       expect(harness.resumeSession).not.toHaveBeenCalled();
       expect(driver.state.transcriptContainer.render(120).join('\n')).toContain(
-        'Session forked (ses-fork).',
+        'Session forked (ses-fork). To return to the original session: kimi -r ses-source',
       );
     } finally {
       process.title = originalTitle;