diff --git a/cli/hero.v b/cli/hero.v index b32042ad..4e26b040 100644 --- a/cli/hero.v +++ b/cli/hero.v @@ -85,7 +85,7 @@ fn do() ! { herocmds.cmd_git(mut cmd) herocmds.cmd_generator(mut cmd) herocmds.cmd_docusaurus(mut cmd) - // herocmds.cmd_web(mut cmd) + herocmds.cmd_web(mut cmd) cmd.setup() cmd.parse(os.args) diff --git a/examples/web/ui_demo.vsh b/examples/web/ui_demo.vsh index 50711018..10f395eb 100755 --- a/examples/web/ui_demo.vsh +++ b/examples/web/ui_demo.vsh @@ -1,13 +1,13 @@ #!/usr/bin/env -S v -n -w -gc none -cg -cc tcc -d use_openssl -enable-globals run -// import freeflowuniverse.herolib.web.ui +import freeflowuniverse.herolib.web.ui -// fn main() { -// println('Starting UI test server on port 8080...') -// println('Visit http://localhost:8080 to see the admin interface') +fn main() { + println('Starting UI test server on port 8080...') + println('Visit http://localhost:8080 to see the admin interface') -// ui.start( -// title: 'Test Admin Panel' -// port: 8080 -// )! -// } + ui.start( + title: 'Test Admin Panel' + port: 8080 + )! +} diff --git a/lib/core/herocmds/web.v b/lib/core/herocmds/web.v index 5ee52fd9..805c68f9 100644 --- a/lib/core/herocmds/web.v +++ b/lib/core/herocmds/web.v @@ -1,110 +1,110 @@ module herocmds -// import freeflowuniverse.herolib.ui.console -// import freeflowuniverse.herolib.web.ui -// import os -// import cli { Command, Flag } -// import time +import freeflowuniverse.herolib.ui.console +import freeflowuniverse.herolib.web.ui +import os +import cli { Command, Flag } +import time -// pub fn cmd_web(mut cmdroot Command) Command { -// mut cmd_run := Command{ -// name: 'web' -// description: 'Run the Heroprompt UI (located in lib/web/heroprompt).' -// required_args: 0 -// execute: cmd_web_execute -// } +pub fn cmd_web(mut cmdroot Command) Command { + mut cmd_run := Command{ + name: 'web' + description: 'Run the Heroprompt UI (located in lib/web/heroprompt).' + required_args: 0 + execute: cmd_web_execute + } -// cmd_run.add_flag(Flag{ -// flag: .bool -// required: false -// name: 'open' -// abbrev: 'o' -// description: 'Open the UI in the default browser after starting the server.' -// }) + cmd_run.add_flag(Flag{ + flag: .bool + required: false + name: 'open' + abbrev: 'o' + description: 'Open the UI in the default browser after starting the server.' + }) -// cmd_run.add_flag(Flag{ -// flag: .string -// required: false -// name: 'host' -// abbrev: 'h' -// description: 'Host to bind the server to (default: localhost).' -// }) + cmd_run.add_flag(Flag{ + flag: .string + required: false + name: 'host' + abbrev: 'h' + description: 'Host to bind the server to (default: localhost).' + }) -// cmd_run.add_flag(Flag{ -// flag: .int -// required: false -// name: 'port' -// abbrev: 'p' -// description: 'Port to bind the server to (default: 8080).' -// }) + cmd_run.add_flag(Flag{ + flag: .int + required: false + name: 'port' + abbrev: 'p' + description: 'Port to bind the server to (default: 8080).' + }) -// cmdroot.add_command(cmd_run) -// return cmdroot -// } + cmdroot.add_command(cmd_run) + return cmdroot +} -// fn cmd_web_execute(cmd Command) ! { -// // ---------- FLAGS ---------- -// mut open_ := cmd.flags.get_bool('open') or { false } -// mut host := cmd.flags.get_string('host') or { 'localhost' } -// mut port := cmd.flags.get_int('port') or { 8080 } +fn cmd_web_execute(cmd Command) ! { + // ---------- FLAGS ---------- + mut open_ := cmd.flags.get_bool('open') or { false } + mut host := cmd.flags.get_string('host') or { 'localhost' } + mut port := cmd.flags.get_int('port') or { 8080 } -// // Set defaults if not provided -// if host == '' { -// host = 'localhost' -// } -// if port == 0 { -// port = 8080 -// } + // Set defaults if not provided + if host == '' { + host = 'localhost' + } + if port == 0 { + port = 8080 + } -// console.print_header('Starting Heroprompt...') + console.print_header('Starting Heroprompt...') -// // Prepare arguments for the UI factory -// mut factory_args := ui.FactoryArgs{ -// title: 'Hero Admin Panel' -// host: host -// port: port -// } + // Prepare arguments for the UI factory + mut factory_args := ui.FactoryArgs{ + title: 'Hero Admin Panel' + host: host + port: port + } -// // ---------- START WEB SERVER ---------- -// console.print_header('Starting Heroprompt server...') + // ---------- START WEB SERVER ---------- + console.print_header('Starting Heroprompt server...') -// // Start the server in a separate thread to allow for browser opening -// spawn fn [factory_args] () { -// ui.start(factory_args) or { -// console.print_stderr('Failed to start Heroprompt server: ${err}') -// return -// } -// }() + // Start the server in a separate thread to allow for browser opening + spawn fn [factory_args] () { + ui.start(factory_args) or { + console.print_stderr('Failed to start Heroprompt server: ${err}') + return + } + }() -// // Give the server a moment to start -// time.sleep(2 * time.second) -// url := 'http://${factory_args.host}:${factory_args.port}' + // Give the server a moment to start + time.sleep(2 * time.second) + url := 'http://${factory_args.host}:${factory_args.port}' -// console.print_green('Heroprompt server is running on ${url}') + console.print_green('Heroprompt server is running on ${url}') -// if open_ { -// mut cmd_str := '' -// $if macos { -// cmd_str = 'open ${url}' -// } $else $if linux { -// cmd_str = 'xdg-open ${url}' -// } $else $if windows { -// cmd_str = 'start ${url}' -// } + if open_ { + mut cmd_str := '' + $if macos { + cmd_str = 'open ${url}' + } $else $if linux { + cmd_str = 'xdg-open ${url}' + } $else $if windows { + cmd_str = 'start ${url}' + } -// if cmd_str != '' { -// result := os.execute(cmd_str) -// if result.exit_code == 0 { -// console.print_green('Opened Heroprompt in default browser.') -// } else { -// console.print_stderr('Failed to open browser: ${result.output}') -// } -// } -// } + if cmd_str != '' { + result := os.execute(cmd_str) + if result.exit_code == 0 { + console.print_green('Opened Heroprompt in default browser.') + } else { + console.print_stderr('Failed to open browser: ${result.output}') + } + } + } -// // Keep the process alive while the server runs -// console.print_header('Press Ctrl+C to stop the server') -// for { -// time.sleep(1 * time.second) -// } -// } + // Keep the process alive while the server runs + console.print_header('Press Ctrl+C to stop the server') + for { + time.sleep(1 * time.second) + } +} diff --git a/lib/web/heroprompt/endpoints.v b/lib/web/heroprompt/endpoints.v deleted file mode 100644 index a48a45ad..00000000 --- a/lib/web/heroprompt/endpoints.v +++ /dev/null @@ -1,315 +0,0 @@ -module heroprompt - -import veb -import os -import json -import time -import freeflowuniverse.herolib.develop.heroprompt as hp - -// Types for directory listing -struct DirItem { - name string - typ string @[json: 'type'] -} - -struct DirResp { - path string -mut: - items []DirItem -} - -// HTML routes -@['/heroprompt'; get] -pub fn (app &App) page_index(mut ctx Context) veb.Result { - return ctx.html(render_index(app)) -} - -// API routes (thin wrappers over develop.heroprompt) -@['/api/heroprompt/workspaces'; get] -pub fn (app &App) api_list(mut ctx Context) veb.Result { - mut names := []string{} - ws := hp.list(fromdb: true) or { []&hp.Workspace{} } - for w in ws { - names << w.name - } - ctx.set_content_type('application/json') - return ctx.text(json.encode(names)) -} - -@['/api/heroprompt/workspaces'; post] -pub fn (app &App) api_create(mut ctx Context) veb.Result { - name := ctx.form['name'] or { 'default' } - base_path_in := ctx.form['base_path'] or { '' } - if base_path_in.len == 0 { - return ctx.text('{"error":"base_path required"}') - } - mut base_path := base_path_in - // Expand tilde to user home - if base_path.starts_with('~') { - home := os.home_dir() - base_path = os.join_path(home, base_path.all_after('~')) - } - _ := hp.get(name: name, create: true, path: base_path) or { - return ctx.text('{"error":"create failed"}') - } - ctx.set_content_type('application/json') - return ctx.text(json.encode({ - 'name': name - 'base_path': base_path - })) -} - -@['/api/heroprompt/directory'; get] -pub fn (app &App) api_directory(mut ctx Context) veb.Result { - wsname := ctx.query['name'] or { 'default' } - path_q := ctx.query['path'] or { '' } - mut wsp := hp.get(name: wsname, create: false) or { - return ctx.text('{"error":"workspace not found"}') - } - // Use workspace list method; empty path means base_path - items_w := if path_q.len > 0 { wsp.list() or { - return ctx.text('{"error":"cannot list directory"}')} } else { wsp.list() or { - return ctx.text('{"error":"cannot list directory"}')} } - ctx.set_content_type('application/json') - mut resp := DirResp{ - path: if path_q.len > 0 { path_q } else { wsp.base_path } - } - for it in items_w { - resp.items << DirItem{ - name: it.name - typ: it.typ - } - } - return ctx.text(json.encode(resp)) -} - -// -------- File content endpoint -------- -struct FileResp { - language string - content string -} - -@['/api/heroprompt/file'; get] -pub fn (app &App) api_file(mut ctx Context) veb.Result { - wsname := ctx.query['name'] or { 'default' } - path_q := ctx.query['path'] or { '' } - if path_q.len == 0 { - return ctx.text('{"error":"path required"}') - } - mut base := '' - if wsp := hp.get(name: wsname, create: false) { - base = wsp.base_path - } - mut file_path := if !os.is_abs_path(path_q) && base.len > 0 { - os.join_path(base, path_q) - } else { - path_q - } - if !os.is_file(file_path) { - return ctx.text('{"error":"not a file"}') - } - // limit read to 1MB to avoid huge responses - max_size := i64(1_000_000) - sz := os.file_size(file_path) - if sz > max_size { - return ctx.text('{"error":"file too large"}') - } - content := os.read_file(file_path) or { return ctx.text('{"error":"failed to read"}') } - lang := detect_lang(file_path) - ctx.set_content_type('application/json') - return ctx.text(json.encode(FileResp{ language: lang, content: content })) -} - -fn detect_lang(path string) string { - ext := os.file_ext(path).trim_left('.') - return match ext.to_lower() { - 'v' { 'v' } - 'js' { 'javascript' } - 'ts' { 'typescript' } - 'py' { 'python' } - 'rs' { 'rust' } - 'go' { 'go' } - 'java' { 'java' } - 'c', 'h' { 'c' } - 'cpp', 'hpp', 'cc', 'hh' { 'cpp' } - 'sh', 'bash' { 'bash' } - 'json' { 'json' } - 'yaml', 'yml' { 'yaml' } - 'html', 'htm' { 'html' } - 'css' { 'css' } - 'md' { 'markdown' } - else { 'text' } - } -} - -// -------- Filename search endpoint -------- -struct SearchItem { - path string - typ string @[json: 'type'] -} - -@['/api/heroprompt/search'; get] -pub fn (app &App) api_search(mut ctx Context) veb.Result { - wsname := ctx.query['name'] or { 'default' } - q := ctx.query['q'] or { '' } - if q.len == 0 { - return ctx.text('{"error":"q required"}') - } - mut base := '' - if wsp := hp.get(name: wsname, create: false) { - base = wsp.base_path - } - if base.len == 0 { - return ctx.text('{"error":"workspace base_path not set"}') - } - max := (ctx.query['max'] or { '200' }).int() - mut results := []SearchItem{} - walk_search(base, q, max, mut results) - ctx.set_content_type('application/json') - return ctx.text(json.encode(results)) -} - -// Workspace details -@['/api/heroprompt/workspaces/:name'; get] -pub fn (app &App) api_workspace_get(mut ctx Context, name string) veb.Result { - wsp := hp.get(name: name, create: false) or { - return ctx.text('{"error":"workspace not found"}') - } - ctx.set_content_type('application/json') - return ctx.text(json.encode({ - 'name': wsp.name - 'base_path': wsp.base_path - })) -} - -@['/api/heroprompt/workspaces/:name'; delete] -pub fn (app &App) api_workspace_delete(mut ctx Context, name string) veb.Result { - wsp := hp.get(name: name, create: false) or { - return ctx.text('{"error":"workspace not found"}') - } - wsp.delete_workspace() or { return ctx.text('{"error":"delete failed"}') } - return ctx.text('{"ok":true}') -} - -@['/api/heroprompt/workspaces/:name'; patch] -pub fn (app &App) api_workspace_patch(mut ctx Context, name string) veb.Result { - wsp := hp.get(name: name, create: false) or { - return ctx.text('{"error":"workspace not found"}') - } - new_name := ctx.form['name'] or { '' } - mut base_path := ctx.form['base_path'] or { '' } - if base_path.len > 0 && base_path.starts_with('~') { - home := os.home_dir() - base_path = os.join_path(home, base_path.all_after('~')) - } - updated := wsp.update_workspace(name: new_name, base_path: base_path) or { - return ctx.text('{"error":"update failed"}') - } - ctx.set_content_type('application/json') - return ctx.text(json.encode({ - 'name': updated.name - 'base_path': updated.base_path - })) -} - -// -------- Path validation endpoint -------- -struct PathValidationResp { - is_abs bool - exists bool - is_dir bool - expanded string -} - -@['/api/heroprompt/validate_path'; get] -pub fn (app &App) api_validate_path(mut ctx Context) veb.Result { - p_in := ctx.query['path'] or { '' } - mut p := p_in - if p.starts_with('~') { - home := os.home_dir() - p = os.join_path(home, p.all_after('~')) - } - is_abs := if p != '' { os.is_abs_path(p) } else { false } - exists := if p != '' { os.exists(p) } else { false } - isdir := if exists { os.is_dir(p) } else { false } - ctx.set_content_type('application/json') - resp := PathValidationResp{ - is_abs: is_abs - exists: exists - is_dir: isdir - expanded: p - } - return ctx.text(json.encode(resp)) -} - -fn walk_search(root string, q string, max int, mut out []SearchItem) { - if out.len >= max { - return - } - entries := os.ls(root) or { return } - for e in entries { - if e in ['.git', 'node_modules', 'build', 'dist', '.v'] { - continue - } - p := os.join_path(root, e) - if os.is_dir(p) { - if out.len >= max { - return - } - if e.to_lower().contains(q.to_lower()) { - out << SearchItem{ - path: p - typ: 'directory' - } - } - walk_search(p, q, max, mut out) - } else if os.is_file(p) { - if e.to_lower().contains(q.to_lower()) { - out << SearchItem{ - path: p - typ: 'file' - } - } - } - if out.len >= max { - return - } - } -} - -// -------- Selection and prompt endpoints -------- -@['/api/heroprompt/workspaces/:name/files'; post] -pub fn (app &App) api_add_file(mut ctx Context, name string) veb.Result { - path := ctx.form['path'] or { '' } - if path.len == 0 { - return ctx.text('{"error":"path required"}') - } - mut wsp := hp.get(name: name, create: false) or { - return ctx.text('{"error":"workspace not found"}') - } - wsp.add_file(path: path) or { return ctx.text('{"error":"' + err.msg() + '"}') } - return ctx.text('{"ok":true}') -} - -@['/api/heroprompt/workspaces/:name/dirs'; post] -pub fn (app &App) api_add_dir(mut ctx Context, name string) veb.Result { - path := ctx.form['path'] or { '' } - if path.len == 0 { - return ctx.text('{"error":"path required"}') - } - mut wsp := hp.get(name: name, create: false) or { - return ctx.text('{"error":"workspace not found"}') - } - wsp.add_dir(path: path) or { return ctx.text('{"error":"' + err.msg() + '"}') } - return ctx.text('{"ok":true}') -} - -@['/api/heroprompt/workspaces/:name/prompt'; post] -pub fn (app &App) api_generate_prompt(mut ctx Context, name string) veb.Result { - text := ctx.form['text'] or { '' } - mut wsp := hp.get(name: name, create: false) or { - return ctx.text('{"error":"workspace not found"}') - } - prompt := wsp.prompt(text: text) - ctx.set_content_type('text/plain') - return ctx.text(prompt) -} diff --git a/lib/web/heroprompt/server.v b/lib/web/heroprompt/server.v deleted file mode 100644 index 8ba215cf..00000000 --- a/lib/web/heroprompt/server.v +++ /dev/null @@ -1,71 +0,0 @@ -module heroprompt - -import veb -import os - -// Public Context type for veb -pub struct Context { - veb.Context -} - -// Factory args for starting the server -@[params] -pub struct FactoryArgs { -pub mut: - host string = 'localhost' - port int = 8090 - title string = 'Heroprompt' -} - -// App holds server state and config -pub struct App { - veb.StaticHandler -pub mut: - title string - port int - base_path string // absolute path to this module directory -} - -// Create a new App instance (does not start the server) -pub fn new(args FactoryArgs) !&App { - base := os.dir(@FILE) - mut app := App{ - title: args.title - port: args.port - base_path: base - } - // Serve static assets from this module at /static - app.mount_static_folder_at(os.join_path(base, 'static'), '/static')! - return &app -} - -// Start the webserver (blocking) -pub fn start(args FactoryArgs) ! { - mut app := new(args)! - veb.run[App, Context](mut app, app.port) -} - -// Routes - -@['/'; get] -pub fn (app &App) index(mut ctx Context) veb.Result { - return ctx.html(render_index(app)) -} - -// Rendering helpers -fn render_index(app &App) string { - tpl := os.join_path(app.base_path, 'templates', 'index.html') - content := os.read_file(tpl) or { return render_index_fallback(app) } - return render_template(content, { - 'title': app.title - }) -} - -fn render_index_fallback(app &App) string { - return - '\n
' + - html_escape(app.title) + - '
' + - html_escape(app.title) + - '
Heroprompt server is running.
' -} diff --git a/lib/web/heroprompt/templates/index.html b/lib/web/heroprompt/templates/index.html deleted file mode 100644 index 8d5033de..00000000 --- a/lib/web/heroprompt/templates/index.html +++ /dev/null @@ -1,115 +0,0 @@ - - - - -
-
-
{{.title}} - Heroprompt
-
- - - -
-
-
{{.title}}
-
-
🌓
-
- -
-
Compose
-
Chat
-
-
-
-
-
-
-
-
Refresh
-
+
-
Details
-
-
-
-
-
-
-
Search
-
-
-
-
-
-
-
Prompt
-
-
Copy Prompt
-
-
-
Selected Files (
0
) — Tokens:
0
-
-
-
-
-
-
-
-
-
-
-
Send
-
-
-
-
-
- - -
-
-
-
-
Create workspace
-
✕
-
-
-
Workspace name (optional)
-
-
If blank we will generate one for you
-
Workspace path (required)
-
-
-
- -
- -
-
-
-
-
Workspace details
-
✕
-
-
-
Name
-
-
Path
-
-
-
- -
-
-
- - - \ No newline at end of file diff --git a/lib/web/heroprompt/utils.v b/lib/web/heroprompt/utils.v deleted file mode 100644 index e44fd628..00000000 --- a/lib/web/heroprompt/utils.v +++ /dev/null @@ -1,28 +0,0 @@ -module heroprompt - -import strings - -// Very small template renderer using {{.var}} replacement -pub fn render_template(tpl string, data map[string]string) string { - mut out := tpl - for k, v in data { - out = out.replace('{{.' + k + '}}', v) - } - return out -} - -// Minimal HTML escape -pub fn html_escape(s string) string { - mut b := strings.new_builder(s.len) - for ch in s { - match ch { - `&` { b.write_string('&') } - `<` { b.write_string('<') } - `>` { b.write_string('>') } - `"` { b.write_string('"') } - `'` { b.write_string(''') } - else { b.write_string(ch.str()) } - } - } - return b.str() -} diff --git a/lib/web/ui/chat/endpoints.v b/lib/web/ui/chat/endpoints.v new file mode 100644 index 00000000..952ca743 --- /dev/null +++ b/lib/web/ui/chat/endpoints.v @@ -0,0 +1,21 @@ +module chat + +import os +import freeflowuniverse.herolib.web.ui + +pub fn render(app &ui.App) !string { + tpl := os.join_path(os.dir(@FILE), 'templates', 'chat.html') + content := os.read_file(tpl)! + menu_content := ui.menu_html(app.menu, 0, 'm') + mut result := content + result = result.replace('{{.title}}', app.title) + result = result.replace('{{.menu_html}}', menu_content) + result = result.replace('{{.css_colors_url}}', '/static/css/colors.css') + result = result.replace('{{.css_main_url}}', '/static/css/main.css') + result = result.replace('{{.css_chat_url}}', '/static/chat/css/chat.css') + result = result.replace('{{.js_theme_url}}', '/static/js/theme.js') + result = result.replace('{{.js_chat_url}}', '/static/chat/js/chat.js') + // version banner + result = result.replace('