Add export functionality and enhance session logging; update dependencies and interfaces

Author: PrashamTrivedi

deno.lock

@@ -0,0 +1,47 @@
+import {parseArgs} from "jsr:@std/cli/parse-args"
+import {PromptDatabase} from "../modules/db/database.ts"
+import {log} from "../config/logging.ts"
+import {parseFlagForHelp} from "../utils/functions.ts"
+import {format} from "jsr:@std/datetime"
+import {join} from "jsr:@std/path"
+import {ensureDir} from "jsr:@std/fs"
+
+export async function handleExport(args: string[]) {
+    const db = new PromptDatabase()
+    const commandFlags = {
+        string: ["session"],
+        boolean: ["help"],
+    }
+
+    const flags = parseArgs(args, commandFlags)
+
+    if (flags.help) {
+        console.log(parseFlagForHelp(commandFlags))
+        return
+    }
+
+    if (!flags.session) {
+        console.error("Session ID is required. Use --session <id>")
+        return
+    }
+
+    try {
+        const markdown = await db.exportSessionToMarkdown(flags.session)
+
+        // Create exports directory
+        const exportDir = join(Deno.cwd(), "exports")
+        await ensureDir(exportDir)
+
+        // Generate filename with timestamp
+        const filename = `session_${flags.session}_${format(new Date(), "yyyyMMdd_HHmmss")}.md`
+        const filepath = join(exportDir, filename)
+
+        // Write markdown to file
+        await Deno.writeTextFile(filepath, markdown)
+
+        console.log(`Session log exported to: ${filepath}`)
+    } catch (error) {
+        log.error(`Error exporting session: ${error}`)
+        console.error(`Failed to export session: ${error}`)
+    }
+}

src/commands/export.ts

@@ -5,7 +5,6 @@ import {log} from "../config/logging.ts"
 import {parseFlagForHelp} from "../utils/functions.ts"
 
 export async function handleHistory(args: string[]) {
-
     const db = new PromptDatabase()
     const commandFlags = {
         string: ["view", "limit"],
@@ -28,13 +27,16 @@ export async function handleHistory(args: string[]) {
             const entry = db.getPromptById(id)
 
             if (entry) {
-                HistoryViewer.displayEntry(entry)
+                let sessionLogs = undefined
+                if (entry.session_id) {
+                    sessionLogs = await db.getSessionLogs(entry.session_id)
+                }
+                HistoryViewer.displayEntry(entry, sessionLogs)
             } else {
                 console.error(`No entry found with ID ${id}`)
             }
         } else {
             const limit = parseInt(flags.limit || "10")
-
             const entries: PromptEntry[] = db.listPrompts(isNaN(limit) ? 10 : limit)
             HistoryViewer.displayHistory(entries)
         }

src/commands/history.ts

@@ -9,7 +9,7 @@ export const LOGS_DIR = join(homedir(), ".ComputerUseAgent", "logs")
 export const DEFAULT_TOOLS_CONFIG_PATH = join(homedir(), ".ComputerUseAgent", "settings.json")
 export const MEMORY_PATH = "/root/memory.json"
 
-export const DEFAULT_EDITOR = Deno.env.get("EDITOR") ?? "nano";
+export const DEFAULT_EDITOR = Deno.env.get("EDITOR") ?? "nano"
 
 export const EDITOR_SYSTEM_PROMPT = Deno.env.get("EDITOR_SYSTEM_PROMPT") ??
     `You are a helpful assistant that helps users edit and work with text files.
@@ -26,8 +26,20 @@ You operate in the environment mentioned in <SystemInfo> tag.
 Please ensure all commands are compatible with this environment.
 `
 
+export const PLANNER_SYSTEM_PROMPT = `
+You prepare plans for an agentic system. 
+You will receive the user request, current system information and available tools in their respective tags. 
+Use this information to create a step by step plan for the agent to follow.
+Evaluate the user's request, if this is a simple request like a greeting, requesting information or advice which can be done without any tools simply respond with 'Reply to the user.'.
+However for anything more complex. Reflect on system information and available tools to create a step by step plan that agent can follow.
+take a note that the agent will always have access to running shell commands and file system operations,
+ with that in mind suggest any additional tools which are optimal for the task.
+You should respond with detailed JSON plan having the following shape: 
+[{step:1,action:'Action to be taken to achieve the goal', tools:['tool1','tool2']},"..."]
+ONLY Respond in JSON without any codefences or any other details
+`
 export const COMBINED_SYSTEM_PROMPT = `
-You are a versatile assistant with full system access for both file editing and command execution.
+You are a versatile assistant with full system access.
 You are currently operating in ${Deno.cwd()} directory.
 
 You have access to following tools and capabilities:

src/config/constants.ts

@@ -13,6 +13,7 @@ import {HybridSession} from "./modules/hybrid/hybrid_session.ts"
 import {parseFlagForHelp} from "./utils/functions.ts"
 import {handleHistory} from "./commands/history.ts"
 import {handleSettings} from "./commands/settings.ts"
+import {handleExport} from "./commands/export.ts"
 import {loadUserSettings} from "./config/settings.ts"
 import {openInEditor} from "./commands/editor.ts"
 
@@ -39,6 +40,9 @@ async function main() {
   } else if (flags._[0] === "settings") {
     await handleSettings(Deno.args)
     return
+  } else if (flags._[0] === "export") {
+    await handleExport(Deno.args)
+    return
   } else if (flags._[0] === "help") {
     console.log(parseFlagForHelp(argParseConfig))
     return

src/main.ts

@@ -38,6 +38,7 @@ System Context:
 
             log.info(`User input: ${JSON.stringify(apiMessage)}`)
 
+            let result = ""
             while (true) {
                 const response = await this.client.beta.messages.create({
                     model: API_CONFIG.MODEL,
@@ -60,6 +61,11 @@ System Context:
 
                 this.messages.push({role: "assistant", content: responseContent})
 
+                if (response.content.find((block) => block.type === "text")?.text) {
+                    const text = response.content.find((block) => block.type === "text")?.text || ""
+                    result += text + "\n"
+                }
+
                 if (response.stop_reason !== "tool_use") {
                     console.log(response.content.find((block) => block.type === "text")?.text ?? "bash")
                     break
@@ -81,8 +87,10 @@ System Context:
             }
 
             this.logger.logTotalCost()
+            await this.logInteraction('bash', bashPrompt, result, this.sessionId)
         } catch (error) {
             log.error(`Error in processBashCommand: ${error}`)
+            await this.logInteraction('bash', bashPrompt, `${error}`, this.sessionId)
             throw error
         }
     }

src/modules/bash/bash_session.ts

@@ -41,8 +41,9 @@ export class BashHandlers {
                 // First attempt: Try running the command directly
                 const directProcess = new Deno.Command(command.split(" ")[0], {
                     args: command.split(" ").slice(1),
-                    env: this.environment,
+
                     stdout: "piped",
+
                     stderr: "piped",
                 })
                 const result = await directProcess.output()

src/modules/bash/handlers.ts

@@ -1,5 +1,6 @@
-import {blue, bold, green, magenta, yellow} from "jsr:@std/fmt/colors"
+import {blue, bold, green, magenta, yellow, red} from "jsr:@std/fmt/colors"
 import {Table} from "table"
+import type {SessionLogEntry} from "../db/database.ts"
 
 export class HistoryViewer {
     static displayHistory(entries: Array<{
@@ -10,6 +11,7 @@ export class HistoryViewer {
         result: string
         tokens_used: number
         cost: number
+        session_id?: string
     }>) {
         console.clear()
 
@@ -19,6 +21,7 @@ export class HistoryViewer {
             bold("ID"),
             bold("Time"),
             bold("Mode"),
+            bold("Session"),
             bold("Prompt"),
             bold("Cost ($)")
         ]
@@ -27,6 +30,7 @@ export class HistoryViewer {
             blue(entry.id.toString()),
             green(entry.timestamp),
             yellow(entry.mode),
+            entry.session_id ? magenta(entry.session_id) : "-",
             entry.prompt.slice(0, 50) + (entry.prompt.length > 50 ? "..." : ""),
             magenta(entry.cost.toFixed(6))
         ])
@@ -43,13 +47,17 @@ export class HistoryViewer {
         result: string
         tokens_used: number
         cost: number
-    }) {
+        session_id?: string
+    }, sessionLogs?: SessionLogEntry[]) {
         console.clear()
         console.log(bold("\nPrompt Details:"))
         console.log("═".repeat(50))
         console.log(blue(`ID: ${entry.id}`))
         console.log(green(`Time: ${entry.timestamp}`))
         console.log(yellow(`Mode: ${entry.mode}`))
+        if (entry.session_id) {
+            console.log(magenta(`Session: ${entry.session_id}`))
+        }
         console.log(magenta(`Tokens: ${entry.tokens_used}`))
         console.log(magenta(`Cost: $${entry.cost.toFixed(6)}`))
         console.log("\n" + bold("Prompt:"))
@@ -58,6 +66,27 @@ export class HistoryViewer {
         console.log("\n" + bold("Result:"))
         console.log("─".repeat(50))
         console.log(entry.result)
+
+        if (sessionLogs?.length) {
+            console.log("\n" + bold("Session Steps:"))
+            console.log("═".repeat(50))
+            for (const log of sessionLogs) {
+                console.log(blue(`\nStep ${log.step_number}: ${log.step_description}`))
+                console.log(green(`Time: ${log.timestamp}`))
+                console.log(`Tools: ${Array.isArray(log.tools_used) ? log.tools_used.join(", ") :
+                    typeof log.tools_used === 'string' ? JSON.parse(log.tools_used).join(", ") : log.tools_used}`)
+                if (log.result) {
+                    console.log("\nResult:")
+                    console.log(log.result)
+                }
+                if (log.error) {
+                    console.log("\nError:")
+                    console.log(red(log.error))
+                }
+                console.log("─".repeat(50))
+            }
+        }
+
         console.log("\n")
     }
 }