Custom Commands für Agents: gleiche Befehls-UI wie Sessions, im Chat werden Agent- und Session-Commands zusammengeführt
Backend: - AgentRecord um CustomCommands-Feld erweitert - DB-Migration: custom_commands Spalte für agents Tabelle - Agent-CRUD (Create/Update) verarbeitet customCommands Frontend: - commands-ui.js: Shared Utility (createCommandRow, getCommandsFromUI, loadCommandsIntoUI) für Agent- und Session-Page - Agent-Page: Benutzerdefinierte Befehle Sektion mit Typ-Dropdown - Chat-Page: Lädt Agent-Commands + Session-Commands, zeigt beide mit Labels wenn beide vorhanden - Session-Page: Refactored auf shared commands-ui.js Funktionen - CSS: cmd-bar-label Styling für Agent:/Session: Trennung in der Command-Bar
This commit is contained in:
1 parent
ab234fde69
commit
e79a69a364
9 files changed
+130
-62
No files matched your search
@@ -42,6 +42,10 @@ public static class AgentEndpoint
|
|||||||
|
|
||||||
var avatarRaw = body.TryGetProperty("avatar", out var av) ? av.GetString() : null;
|
var avatarRaw = body.TryGetProperty("avatar", out var av) ? av.GetString() : null;
|
||||||
|
|
||||||
|
string customCommands = null;
|
||||||
|
if (body.TryGetProperty("customCommands", out var ccEl))
|
||||||
|
customCommands = ccEl.ValueKind == JsonValueKind.Null ? null : ccEl.GetRawText();
|
||||||
|
|
||||||
var agent = new AgentRecord
|
var agent = new AgentRecord
|
||||||
{
|
{
|
||||||
Name = body.TryGetProperty("name", out var n) ? n.GetString() ?? "Neuer Agent" : "Neuer Agent",
|
Name = body.TryGetProperty("name", out var n) ? n.GetString() ?? "Neuer Agent" : "Neuer Agent",
|
||||||
@@ -50,7 +54,8 @@ public static class AgentEndpoint
|
|||||||
Model = body.TryGetProperty("model", out var m) ? m.GetString() ?? "sonnet" : "sonnet",
|
Model = body.TryGetProperty("model", out var m) ? m.GetString() ?? "sonnet" : "sonnet",
|
||||||
Persona = body.TryGetProperty("persona", out var p) ? p.GetString() : null,
|
Persona = body.TryGetProperty("persona", out var p) ? p.GetString() : null,
|
||||||
Instructions = body.TryGetProperty("instructions", out var i) ? i.GetString() : null,
|
Instructions = body.TryGetProperty("instructions", out var i) ? i.GetString() : null,
|
||||||
ToolChoice = body.TryGetProperty("toolChoice", out var tc) ? tc.GetString() ?? "any" : "any"
|
ToolChoice = body.TryGetProperty("toolChoice", out var tc) ? tc.GetString() ?? "any" : "any",
|
||||||
|
CustomCommands = customCommands
|
||||||
};
|
};
|
||||||
|
|
||||||
agent = await db.CreateAgent(agent);
|
agent = await db.CreateAgent(agent);
|
||||||
@@ -74,6 +79,8 @@ public static class AgentEndpoint
|
|||||||
if (body.TryGetProperty("persona", out var p)) agent.Persona = p.GetString();
|
if (body.TryGetProperty("persona", out var p)) agent.Persona = p.GetString();
|
||||||
if (body.TryGetProperty("instructions", out var i)) agent.Instructions = i.GetString();
|
if (body.TryGetProperty("instructions", out var i)) agent.Instructions = i.GetString();
|
||||||
if (body.TryGetProperty("toolChoice", out var tc)) agent.ToolChoice = tc.GetString();
|
if (body.TryGetProperty("toolChoice", out var tc)) agent.ToolChoice = tc.GetString();
|
||||||
|
if (body.TryGetProperty("customCommands", out var cc))
|
||||||
|
agent.CustomCommands = cc.ValueKind == JsonValueKind.Null ? null : cc.GetRawText();
|
||||||
|
|
||||||
await db.UpdateAgent(agent);
|
await db.UpdateAgent(agent);
|
||||||
agent = await db.GetAgent(agentId);
|
agent = await db.GetAgent(agentId);
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ public class AgentRecord
|
|||||||
public string Persona { get; set; }
|
public string Persona { get; set; }
|
||||||
public string Instructions { get; set; }
|
public string Instructions { get; set; }
|
||||||
public string ToolChoice { get; set; } // "any" oder "auto"
|
public string ToolChoice { get; set; } // "any" oder "auto"
|
||||||
|
public string CustomCommands { get; set; }
|
||||||
public bool IsDeleted { get; set; }
|
public bool IsDeleted { get; set; }
|
||||||
public string CreatedAt { get; set; }
|
public string CreatedAt { get; set; }
|
||||||
public string UpdatedAt { get; set; }
|
public string UpdatedAt { get; set; }
|
||||||
|
|||||||
@@ -127,6 +127,7 @@ public class DatabaseService
|
|||||||
TryAddColumn(conn, "messages", "attachment_count", "INTEGER NOT NULL DEFAULT 0");
|
TryAddColumn(conn, "messages", "attachment_count", "INTEGER NOT NULL DEFAULT 0");
|
||||||
TryAddColumn(conn, "messages", "attachment_names", "TEXT");
|
TryAddColumn(conn, "messages", "attachment_names", "TEXT");
|
||||||
TryAddColumn(conn, "agents", "tool_choice", "TEXT DEFAULT 'any'");
|
TryAddColumn(conn, "agents", "tool_choice", "TEXT DEFAULT 'any'");
|
||||||
|
TryAddColumn(conn, "agents", "custom_commands", "TEXT");
|
||||||
}
|
}
|
||||||
|
|
||||||
private void TryAddColumn(SqliteConnection conn, string table, string column, string type)
|
private void TryAddColumn(SqliteConnection conn, string table, string column, string type)
|
||||||
@@ -145,8 +146,8 @@ public class DatabaseService
|
|||||||
agent.CreatedAt = now;
|
agent.CreatedAt = now;
|
||||||
agent.UpdatedAt = now;
|
agent.UpdatedAt = now;
|
||||||
await conn.ExecuteAsync(@"
|
await conn.ExecuteAsync(@"
|
||||||
INSERT INTO agents (agent_id, name, avatar, description, model, persona, instructions, tool_choice, is_deleted, created_at, updated_at)
|
INSERT INTO agents (agent_id, name, avatar, description, model, persona, instructions, tool_choice, custom_commands, is_deleted, created_at, updated_at)
|
||||||
VALUES (@AgentId, @Name, @Avatar, @Description, @Model, @Persona, @Instructions, @ToolChoice, 0, @CreatedAt, @UpdatedAt)
|
VALUES (@AgentId, @Name, @Avatar, @Description, @Model, @Persona, @Instructions, @ToolChoice, @CustomCommands, 0, @CreatedAt, @UpdatedAt)
|
||||||
", agent);
|
", agent);
|
||||||
return agent;
|
return agent;
|
||||||
}
|
}
|
||||||
@@ -171,7 +172,8 @@ public class DatabaseService
|
|||||||
agent.UpdatedAt = DateTime.UtcNow.ToString("o");
|
agent.UpdatedAt = DateTime.UtcNow.ToString("o");
|
||||||
await conn.ExecuteAsync(@"
|
await conn.ExecuteAsync(@"
|
||||||
UPDATE agents SET name = @Name, avatar = @Avatar, description = @Description,
|
UPDATE agents SET name = @Name, avatar = @Avatar, description = @Description,
|
||||||
model = @Model, persona = @Persona, instructions = @Instructions, tool_choice = @ToolChoice, updated_at = @UpdatedAt
|
model = @Model, persona = @Persona, instructions = @Instructions, tool_choice = @ToolChoice,
|
||||||
|
custom_commands = @CustomCommands, updated_at = @UpdatedAt
|
||||||
WHERE agent_id = @AgentId
|
WHERE agent_id = @AgentId
|
||||||
", agent);
|
", agent);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,6 +27,12 @@
|
|||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.cmd-bar-label {
|
||||||
|
font-size: var(--font-size);
|
||||||
|
opacity: var(--semi-transparent);
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
.custom-cmd-btn:hover {
|
.custom-cmd-btn:hover {
|
||||||
background: var(--f3-bg);
|
background: var(--f3-bg);
|
||||||
border-color: var(--f3-border);
|
border-color: var(--f3-border);
|
||||||
|
|||||||
@@ -130,6 +130,9 @@
|
|||||||
<input type="checkbox" id="agentToolChoice" checked>
|
<input type="checkbox" id="agentToolChoice" checked>
|
||||||
Tool-Nutzung erzwingen <span class="checkbox-hint">(tool_choice: any)</span>
|
Tool-Nutzung erzwingen <span class="checkbox-hint">(tool_choice: any)</span>
|
||||||
</label>
|
</label>
|
||||||
|
<label>Benutzerdefinierte Befehle</label>
|
||||||
|
<div class="custom-commands" id="agentCommandsList"></div>
|
||||||
|
<button type="button" id="agentAddCommandBtn" class="add-cmd-btn">+ Befehl hinzufügen</button>
|
||||||
<div class="form-actions">
|
<div class="form-actions">
|
||||||
<button id="agentSaveBtn">Speichern</button>
|
<button id="agentSaveBtn">Speichern</button>
|
||||||
<button id="agentCancelBtn">Abbrechen</button>
|
<button id="agentCancelBtn">Abbrechen</button>
|
||||||
@@ -219,6 +222,7 @@
|
|||||||
<script src="js/chat.js"></script>
|
<script src="js/chat.js"></script>
|
||||||
<script src="js/history.js"></script>
|
<script src="js/history.js"></script>
|
||||||
<script src="js/router.js"></script>
|
<script src="js/router.js"></script>
|
||||||
|
<script src="js/commands-ui.js"></script>
|
||||||
<script src="js/pages/dashboard.js"></script>
|
<script src="js/pages/dashboard.js"></script>
|
||||||
<script src="js/pages/agent-page.js"></script>
|
<script src="js/pages/agent-page.js"></script>
|
||||||
<script src="js/pages/session-page.js"></script>
|
<script src="js/pages/session-page.js"></script>
|
||||||
|
|||||||
@@ -0,0 +1,58 @@
|
|||||||
|
// ── Custom Commands UI (shared between session-page and agent-page) ──
|
||||||
|
|
||||||
|
function createCommandRow(container, name, command, type) {
|
||||||
|
name = name || '';
|
||||||
|
command = command || '';
|
||||||
|
type = type || 'background';
|
||||||
|
|
||||||
|
const item = document.createElement('div');
|
||||||
|
item.className = 'custom-command-item';
|
||||||
|
item.innerHTML = `
|
||||||
|
<div class="custom-command-fields">
|
||||||
|
<select class="cmd-type">
|
||||||
|
<option value="background">Hintergrund</option>
|
||||||
|
<option value="foreground">Vordergrund</option>
|
||||||
|
<option value="message">Nachricht</option>
|
||||||
|
</select>
|
||||||
|
<input type="text" class="cmd-name" placeholder="Name (z.B. Deploy)" value="${_escCmdAttr(name)}">
|
||||||
|
<input type="text" class="cmd-command" placeholder="${type === 'message' ? 'Nachricht...' : 'Befehl (z.B. ./deploy.sh)'}" value="${_escCmdAttr(command)}">
|
||||||
|
</div>
|
||||||
|
<button type="button" class="remove-cmd-btn icon-btn"><i class="fa fa-times"></i></button>
|
||||||
|
`;
|
||||||
|
var typeSelect = item.querySelector('.cmd-type');
|
||||||
|
typeSelect.value = type;
|
||||||
|
typeSelect.addEventListener('change', function() {
|
||||||
|
var cmdInput = item.querySelector('.cmd-command');
|
||||||
|
cmdInput.placeholder = typeSelect.value === 'message' ? 'Nachricht...' : 'Befehl (z.B. ./deploy.sh)';
|
||||||
|
});
|
||||||
|
item.querySelector('.remove-cmd-btn').addEventListener('click', function() { item.remove(); });
|
||||||
|
container.appendChild(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
function getCommandsFromUI(container) {
|
||||||
|
var items = container.querySelectorAll('.custom-command-item');
|
||||||
|
var commands = [];
|
||||||
|
for (var i = 0; i < items.length; i++) {
|
||||||
|
var item = items[i];
|
||||||
|
var name = item.querySelector('.cmd-name').value.trim();
|
||||||
|
var command = item.querySelector('.cmd-command').value.trim();
|
||||||
|
var type = item.querySelector('.cmd-type').value;
|
||||||
|
if (name || command) commands.push({ name: name, command: command, type: type });
|
||||||
|
}
|
||||||
|
return commands.length > 0 ? commands : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function loadCommandsIntoUI(container, customCommands) {
|
||||||
|
if (!customCommands) return;
|
||||||
|
try {
|
||||||
|
var cmds = typeof customCommands === 'string' ? JSON.parse(customCommands) : customCommands;
|
||||||
|
for (var i = 0; i < cmds.length; i++) {
|
||||||
|
var cmd = cmds[i];
|
||||||
|
createCommandRow(container, cmd.name || '', cmd.command || '', cmd.type || 'background');
|
||||||
|
}
|
||||||
|
} catch (e) { /* ignore parse errors */ }
|
||||||
|
}
|
||||||
|
|
||||||
|
function _escCmdAttr(str) {
|
||||||
|
return str.replace(/&/g, '&').replace(/"/g, '"').replace(/</g, '<').replace(/>/g, '>');
|
||||||
|
}
|
||||||
@@ -28,6 +28,8 @@ registerPage('agent', {
|
|||||||
const saveBtn = document.getElementById('agentSaveBtn');
|
const saveBtn = document.getElementById('agentSaveBtn');
|
||||||
const cancelBtn = document.getElementById('agentCancelBtn');
|
const cancelBtn = document.getElementById('agentCancelBtn');
|
||||||
const deleteBtn = document.getElementById('agentDeleteBtn');
|
const deleteBtn = document.getElementById('agentDeleteBtn');
|
||||||
|
const commandsList = document.getElementById('agentCommandsList');
|
||||||
|
const addCommandBtn = document.getElementById('agentAddCommandBtn');
|
||||||
|
|
||||||
_agentAvatarData = null;
|
_agentAvatarData = null;
|
||||||
|
|
||||||
@@ -45,8 +47,14 @@ registerPage('agent', {
|
|||||||
if (agent.avatar) {
|
if (agent.avatar) {
|
||||||
avatarPreview.innerHTML = `<img src="${agent.avatar}" alt="Avatar">`;
|
avatarPreview.innerHTML = `<img src="${agent.avatar}" alt="Avatar">`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Custom Commands laden
|
||||||
|
loadCommandsIntoUI(commandsList, agent.customCommands);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Befehl hinzufügen
|
||||||
|
addCommandBtn.addEventListener('click', () => createCommandRow(commandsList));
|
||||||
|
|
||||||
// Avatar Upload
|
// Avatar Upload
|
||||||
avatarBtn.addEventListener('click', () => avatarInput.click());
|
avatarBtn.addEventListener('click', () => avatarInput.click());
|
||||||
avatarInput.addEventListener('change', () => {
|
avatarInput.addEventListener('change', () => {
|
||||||
@@ -95,7 +103,8 @@ registerPage('agent', {
|
|||||||
persona: personaEl.value,
|
persona: personaEl.value,
|
||||||
instructions: instructionsEl.value,
|
instructions: instructionsEl.value,
|
||||||
toolChoice: toolChoiceEl.checked ? 'any' : 'auto',
|
toolChoice: toolChoiceEl.checked ? 'any' : 'auto',
|
||||||
avatar: _agentAvatarData
|
avatar: _agentAvatarData,
|
||||||
|
customCommands: getCommandsFromUI(commandsList)
|
||||||
};
|
};
|
||||||
|
|
||||||
if (isNew) {
|
if (isNew) {
|
||||||
|
|||||||
@@ -57,13 +57,44 @@ registerPage('chat', {
|
|||||||
titleEl.textContent = session.name || 'Unbenannt';
|
titleEl.textContent = session.name || 'Unbenannt';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Custom Command Buttons
|
// Custom Command Buttons (Agent + Session)
|
||||||
const cmdBar = document.getElementById('customCmdBar');
|
const cmdBar = document.getElementById('customCmdBar');
|
||||||
if (cmdBar) {
|
if (cmdBar) {
|
||||||
cmdBar.innerHTML = '';
|
cmdBar.innerHTML = '';
|
||||||
let cmds = [];
|
let agentCmds = [];
|
||||||
try { cmds = JSON.parse(session.customCommands || '[]') || []; } catch(e) {}
|
if (session.agentId) {
|
||||||
cmds.forEach(cmd => {
|
try {
|
||||||
|
const agent = await apiGetAgent(session.agentId);
|
||||||
|
if (agent && agent.customCommands) {
|
||||||
|
agentCmds = JSON.parse(agent.customCommands) || [];
|
||||||
|
}
|
||||||
|
} catch(e) {}
|
||||||
|
}
|
||||||
|
let sessionCmds = [];
|
||||||
|
try { sessionCmds = JSON.parse(session.customCommands || '[]') || []; } catch(e) {}
|
||||||
|
|
||||||
|
const allCmds = agentCmds.concat(sessionCmds);
|
||||||
|
const hasAgentCmds = agentCmds.length > 0;
|
||||||
|
const hasSessionCmds = sessionCmds.length > 0;
|
||||||
|
const hasBoth = hasAgentCmds && hasSessionCmds;
|
||||||
|
|
||||||
|
if (hasBoth) {
|
||||||
|
const sep1 = document.createElement('span');
|
||||||
|
sep1.className = 'cmd-bar-label';
|
||||||
|
sep1.textContent = 'Agent:';
|
||||||
|
cmdBar.appendChild(sep1);
|
||||||
|
}
|
||||||
|
|
||||||
|
let sessionSepAdded = false;
|
||||||
|
let cmdIndex = 0;
|
||||||
|
allCmds.forEach((cmd, idx) => {
|
||||||
|
if (hasBoth && !sessionSepAdded && idx === agentCmds.length) {
|
||||||
|
const sep2 = document.createElement('span');
|
||||||
|
sep2.className = 'cmd-bar-label';
|
||||||
|
sep2.textContent = 'Session:';
|
||||||
|
cmdBar.appendChild(sep2);
|
||||||
|
sessionSepAdded = true;
|
||||||
|
}
|
||||||
if (!cmd.name || !cmd.command) return;
|
if (!cmd.name || !cmd.command) return;
|
||||||
const type = cmd.type || 'background';
|
const type = cmd.type || 'background';
|
||||||
const btn = document.createElement('button');
|
const btn = document.createElement('button');
|
||||||
|
|||||||
@@ -3,47 +3,6 @@
|
|||||||
let _sessionImageData = null;
|
let _sessionImageData = null;
|
||||||
let _sessionPasteHandler = null;
|
let _sessionPasteHandler = null;
|
||||||
|
|
||||||
function _createCommandRow(container, name = '', command = '', type = 'background') {
|
|
||||||
const item = document.createElement('div');
|
|
||||||
item.className = 'custom-command-item';
|
|
||||||
item.innerHTML = `
|
|
||||||
<div class="custom-command-fields">
|
|
||||||
<select class="cmd-type">
|
|
||||||
<option value="background">Hintergrund</option>
|
|
||||||
<option value="foreground">Vordergrund</option>
|
|
||||||
<option value="message">Nachricht</option>
|
|
||||||
</select>
|
|
||||||
<input type="text" class="cmd-name" placeholder="Name (z.B. Deploy)" value="${_escAttr(name)}">
|
|
||||||
<input type="text" class="cmd-command" placeholder="${type === 'message' ? 'Nachricht...' : 'Befehl (z.B. ./deploy.sh)'}" value="${_escAttr(command)}">
|
|
||||||
</div>
|
|
||||||
<button type="button" class="remove-cmd-btn icon-btn"><i class="fa fa-times"></i></button>
|
|
||||||
`;
|
|
||||||
const typeSelect = item.querySelector('.cmd-type');
|
|
||||||
typeSelect.value = type;
|
|
||||||
typeSelect.addEventListener('change', () => {
|
|
||||||
const cmdInput = item.querySelector('.cmd-command');
|
|
||||||
cmdInput.placeholder = typeSelect.value === 'message' ? 'Nachricht...' : 'Befehl (z.B. ./deploy.sh)';
|
|
||||||
});
|
|
||||||
item.querySelector('.remove-cmd-btn').addEventListener('click', () => item.remove());
|
|
||||||
container.appendChild(item);
|
|
||||||
}
|
|
||||||
|
|
||||||
function _escAttr(str) {
|
|
||||||
return str.replace(/&/g, '&').replace(/"/g, '"').replace(/</g, '<').replace(/>/g, '>');
|
|
||||||
}
|
|
||||||
|
|
||||||
function _getCommandsFromUI(container) {
|
|
||||||
const items = container.querySelectorAll('.custom-command-item');
|
|
||||||
const commands = [];
|
|
||||||
for (const item of items) {
|
|
||||||
const name = item.querySelector('.cmd-name').value.trim();
|
|
||||||
const command = item.querySelector('.cmd-command').value.trim();
|
|
||||||
const type = item.querySelector('.cmd-type').value;
|
|
||||||
if (name || command) commands.push({ name, command, type });
|
|
||||||
}
|
|
||||||
return commands.length > 0 ? commands : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
registerPage('session', {
|
registerPage('session', {
|
||||||
async init(params) {
|
async init(params) {
|
||||||
const sessionId = params.id;
|
const sessionId = params.id;
|
||||||
@@ -89,16 +48,7 @@ registerPage('session', {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Custom Commands laden
|
// Custom Commands laden
|
||||||
if (session.customCommands) {
|
loadCommandsIntoUI(commandsList, session.customCommands);
|
||||||
try {
|
|
||||||
const cmds = typeof session.customCommands === 'string'
|
|
||||||
? JSON.parse(session.customCommands)
|
|
||||||
: session.customCommands;
|
|
||||||
for (const cmd of cmds) {
|
|
||||||
_createCommandRow(commandsList, cmd.name || '', cmd.command || '', cmd.type || 'background');
|
|
||||||
}
|
|
||||||
} catch (e) { /* ignore parse errors */ }
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
titleEl.textContent = 'Neue Session';
|
titleEl.textContent = 'Neue Session';
|
||||||
deleteBtn.hidden = true;
|
deleteBtn.hidden = true;
|
||||||
@@ -106,7 +56,7 @@ registerPage('session', {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Befehl hinzufügen
|
// Befehl hinzufügen
|
||||||
addCommandBtn.addEventListener('click', () => _createCommandRow(commandsList));
|
addCommandBtn.addEventListener('click', () => createCommandRow(commandsList));
|
||||||
|
|
||||||
// Agents laden
|
// Agents laden
|
||||||
const agents = await apiGetAgents();
|
const agents = await apiGetAgents();
|
||||||
@@ -173,7 +123,7 @@ registerPage('session', {
|
|||||||
|
|
||||||
// Speichern
|
// Speichern
|
||||||
saveBtn.addEventListener('click', async () => {
|
saveBtn.addEventListener('click', async () => {
|
||||||
const commands = _getCommandsFromUI(commandsList);
|
const commands = getCommandsFromUI(commandsList);
|
||||||
const data = {
|
const data = {
|
||||||
name: nameEl.value.trim() || 'Unbenannt',
|
name: nameEl.value.trim() || 'Unbenannt',
|
||||||
description: descEl.value.trim(),
|
description: descEl.value.trim(),
|
||||||
|
|||||||
Reference in new issue
Block a user