daedalus-cli 1.72.0 → 1.74.0

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+# [1.74.0](https://github.com/bgill55/daedalus/compare/v1.73.0...v1.74.0) (2026-07-26)
+
+
+### Features
+
+* **config:** add OS & System Diagnostics Awareness module and system prompt headers ([daf9147](https://github.com/bgill55/daedalus/commit/daf914787d08a21fad9a4d8d570d87db14ae3066))
+
+# [1.73.0](https://github.com/bgill55/daedalus/compare/v1.72.0...v1.73.0) (2026-07-26)
+
+
+### Bug Fixes
+
+* **tsc:** add public db getter to SessionManager and pass loaded session object to initializeSessionState ([176b703](https://github.com/bgill55/daedalus/commit/176b70387ca82e6e242261b54b0a5e4a5c9b4afa))
+
+
+### Features
+
+* **session:** implement Chat-History Branching system (/session branch, checkout, list, merge) ([1658410](https://github.com/bgill55/daedalus/commit/1658410b19f1de1c7129ef13952bdcb4be19733d))
+
 # [1.72.0](https://github.com/bgill55/daedalus/compare/v1.71.2...v1.72.0) (2026-07-26)
 
 

package/README.md

@@ -160,7 +160,7 @@ AI assistance without:
 | `/convention [text]` | Add a project convention to memory |
 | `/memory` | View project memory (facts & conventions) |
 | `/extract` | Manually extract facts from session |
-| `/session [name]` | Manage chat sessions — /session new to start, /session load <id> to restore, /session export [path] to save transcript |
+| `/session [name]` | Manage chat sessions & branches: /session <list|load|new|branch|checkout|merge|export> |
 
 ### Context & CLI Utilities
 
@@ -183,6 +183,7 @@ AI assistance without:
 
 | Command | Description |
 |---------|-------------|
+| `/lite` | Show Daedalus Lite documentation |
 | `/stats` / `stats` | Display session analytics, token usage, index count, and router status |
 | `/onboard` | First-time setup — discover local models, configure, and test |
 | `/tui` | Toggle the Terminal User Interface (TUI) dashboard |

package/dist/commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../src/commands.ts"],"names":[],"mappings":"AAGA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAKhC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAUtD,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,cAAc,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,WAAW,CAAC;IACpB,cAAc,EAAE,cAAc,CAAC;IAC/B,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,WAAW,EAAE,WAAW,CAAC;IACzB,yBAAyB,EAAE,MAAM,MAAM,CAAC;IACxC,kBAAkB,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,QAAQ,EAAE,CAAA;KAAE,CAAC,CAAC;IACvH,qBAAqB,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACtF,EAAE,EAAE,QAAQ,CAAC,SAAS,CAAC;IACvB,sBAAsB,EAAE,CAAC,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,WAAW,EAAE,CAAC;QAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAAC,KAAK,EAAE,UAAU,EAAE,CAAA;KAAE,KAAK,IAAI,CAAC;IAC7I,gBAAgB,EAAE,MAAM,MAAM,CAAC;IAC/B,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7C,iBAAiB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACpD,cAAc,EAAE,MAAM,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,cAAc,KAAK,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;CACzE;AAED,eAAO,MAAM,YAAY,EAAE,OAAO,EAsuEjC,CAAC;AAEF,wBAAsB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,CAqCzF"}
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../src/commands.ts"],"names":[],"mappings":"AAGA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAKhC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAgBtD,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,cAAc,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,WAAW,CAAC;IACpB,cAAc,EAAE,cAAc,CAAC;IAC/B,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,WAAW,EAAE,WAAW,CAAC;IACzB,yBAAyB,EAAE,MAAM,MAAM,CAAC;IACxC,kBAAkB,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,QAAQ,EAAE,CAAA;KAAE,CAAC,CAAC;IACvH,qBAAqB,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACtF,EAAE,EAAE,QAAQ,CAAC,SAAS,CAAC;IACvB,sBAAsB,EAAE,CAAC,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,WAAW,EAAE,CAAC;QAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAAC,KAAK,EAAE,UAAU,EAAE,CAAA;KAAE,KAAK,IAAI,CAAC;IAC7I,gBAAgB,EAAE,MAAM,MAAM,CAAC;IAC/B,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7C,iBAAiB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACpD,cAAc,EAAE,MAAM,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,cAAc,KAAK,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;CACzE;AAED,eAAO,MAAM,YAAY,EAAE,OAAO,EA85EjC,CAAC;AAEF,wBAAsB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,CAqCzF"}

package/dist/commands.js

@@ -11,6 +11,7 @@ import { printUserTurn, turnSeparator } from './formatting.js';
 import { getClipboardText, getClipboardImage } from './clipboard.js';
 import { spawnBackgroundAgent } from './agents/background.js';
 import { handleSpecCommand } from './agents/loop.js';
+import { createSessionBranch, checkoutSessionBranch, listSessionBranches, mergeSessionBranch, } from './session/branching.js';
 export const commandsList = [
     {
         name: '/add',
@@ -594,6 +595,185 @@ export const commandsList = [
             console.log(pc.green('[OK] Coding style saved. It will be injected into every session.'));
         }
     },
+    {
+        name: '/lite',
+        description: 'Show Daedalus Lite documentation',
+        usage: '/lite',
+        helpText: 'Display link to Daedalus Lite documentation for building your own version of Daedalus',
+        execute: async (_args, _ctx) => {
+            console.log(pc.bold('\n--- Daedalus Lite Documentation ---'));
+            console.log(pc.gray('  Build your own version of Daedalus:'));
+            console.log(pc.cyan('  https://bgill55.github.io/daedalus-lite/'));
+            console.log(pc.bold('----------------------------------'));
+        }
+    },
+    {
+        name: '/session',
+        description: 'Manage chat sessions & branches: /session <list|load|new|branch|checkout|merge|export>',
+        usage: '/session <list|load|new|delete|export|branch|checkout|merge|branches> [args]',
+        helpText: 'Manage, snapshot, branch, load, save, and export conversation sessions.\n\nSubcommands:\n  list                  List all saved sessions for current project\n  load <id>             Load a saved session by ID\n  new [title]           Start a new conversation session\n  delete <id>           Delete a saved session by ID\n  export [filepath]     Export the current session transcript to Markdown\n  search <query>        Search past sessions for keyword\n  rename <title>        Rename the active session\n  branch <name>         Create a new session branch snapshot from current state\n  checkout <name>       Switch active REPL session context to an existing branch\n  branches              Display hierarchical tree of session branches\n  merge <name>          Merge code patches & trajectory turns from branch into current session',
+        execute: async (args, ctx) => {
+            const parts = args.trim().split(/\s+/);
+            const subcommand = parts[0]?.toLowerCase();
+            const subcommandArg = parts.slice(1).join(' ').trim();
+            const db = ctx.sessionManager.db;
+            const sessionDir = path.join(ctx.configDir, 'sessions');
+            const workspaceRoot = process.cwd();
+            const currentSessionId = ctx.toolContext.sessionId || 'default';
+            if (subcommand === 'branch') {
+                if (!subcommandArg) {
+                    console.log(pc.red('[WARN] Usage: /session branch <name>'));
+                    return;
+                }
+                try {
+                    const branch = createSessionBranch(db, currentSessionId, subcommandArg, workspaceRoot, sessionDir);
+                    console.log(pc.green(`[OK] Created session branch '${branch.name}' (id: ${branch.id.slice(0, 8)}) at step ${branch.branch_point_step}.`));
+                }
+                catch (err) {
+                    const msg = err instanceof Error ? err.message : String(err);
+                    console.log(pc.red(`[ERROR] ${msg}`));
+                }
+                return;
+            }
+            if (subcommand === 'checkout') {
+                if (!subcommandArg) {
+                    console.log(pc.red('[WARN] Usage: /session checkout <name>'));
+                    return;
+                }
+                try {
+                    const branch = checkoutSessionBranch(db, subcommandArg);
+                    ctx.toolContext.sessionId = branch.id;
+                    console.log(pc.green(`[OK] Switched session context to '${branch.name}' [id: ${branch.id.slice(0, 8)}].`));
+                }
+                catch (err) {
+                    const msg = err instanceof Error ? err.message : String(err);
+                    console.log(pc.red(`[ERROR] ${msg}`));
+                }
+                return;
+            }
+            if (subcommand === 'branches') {
+                const treeStr = listSessionBranches(db);
+                console.log(pc.bold('\n--- Session Branches ---'));
+                console.log(treeStr);
+                console.log(pc.bold('------------------------\n'));
+                return;
+            }
+            if (subcommand === 'merge') {
+                if (!subcommandArg) {
+                    console.log(pc.red('[WARN] Usage: /session merge <name>'));
+                    return;
+                }
+                try {
+                    const result = await mergeSessionBranch(db, subcommandArg, workspaceRoot, sessionDir);
+                    if (result.success) {
+                        console.log(pc.green(`[OK] ${result.message}`));
+                    }
+                    else {
+                        console.log(pc.red(`[ERROR] ${result.message}`));
+                    }
+                }
+                catch (err) {
+                    const msg = err instanceof Error ? err.message : String(err);
+                    console.log(pc.red(`[ERROR] ${msg}`));
+                }
+                return;
+            }
+            if (!subcommand || subcommand === 'list') {
+                const sessions = ctx.sessionManager.getSessionsForProject();
+                console.log(pc.bold('\n--- Past Sessions ---'));
+                if (sessions.length === 0) {
+                    console.log(pc.gray('  No past sessions found.'));
+                }
+                else {
+                    sessions.forEach((s) => {
+                        const currentTag = s.id === ctx.sessionManager.sessionId ? pc.green(' (current)') : '';
+                        const dateStr = new Date(s.updated_at).toLocaleString();
+                        console.log(`  • ${pc.cyan(s.id)}${currentTag}`);
+                        console.log(`    Title: ${pc.white(s.title)}`);
+                        console.log(`    Updated: ${pc.dim(dateStr)}`);
+                    });
+                }
+                console.log(pc.bold('---------------------\n'));
+                console.log(pc.gray('Use `/session load <id>` to resume a past session.'));
+                console.log(pc.gray('Use `/session new [title]` to start a new session.'));
+                console.log(pc.gray('Use `/session branch <name>` to snapshot & branch current session.'));
+                console.log(pc.gray('Use `/session checkout <name>` to switch to a branch.'));
+                console.log(pc.gray('Use `/session merge <name>` to merge branch edits.'));
+                console.log(pc.gray('Use `/session delete <id>` to delete a session.'));
+                console.log(pc.gray('Use `/session export [path]` to export session transcript.'));
+                return;
+            }
+            if (subcommand === 'load') {
+                if (!subcommandArg) {
+                    console.log(pc.red('Usage: /session load <id>'));
+                    return;
+                }
+                ctx.sessionManager.saveSessionState(ctx.messages, ctx.activeFiles, getSessionTodos(ctx.toolContext.sessionId));
+                const sessions = ctx.sessionManager.getSessionsForProject();
+                const target = sessions.find((s) => s.id === subcommandArg || s.id.startsWith(subcommandArg));
+                if (!target) {
+                    console.log(pc.red(`Session not found: ${subcommandArg}`));
+                    return;
+                }
+                const loaded = ctx.sessionManager.startSession(target.id, target.title);
+                ctx.initializeSessionState(loaded);
+                console.log(pc.green(`[OK] Loaded session: ${target.title} (${target.id})`));
+                return;
+            }
+            if (subcommand === 'new') {
+                ctx.sessionManager.saveSessionState(ctx.messages, ctx.activeFiles, getSessionTodos(ctx.toolContext.sessionId));
+                const newTitle = subcommandArg || `Session ${new Date().toLocaleDateString()}`;
+                const loaded = ctx.sessionManager.startSession(undefined, newTitle);
+                ctx.initializeSessionState(loaded);
+                console.log(pc.green(`[OK] Started new session: ${newTitle}`));
+                return;
+            }
+            if (subcommand === 'delete') {
+                if (!subcommandArg) {
+                    console.log(pc.red('Usage: /session delete <id>'));
+                    return;
+                }
+                ctx.sessionManager.deleteSession(subcommandArg);
+                console.log(pc.green(`[OK] Deleted session: ${subcommandArg}`));
+                return;
+            }
+            if (subcommand === 'export') {
+                const defaultPath = `session-export-${Date.now()}.md`;
+                const exportPath = subcommandArg || defaultPath;
+                const lines = [];
+                lines.push(`# Session Transcript - ${new Date().toLocaleString()}\n`);
+                ctx.messages.forEach((m) => {
+                    if (m.role === 'system')
+                        return;
+                    lines.push(`### ${m.role.toUpperCase()}\n${m.content}\n`);
+                });
+                fs.writeFileSync(exportPath, lines.join('\n'), 'utf8');
+                console.log(pc.green(`[OK] Session transcript exported to ${exportPath}`));
+                return;
+            }
+            if (subcommand === 'search') {
+                if (!subcommandArg) {
+                    console.log(pc.red('Usage: /session search <query>'));
+                    return;
+                }
+                const query = subcommandArg.toLowerCase();
+                const sessions = ctx.sessionManager.getSessionsForProject();
+                const matches = sessions.filter((s) => s.title.toLowerCase().includes(query) || s.id.toLowerCase().includes(query));
+                console.log(pc.bold(`\n--- Search Results for "${query}" ---`));
+                if (matches.length === 0) {
+                    console.log(pc.gray('  No matching sessions found.'));
+                }
+                else {
+                    matches.forEach((s) => {
+                        console.log(`  • ${pc.cyan(s.id)} - ${pc.white(s.title)}`);
+                    });
+                }
+                console.log(pc.bold('------------------------------------\n'));
+                return;
+            }
+            console.log(pc.yellow('[INFO] Usage: /session <list|load|new|delete|export|branch|checkout|branches|merge> [args]'));
+        }
+    },
     {
         name: '/undo',
         description: 'Undo file edits (usage: /undo [count|list])',