Jake/odysseus
1
0
Fork 0
mirror of https://github.com/pewdiepie-archdaemon/odysseus.git synced 2026-07-15 12:58:04 +00:00
Code Packages Projects Releases Activity

Fix incognito agent mode and cookbook tmux preview

Browse Source
This commit is contained in:
pewdiepie-archdaemon
2026-06-30 01:47:48 +00:00
parent a51f65e9ba
commit c987200616
3 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/js/chat.js
+1 -2
View File
@@ -842,7 +842,6 @@ import { wireArrowUpRecall, getLastUserMessageFromChatHistory } from './composer
if (!isIncognito && !isAgentMode && documentModule && activeDocIdForSend) { if (!isIncognito && !isAgentMode && documentModule && activeDocIdForSend) {
isAgentMode = true; isAgentMode = true;
} }
if (isIncognito) isAgentMode = false;
fd.append('mode', isAgentMode ? 'agent' : 'chat'); fd.append('mode', isAgentMode ? 'agent' : 'chat');
if (el('web-toggle').checked) { if (el('web-toggle').checked) {
if (isAgentMode) { if (isAgentMode) {
@@ -880,7 +879,7 @@ import { wireArrowUpRecall, getLastUserMessageFromChatHistory } from './composer
currentAbort = abortCtrl; currentAbort = abortCtrl;
const _tState = Storage.loadToggleState(); const _tState = Storage.loadToggleState();
const _isAgent = !isIncognito && (_tState.mode || 'chat') === 'agent'; const _isAgent = (_tState.mode || 'chat') === 'agent';
// Timeout: 6 min for research and agent mode, 3 min otherwise // Timeout: 6 min for research and agent mode, 3 min otherwise
const timeoutMs = el('research-toggle').checked || _isAgent ? RESEARCH_TIMEOUT_MS : DEFAULT_TIMEOUT_MS; const timeoutMs = el('research-toggle').checked || _isAgent ? RESEARCH_TIMEOUT_MS : DEFAULT_TIMEOUT_MS;
static/js/cookbook.js
+1 -1
View File
@@ -205,7 +205,7 @@ export function _sshCmd(host, cmd, port) {
/** Get SSH port for a given host (or task object) */ /** Get SSH port for a given host (or task object) */
function _getPort(hostOrTask) { function _getPort(hostOrTask) {
if (!hostOrTask) return ''; if (!hostOrTask) return '';
if (typeof hostOrTask === 'object') return hostOrTask.sshPort || _getPort(hostOrTask.remoteServerKey || hostOrTask.remoteHost); if (typeof hostOrTask === 'object') return hostOrTask.sshPort || _getPort(hostOrTask.remoteServerKey || hostOrTask.remoteHost || hostOrTask.payload?.remote_host);
const selected = hostOrTask === _envState.remoteHost ? _selectedServer() : null; const selected = hostOrTask === _envState.remoteHost ? _selectedServer() : null;
const srv = selected || _serverByVal(hostOrTask); const srv = selected || _serverByVal(hostOrTask);
return srv?.port || ''; return srv?.port || '';
static/js/cookbookRunning.js
+40 -17
View File
@@ -764,6 +764,11 @@ function _redactStoredText(value) {
.replace(/((?:api[_-]?key|token|authorization|password|passwd|secret)\s*[=:]\s*)(["']?)[^\s"']+/gi, '$1$2[redacted]'); .replace(/((?:api[_-]?key|token|authorization|password|passwd|secret)\s*[=:]\s*)(["']?)[^\s"']+/gi, '$1$2[redacted]');
} }
function _isServeOutputPlaceholder(value) {
const text = String(value || '').trim();
return !text || /^Launched via agent\s+—\s+waiting for tmux output/i.test(text);
}
function _redactTaskForStorage(task) { function _redactTaskForStorage(task) {
if (!task || typeof task !== 'object') return task; if (!task || typeof task !== 'object') return task;
const safe = { ...task }; const safe = { ...task };
@@ -882,18 +887,23 @@ function _animateOutThenRemove(el, sessionId) {
// ── tmux / Windows session commands ── // ── tmux / Windows session commands ──
function _taskRemoteHost(task) {
return task?.remoteHost || task?.payload?.remote_host || '';
}
export function _tmuxCmd(task, tmuxArgs) { export function _tmuxCmd(task, tmuxArgs) {
if (_isWindows(task)) { if (_isWindows(task)) {
return _winSessionCmd(task, tmuxArgs); return _winSessionCmd(task, tmuxArgs);
} }
if (task.remoteHost) { const host = _taskRemoteHost(task);
return `ssh ${_sshPrefix(_getPort(task))}${task.remoteHost} 'tmux ${tmuxArgs}' 2>/dev/null`; if (host) {
return `ssh ${_sshPrefix(_getPort(task))}${host} 'tmux ${tmuxArgs}' 2>/dev/null`;
} }
return `tmux ${tmuxArgs} 2>/dev/null`; return `tmux ${tmuxArgs} 2>/dev/null`;
} }
function _winSessionCmd(task, tmuxArgs) { function _winSessionCmd(task, tmuxArgs) {
const host = task.remoteHost; const host = _taskRemoteHost(task);
const sd = host ? '$env:TEMP\\odysseus-sessions' : '$env:TEMP\\odysseus-tmux'; const sd = host ? '$env:TEMP\\odysseus-sessions' : '$env:TEMP\\odysseus-tmux';
const sid = task.sessionId; const sid = task.sessionId;
const pf = _sshPrefix(_getPort(task)); const pf = _sshPrefix(_getPort(task));
@@ -925,12 +935,13 @@ function _winSessionCmd(task, tmuxArgs) {
function _winPowerShellCmd(task, ps) { function _winPowerShellCmd(task, ps) {
const command = `powershell -Command "${ps}"`; const command = `powershell -Command "${ps}"`;
if (!task.remoteHost) return command; const host = _taskRemoteHost(task);
return `ssh ${_sshPrefix(_getPort(task))}${task.remoteHost} ${_shQuote(command)}`; if (!host) return command;
return `ssh ${_sshPrefix(_getPort(task))}${host} ${_shQuote(command)}`;
} }
function _winSessionStopTreePs(task) { function _winSessionStopTreePs(task) {
const host = task.remoteHost; const host = _taskRemoteHost(task);
const sd = host ? '$env:TEMP\\odysseus-sessions' : '$env:TEMP\\odysseus-tmux'; const sd = host ? '$env:TEMP\\odysseus-sessions' : '$env:TEMP\\odysseus-tmux';
const sid = task.sessionId; const sid = task.sessionId;
const stopTree = `function Stop-Tree([int]$Id) { Get-CimInstance Win32_Process -Filter ('ParentProcessId = ' + $Id) -ErrorAction SilentlyContinue | ForEach-Object { Stop-Tree ([int]$_.ProcessId) }; Stop-Process -Id $Id -Force -ErrorAction SilentlyContinue }`; const stopTree = `function Stop-Tree([int]$Id) { Get-CimInstance Win32_Process -Filter ('ParentProcessId = ' + $Id) -ErrorAction SilentlyContinue | ForEach-Object { Stop-Tree ([int]$_.ProcessId) }; Stop-Process -Id $Id -Force -ErrorAction SilentlyContinue }`;
@@ -944,8 +955,9 @@ export function _tmuxGracefulKill(task) {
const ps = _winSessionStopTreePs(task); const ps = _winSessionStopTreePs(task);
return _winPowerShellCmd(task, ps); return _winPowerShellCmd(task, ps);
} }
if (task.remoteHost) { const host = _taskRemoteHost(task);
return `ssh ${_sshPrefix(_getPort(task))}${task.remoteHost} 'tmux send-keys -t ${task.sessionId} C-c 2>/dev/null; sleep 2; tmux kill-session -t ${task.sessionId} 2>/dev/null'`; if (host) {
return `ssh ${_sshPrefix(_getPort(task))}${host} 'tmux send-keys -t ${task.sessionId} C-c 2>/dev/null; sleep 2; tmux kill-session -t ${task.sessionId} 2>/dev/null'`;
} }
return `tmux send-keys -t ${task.sessionId} C-c 2>/dev/null; sleep 2; tmux kill-session -t ${task.sessionId} 2>/dev/null`; return `tmux send-keys -t ${task.sessionId} C-c 2>/dev/null; sleep 2; tmux kill-session -t ${task.sessionId} 2>/dev/null`;
} }
@@ -970,8 +982,9 @@ export function _tmuxForceKill(task) {
` done; ` + ` done; ` +
`fi; ` + `fi; ` +
`tmux kill-session -t ${sid} 2>/dev/null`; `tmux kill-session -t ${sid} 2>/dev/null`;
if (task.remoteHost) { const host = _taskRemoteHost(task);
return `ssh ${_sshPrefix(_getPort(task))}${task.remoteHost} ${_shQuote(inner)}`; if (host) {
return `ssh ${_sshPrefix(_getPort(task))}${host} ${_shQuote(inner)}`;
} }
return inner; return inner;
} }
@@ -986,8 +999,9 @@ export function _tmuxIsAliveCheck(task) {
} }
const sid = task.sessionId; const sid = task.sessionId;
const inner = `if tmux has-session -t ${sid} 2>/dev/null; then echo ALIVE; else echo DEAD; fi`; const inner = `if tmux has-session -t ${sid} 2>/dev/null; then echo ALIVE; else echo DEAD; fi`;
if (task.remoteHost) { const host = _taskRemoteHost(task);
return `ssh ${_sshPrefix(_getPort(task))}${task.remoteHost} ${_shQuote(inner)}`; if (host) {
return `ssh ${_sshPrefix(_getPort(task))}${host} ${_shQuote(inner)}`;
} }
return inner; return inner;
} }
@@ -1022,8 +1036,9 @@ function _ollamaUnloadCommand(task, outputText = '') {
const base = _ollamaBaseUrlForTask(task, outputText); const base = _ollamaBaseUrlForTask(task, outputText);
const body = JSON.stringify({ model, prompt: '', keep_alive: 0, stream: false }); const body = JSON.stringify({ model, prompt: '', keep_alive: 0, stream: false });
const inner = `curl -sf -X POST ${_shQuote(base + '/api/generate')} -H 'Content-Type: application/json' -d ${_shQuote(body)} >/dev/null 2>&1 || true`; const inner = `curl -sf -X POST ${_shQuote(base + '/api/generate')} -H 'Content-Type: application/json' -d ${_shQuote(body)} >/dev/null 2>&1 || true`;
if (task.remoteHost) { const host = _taskRemoteHost(task);
return `ssh ${_sshPrefix(_getPort(task))}${task.remoteHost} ${_shQuote(inner)}`; if (host) {
return `ssh ${_sshPrefix(_getPort(task))}${host} ${_shQuote(inner)}`;
} }
return inner; return inner;
} }
@@ -1032,7 +1047,7 @@ function _endpointUrlForTask(task, outputText = '') {
if (_taskLooksOllama(task, outputText)) { if (_taskLooksOllama(task, outputText)) {
return _ollamaBaseUrlForTask(task, outputText) + '/v1'; return _ollamaBaseUrlForTask(task, outputText) + '/v1';
} }
const host = _connectHostFromRemote(task.remoteHost); const host = _connectHostFromRemote(_taskRemoteHost(task));
const portMatch = task.payload?._cmd?.match(/--port\s+(\d+)/); const portMatch = task.payload?._cmd?.match(/--port\s+(\d+)/);
const port = portMatch ? portMatch[1] : '8000'; const port = portMatch ? portMatch[1] : '8000';
return `http://${host}:${port}/v1`; return `http://${host}:${port}/v1`;
@@ -2107,6 +2122,12 @@ export function _renderRunningTab() {
} }
const startNow = el.querySelector('.cookbook-task-start-now'); const startNow = el.querySelector('.cookbook-task-start-now');
if (startNow) startNow.style.display = (task.type === 'download' && task.status === 'queued') ? '' : 'none'; if (startNow) startNow.style.display = (task.type === 'download' && task.status === 'queued') ? '' : 'none';
const pre = el.querySelector('.cookbook-output-pre');
if (pre && typeof task.output === 'string' && task.output && pre.textContent !== task.output) {
const atBottom = (pre.scrollHeight - pre.scrollTop - pre.clientHeight) < 40;
pre.textContent = task.output;
if (atBottom) pre.scrollTop = pre.scrollHeight;
}
const terminalDiag = _terminalServeDiagnosis(task, el.querySelector('.cookbook-output-pre')?.textContent || task.output || ''); const terminalDiag = _terminalServeDiagnosis(task, el.querySelector('.cookbook-output-pre')?.textContent || task.output || '');
if (terminalDiag) { if (terminalDiag) {
_showDiagnosis(el, terminalDiag, el.querySelector('.cookbook-output-pre')?.textContent || task.output || ''); _showDiagnosis(el, terminalDiag, el.querySelector('.cookbook-output-pre')?.textContent || task.output || '');
@@ -2757,7 +2778,7 @@ async function _reconnectTask(el, task) {
const res = await fetch('/api/shell/exec', { const res = await fetch('/api/shell/exec', {
method: 'POST', credentials: 'same-origin', method: 'POST', credentials: 'same-origin',
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ command: _tmuxCmd(task, `capture-pane -t ${task.sessionId} -p -S -200`), timeout: 15 }), body: JSON.stringify({ command: _tmuxCmd(task, `capture-pane -t ${task.sessionId} -p -S -500`), timeout: 15 }),
}); });
const data = await res.json(); const data = await res.json();
@@ -3837,7 +3858,9 @@ async function _pollBackgroundStatus() {
const previous = String(task.output || ''); const previous = String(task.output || '');
const tail = String(live.output_tail || ''); const tail = String(live.output_tail || '');
if (tail && !previous.endsWith(tail)) { if (tail && !previous.endsWith(tail)) {
updates.output = `${previous ? `${previous}\n` : ''}${tail}`.slice(-5000); updates.output = _isServeOutputPlaceholder(previous)
? tail.slice(-5000)
: `${previous ? `${previous}\n` : ''}${tail}`.slice(-5000);
} }
} }
if (live.diagnosis && !task._diagnosisDismissed) { if (live.diagnosis && !task._diagnosisDismissed) {