onako 0.4.2__py3-none-any.whl → 0.4.4__py3-none-any.whl

onako/__init__.py

@@ -1 +1 @@
-__version__ = "0.4.2"
+__version__ = "0.4.4"

onako/cli.py

@@ -10,6 +10,7 @@ import click
 ONAKO_DIR = Path.home() / ".onako"
 LOG_DIR = ONAKO_DIR / "logs"
 PID_FILE = ONAKO_DIR / "onako.pid"
+DEV_MARKER = ONAKO_DIR / "onako.dev"
 
 
 @click.group(invoke_without_command=True)
@@ -18,8 +19,9 @@ PID_FILE = ONAKO_DIR / "onako.pid"
 @click.option("--session", default="onako", help="tmux session name (auto-detected if inside tmux).")
 @click.option("--dir", "working_dir", default=None, type=click.Path(exists=True), help="Working directory for tasks (default: current directory).")
 @click.option("--dangerously-skip-permissions", "skip_permissions", is_flag=True, default=False, help="Pass --dangerously-skip-permissions to all Claude Code tasks.")
+@click.option("--no-attach", is_flag=True, default=False, help="Start the server without attaching to tmux.")
 @click.pass_context
-def main(ctx, host, port, session, working_dir, skip_permissions):
+def main(ctx, host, port, session, working_dir, skip_permissions, no_attach):
     """Onako — Dispatch and monitor Claude Code tasks from your phone."""
     if ctx.invoked_subcommand is not None:
         return
@@ -65,7 +67,7 @@ def main(ctx, host, port, session, working_dir, skip_permissions):
         capture_output=True,
     )
 
-    if not inside_tmux:
+    if not inside_tmux and not no_attach:
         os.execvp("tmux", ["tmux", "attach-session", "-t", session])
 
 
@@ -115,16 +117,69 @@ def stop():
         try:
             pid = int(PID_FILE.read_text().strip())
             os.kill(pid, 15)  # SIGTERM
-            click.echo(f"Onako server stopped (pid {pid}).")
+            dev = " (dev)" if DEV_MARKER.exists() else ""
+            click.echo(f"Onako server stopped{dev} (pid {pid}).")
             stopped = True
         except (ValueError, ProcessLookupError):
             click.echo("Stale pid file found, cleaning up.")
         PID_FILE.unlink(missing_ok=True)
+        DEV_MARKER.unlink(missing_ok=True)
 
     if not stopped:
         click.echo("Onako service is not running.")
 
 
+@main.command()
+@click.option("--session", default="onako", help="tmux session name.")
+def purge(session):
+    """Kill all tmux windows from the onako session and clean up."""
+    # Auto-detect current tmux session if inside one
+    if os.environ.get("TMUX"):
+        try:
+            result = subprocess.run(
+                ["tmux", "display-message", "-p", "#S"],
+                capture_output=True, text=True,
+            )
+            if result.returncode == 0 and result.stdout.strip():
+                session = result.stdout.strip()
+        except FileNotFoundError:
+            pass
+
+    # Also stop the server if it's running
+    if PID_FILE.exists():
+        try:
+            pid = int(PID_FILE.read_text().strip())
+            os.kill(pid, 15)
+            dev = " (dev)" if DEV_MARKER.exists() else ""
+            click.echo(f"Stopped onako server{dev} (pid {pid}).")
+        except (ValueError, ProcessLookupError):
+            pass
+        PID_FILE.unlink(missing_ok=True)
+        DEV_MARKER.unlink(missing_ok=True)
+
+    # Kill the tmux session
+    result = subprocess.run(
+        ["tmux", "kill-session", "-t", f"{session}:"],
+        capture_output=True, text=True,
+    )
+    if result.returncode == 0:
+        click.echo(f"Killed tmux session: {session}")
+    else:
+        click.echo(f"No tmux session '{session}' found.")
+
+    # Clean up the database
+    db_path = ONAKO_DIR / "onako.db"
+    if db_path.exists():
+        import sqlite3
+        conn = sqlite3.connect(db_path)
+        conn.execute("UPDATE tasks SET status = 'done' WHERE status = 'running'")
+        conn.commit()
+        conn.close()
+        click.echo("Marked all running tasks as done.")
+
+    click.echo("Purge complete.")
+
+
 @main.command()
 def status():
     """Check if Onako is running."""
@@ -133,7 +188,8 @@ def status():
         r = urllib.request.urlopen("http://127.0.0.1:8787/health", timeout=2)
         data = r.read().decode()
         if '"ok"' in data:
-            click.echo("Onako server: running")
+            mode = " (dev)" if DEV_MARKER.exists() else ""
+            click.echo(f"Onako server: running{mode}")
             click.echo("  URL: http://127.0.0.1:8787")
         else:
             click.echo("Onako server: not responding correctly")
@@ -160,7 +216,8 @@ def _start_server(host, port, session, working_dir, skip_permissions=False):
     Returns True if the server was started or is already running.
     """
     if _is_server_running():
-        click.echo(f"Onako server already running (pid {PID_FILE.read_text().strip()})")
+        dev = " (dev)" if DEV_MARKER.exists() else ""
+        click.echo(f"Onako server already running{dev} (pid {PID_FILE.read_text().strip()})")
         return True
 
     LOG_DIR.mkdir(parents=True, exist_ok=True)
@@ -185,9 +242,15 @@ def _start_server(host, port, session, working_dir, skip_permissions=False):
     PID_FILE.parent.mkdir(parents=True, exist_ok=True)
     PID_FILE.write_text(str(proc.pid))
 
+    if os.environ.get("ONAKO_DEV"):
+        DEV_MARKER.write_text("")
+    else:
+        DEV_MARKER.unlink(missing_ok=True)
+
+    dev = " (dev)" if DEV_MARKER.exists() else ""
     local_ip = _get_local_ip()
     banner = [
-        f"Onako server started (pid {proc.pid})",
+        f"Onako server started{dev} (pid {proc.pid})",
         f"  Dashboard: http://{host}:{port}",
     ]
     if local_ip:

onako/server.py

@@ -1,5 +1,6 @@
 import os
 import shlex
+import uuid
 
 from fastapi import FastAPI, HTTPException
 from fastapi.responses import FileResponse
@@ -37,11 +38,12 @@ def health():
 @app.post("/tasks")
 def create_task(req: CreateTaskRequest):
     skip = req.skip_permissions if req.skip_permissions is not None else skip_permissions_default
+    claude_session_id = str(uuid.uuid4())
     if skip:
-        command = f"claude --dangerously-skip-permissions {shlex.quote(req.prompt)}"
+        command = f"claude --dangerously-skip-permissions --session-id {claude_session_id} {shlex.quote(req.prompt)}"
     else:
-        command = f"claude {shlex.quote(req.prompt)}"
-    task = orch.create_task(command, working_dir=req.working_dir, prompt=req.prompt)
+        command = f"claude --session-id {claude_session_id} {shlex.quote(req.prompt)}"
+    task = orch.create_task(command, working_dir=req.working_dir, prompt=req.prompt, claude_session_id=claude_session_id)
     return task
 
 
@@ -84,12 +86,23 @@ def interrupt_task(task_id: str):
     return {"status": "interrupted"}
 
 
+@app.post("/tasks/{task_id}/resume")
+def resume_task(task_id: str):
+    if task_id not in orch.tasks:
+        raise HTTPException(status_code=404, detail="Task not found")
+    try:
+        new_task = orch.resume_task(task_id, skip_permissions=skip_permissions_default)
+    except ValueError as e:
+        raise HTTPException(status_code=400, detail=str(e))
+    return new_task
+
+
 @app.delete("/tasks/{task_id}")
 def delete_task(task_id: str):
     if task_id not in orch.tasks:
         raise HTTPException(status_code=404, detail="Task not found")
-    if task_id == "onako-main":
-        raise HTTPException(status_code=400, detail="Cannot kill the main window")
+    if orch.window_count() <= 1:
+        raise HTTPException(status_code=400, detail="Cannot kill the last window")
     orch.kill_task(task_id)
     return {"status": "deleted"}
 

onako/static/index.html

@@ -33,6 +33,33 @@
             cursor: pointer;
             font-size: 14px;
         }
+        .task-controls {
+            padding: 8px;
+            display: flex;
+            gap: 6px;
+            border-bottom: 1px solid #2a2a2a;
+        }
+        .task-controls input {
+            flex: 1;
+            min-width: 0;
+            background: #2a2a2a;
+            border: 1px solid #333;
+            color: #e0e0e0;
+            padding: 6px 10px;
+            border-radius: 6px;
+            font-size: 13px;
+            -webkit-appearance: none;
+        }
+        .task-controls select {
+            background: #2a2a2a;
+            border: 1px solid #333;
+            color: #e0e0e0;
+            padding: 6px 8px;
+            border-radius: 6px;
+            font-size: 13px;
+            -webkit-appearance: none;
+            flex-shrink: 0;
+        }
         .task-list { padding: 8px; }
         .task-item {
             padding: 12px;
@@ -40,6 +67,7 @@
             cursor: pointer;
         }
         .task-item:hover { background: #222; }
+        .task-item.selected { background: #2a2a2a; }
         .task-item .task-id { font-size: 12px; color: #888; }
         .task-item .task-prompt {
             font-size: 14px;
@@ -71,6 +99,40 @@
             padding: 48px 16px;
             font-size: 14px;
         }
+        .section-header {
+            display: flex;
+            align-items: center;
+            gap: 6px;
+            padding: 10px 12px 6px;
+            font-size: 11px;
+            font-weight: 600;
+            color: #666;
+            text-transform: uppercase;
+            letter-spacing: 0.5px;
+            cursor: pointer;
+            user-select: none;
+        }
+        .section-header .chevron {
+            transition: transform 0.15s;
+            font-size: 10px;
+        }
+        .section-header.collapsed .chevron {
+            transform: rotate(-90deg);
+        }
+        .recent-tasks.collapsed { display: none; }
+        .task-item.done { opacity: 0.6; }
+        .resume-btn {
+            display: inline-block;
+            background: #3b82f6;
+            color: white;
+            border: none;
+            padding: 3px 10px;
+            border-radius: 4px;
+            cursor: pointer;
+            font-size: 11px;
+            margin-left: 8px;
+            vertical-align: middle;
+        }
         #connection-banner {
             display: none;
             background: #ef4444;
@@ -83,6 +145,14 @@
         #detail-view { display: none; flex-direction: column; height: 100dvh; }
         #detail-view.active { display: flex; }
         #list-view.hidden { display: none; }
+        #detail-empty {
+            display: none;
+            flex: 1;
+            align-items: center;
+            justify-content: center;
+            color: #555;
+            font-size: 14px;
+        }
         #detail-header {
             padding: 12px 16px;
             padding-top: max(12px, env(safe-area-inset-top));
@@ -118,16 +188,38 @@
             font-size: 12px;
         }
         #kill-btn.hidden { display: none; }
+        #resume-detail-btn {
+            background: #3b82f6;
+            color: white;
+            border: none;
+            padding: 6px 12px;
+            border-radius: 6px;
+            cursor: pointer;
+            font-size: 12px;
+        }
+        #resume-detail-btn.hidden { display: none; }
         #output {
             padding: 12px;
             font-family: "SF Mono", "Menlo", "Monaco", monospace;
             font-size: 12px;
-            white-space: pre-wrap;
-            word-break: break-all;
-            line-height: 1.4;
+            line-height: 1.5;
             overflow-y: auto;
             flex: 1;
         }
+        .output-block {
+            white-space: pre-wrap;
+            word-break: break-word;
+            padding: 4px 0;
+        }
+        .block-user {
+            border-left: 2px solid #555;
+            padding-left: 10px;
+            margin-left: 2px;
+            color: #999;
+        }
+        .block-plain {
+            color: #888;
+        }
         #message-bar {
             padding: 8px;
             padding-bottom: max(8px, env(safe-area-inset-bottom));
@@ -212,17 +304,65 @@
             font-size: 16px;
             margin-top: 12px;
         }
+
+        /* Desktop sidebar layout */
+        @media (min-width: 768px) {
+            #app-container {
+                display: flex;
+                height: 100dvh;
+            }
+            #list-view,
+            #list-view.hidden {
+                width: 280px;
+                flex-shrink: 0;
+                border-right: 1px solid #333;
+                display: flex;
+                flex-direction: column;
+                overflow: hidden;
+            }
+            .task-list {
+                flex: 1;
+                overflow-y: auto;
+            }
+            #detail-view {
+                flex: 1;
+                display: flex;
+                height: auto;
+            }
+            #detail-view:not(.active) #detail-header,
+            #detail-view:not(.active) #output,
+            #detail-view:not(.active) #message-bar {
+                display: none;
+            }
+            #detail-view:not(.active) #detail-empty {
+                display: flex;
+            }
+            #detail-view.active #detail-empty {
+                display: none;
+            }
+            #back-btn { display: none; }
+        }
     </style>
 </head>
 <body>
     <div id="connection-banner">Connection lost. Retrying...</div>
 
-    <!-- List View -->
+    <div id="app-container">
+    <!-- List View / Sidebar -->
     <div id="list-view">
         <header>
             <h1>Onako</h1>
             <button id="new-task-btn">+ New Task</button>
         </header>
+        <div class="task-controls">
+            <input id="search-input" type="text" placeholder="Search...">
+            <select id="sort-select">
+                <option value="active-desc">Active ↓</option>
+                <option value="active-asc">Active ↑</option>
+                <option value="started-desc">Started ↓</option>
+                <option value="started-asc">Started ↑</option>
+            </select>
+        </div>
         <div class="task-list" id="task-list"></div>
     </div>
 
@@ -231,14 +371,19 @@
         <div id="detail-header">
             <button id="back-btn">&larr; Back</button>
             <span id="detail-task-id"></span>
-            <button id="interrupt-btn">Interrupt</button>
-            <button id="kill-btn">Kill</button>
+            <div style="display:flex;gap:8px">
+                <button id="resume-detail-btn" class="hidden">Resume</button>
+                <button id="interrupt-btn">Interrupt</button>
+                <button id="kill-btn">Kill</button>
+            </div>
         </div>
         <div id="output"></div>
         <div id="message-bar">
             <input id="message-input" type="text" placeholder="Send a message...">
             <button id="send-btn">Send</button>
         </div>
+        <div id="detail-empty">Select a task to view</div>
+    </div>
     </div>
 
     <!-- New Task Modal -->
@@ -260,6 +405,10 @@
         let pollInterval = null;
         let skipPermissionsDefault = false;
 
+        function isDesktop() {
+            return window.innerWidth >= 768;
+        }
+
         function timeAgo(dateStr) {
             if (!dateStr) return '';
             const seconds = Math.floor((Date.now() - new Date(dateStr).getTime()) / 1000);
@@ -281,50 +430,123 @@
                 const res = await fetch(`${API}/health`);
                 const data = await res.json();
                 skipPermissionsDefault = data.skip_permissions || false;
-                document.getElementById('skip-perms-input').checked = skipPermissionsDefault;
+                const saved = localStorage.getItem('skipPermissions');
+                const initial = saved !== null ? saved === '1' : skipPermissionsDefault;
+                document.getElementById('skip-perms-input').checked = initial;
             } catch (e) {}
         }
 
+        let recentCollapsed = localStorage.getItem('recentCollapsed') === '1';
+
+        function renderTaskItem(t) {
+            const isDone = t.status === 'done';
+            const resumable = isDone && t.claude_session_id;
+            return `
+                <div class="task-item${currentTaskId === t.id ? ' selected' : ''}${isDone ? ' done' : ''}" onclick="showTask('${t.id}')">
+                    <div class="task-id">${t.id}${t.origin === 'external' ? '<span class="origin-badge">external</span>' : ''}${resumable ? '<button class="resume-btn" onclick="event.stopPropagation();resumeTask(\''+t.id+'\')">Resume</button>' : ''}</div>
+                    <div class="task-prompt">${escapeHtml(t.prompt)}</div>
+                    <div class="task-meta">
+                        <span class="status-${t.status}">${isDone ? 'done' : '&#10003;'}</span>
+                        ${t.started_at ? ' &middot; started ' + timeAgo(t.started_at) : ''}
+                        ${t.last_activity ? ' &middot; active ' + timeAgo(t.last_activity) : ''}
+                    </div>
+                </div>`;
+        }
+
         async function loadTasks() {
             try {
                 const res = await fetch(`${API}/tasks`);
-                const tasks = (await res.json()).filter(t => t.status === 'running');
+                const allTasks = await res.json();
+                allTasksCache = allTasks;
+                const query = document.getElementById('search-input').value.trim().toLowerCase();
+                let running = allTasks.filter(t => t.status === 'running');
+                let done = allTasks.filter(t => t.status === 'done' && t.claude_session_id);
+                if (query) {
+                    running = running.filter(t => t.prompt.toLowerCase().includes(query));
+                    done = done.filter(t => t.prompt.toLowerCase().includes(query));
+                }
+                const sort = document.getElementById('sort-select').value;
+                const [field, dir] = sort.split('-');
+                const key = field === 'active' ? 'last_activity' : 'started_at';
+                const mul = dir === 'desc' ? 1 : -1;
+                const sortFn = (a, b) => {
+                    const va = a[key] || '';
+                    const vb = b[key] || '';
+                    return va < vb ? mul : va > vb ? -mul : 0;
+                };
+                running.sort(sortFn);
+                done.sort((a, b) => {
+                    const va = a.last_activity || a.started_at || '';
+                    const vb = b.last_activity || b.started_at || '';
+                    return va < vb ? 1 : va > vb ? -1 : 0;
+                });
+                // Limit recent to last 20
+                done = done.slice(0, 20);
                 const list = document.getElementById('task-list');
-                if (tasks.length === 0) {
-                    list.innerHTML = '<div class="empty-state">No tasks running</div>';
+                let html = '';
+                if (running.length === 0 && done.length === 0) {
+                    html = '<div class="empty-state">No tasks</div>';
                 } else {
-                    list.innerHTML = tasks.map(t => `
-                        <div class="task-item" onclick="showTask('${t.id}')">
-                            <div class="task-id">${t.id}${t.origin === 'external' ? '<span class="origin-badge">external</span>' : ''}</div>
-                            <div class="task-prompt">${escapeHtml(t.prompt)}</div>
-                            <div class="task-meta">
-                                <span class="status-${t.status}">${t.status}</span>
-                                ${t.started_at ? ' &middot; ' + timeAgo(t.started_at) : ''}
-                            </div>
-                        </div>
-                    `).join('');
+                    if (running.length > 0) {
+                        html += running.map(renderTaskItem).join('');
+                    } else {
+                        html += '<div class="empty-state">No tasks running</div>';
+                    }
+                    if (done.length > 0) {
+                        html += `<div class="section-header${recentCollapsed ? ' collapsed' : ''}" onclick="toggleRecent()"><span class="chevron">&#9660;</span> Recent (${done.length})</div>`;
+                        html += `<div class="recent-tasks${recentCollapsed ? ' collapsed' : ''}">`;
+                        html += done.map(renderTaskItem).join('');
+                        html += '</div>';
+                    }
                 }
+                list.innerHTML = html;
                 showConnectionError(false);
             } catch (e) {
                 showConnectionError(true);
             }
         }
 
+        function toggleRecent() {
+            recentCollapsed = !recentCollapsed;
+            localStorage.setItem('recentCollapsed', recentCollapsed ? '1' : '0');
+            loadTasks();
+        }
+
+        let allTasksCache = [];
+
         async function showTask(id) {
             currentTaskId = id;
             currentTaskStatus = null;
-            document.getElementById('list-view').classList.add('hidden');
-            document.getElementById('detail-view').classList.add('active');
             document.getElementById('detail-task-id').textContent = id;
-            if (id === 'onako-main') {
+            if (isDesktop()) {
+                document.getElementById('detail-view').classList.add('active');
+                document.querySelectorAll('.task-item').forEach(el => el.classList.remove('selected'));
+                document.querySelectorAll('.task-item').forEach(el => {
+                    if (el.onclick && el.getAttribute('onclick')?.includes(id)) {
+                        el.classList.add('selected');
+                    }
+                });
+            } else {
+                document.getElementById('list-view').classList.add('hidden');
+                document.getElementById('detail-view').classList.add('active');
+            }
+            // Check if task is already done
+            const taskData = allTasksCache.find(t => t.id === id);
+            if (taskData && taskData.status === 'done') {
+                currentTaskStatus = 'done';
                 document.getElementById('interrupt-btn').classList.add('hidden');
                 document.getElementById('kill-btn').classList.add('hidden');
+                document.getElementById('resume-detail-btn').classList.toggle('hidden', !taskData.claude_session_id);
             } else {
                 document.getElementById('interrupt-btn').classList.remove('hidden');
                 document.getElementById('kill-btn').classList.remove('hidden');
+                document.getElementById('resume-detail-btn').classList.add('hidden');
             }
+            if (pollInterval) clearInterval(pollInterval);
             await refreshOutput();
-            pollInterval = setInterval(refreshOutput, 3000);
+            if (currentTaskStatus !== 'done') {
+                pollInterval = setInterval(refreshOutput, 3000);
+            }
         }
 
         async function refreshOutput() {
@@ -335,7 +557,11 @@
                 const data = await res.json();
                 const el = document.getElementById('output');
                 const wasAtBottom = el.scrollHeight - el.scrollTop - el.clientHeight < 50;
-                el.textContent = data.output || '(no output yet)';
+                if (data.output) {
+                    el.innerHTML = renderOutput(data.output);
+                } else {
+                    el.textContent = '(no output yet)';
+                }
                 if (wasAtBottom) el.scrollTop = el.scrollHeight;
                 showConnectionError(false);
 
@@ -344,10 +570,12 @@
                     currentTaskStatus = 'done';
                     document.getElementById('interrupt-btn').classList.add('hidden');
                     document.getElementById('kill-btn').classList.add('hidden');
+                    document.getElementById('resume-detail-btn').classList.toggle('hidden', !data.claude_session_id);
                     if (pollInterval) {
                         clearInterval(pollInterval);
                         pollInterval = null;
                     }
+                    loadTasks();
                 }
             } catch (e) {
                 showConnectionError(true);
@@ -359,8 +587,13 @@
             currentTaskStatus = null;
             if (pollInterval) clearInterval(pollInterval);
             pollInterval = null;
-            document.getElementById('detail-view').classList.remove('active');
-            document.getElementById('list-view').classList.remove('hidden');
+            if (isDesktop()) {
+                document.getElementById('detail-view').classList.remove('active');
+                document.querySelectorAll('.task-item').forEach(el => el.classList.remove('selected'));
+            } else {
+                document.getElementById('detail-view').classList.remove('active');
+                document.getElementById('list-view').classList.remove('hidden');
+            }
             loadTasks();
         }
 
@@ -393,17 +626,39 @@
             if (!currentTaskId) return;
             if (!confirm('Kill this task?')) return;
             try {
-                await fetch(`${API}/tasks/${currentTaskId}`, {method: 'DELETE'});
+                const res = await fetch(`${API}/tasks/${currentTaskId}`, {method: 'DELETE'});
+                if (!res.ok) {
+                    const data = await res.json().catch(() => ({}));
+                    alert(data.detail || 'Failed to kill task');
+                    return;
+                }
                 showList();
             } catch (e) {
                 showConnectionError(true);
             }
         }
 
+        async function resumeTask(taskId) {
+            try {
+                const res = await fetch(`${API}/tasks/${taskId}/resume`, {method: 'POST'});
+                if (!res.ok) {
+                    const data = await res.json().catch(() => ({}));
+                    alert(data.detail || 'Failed to resume task');
+                    return;
+                }
+                const newTask = await res.json();
+                await loadTasks();
+                showTask(newTask.id);
+            } catch (e) {
+                showConnectionError(true);
+            }
+        }
+
         function showModal() {
             document.getElementById('modal').style.display = 'block';
             document.getElementById('modal-overlay').style.display = 'block';
-            document.getElementById('skip-perms-input').checked = skipPermissionsDefault;
+            const saved = localStorage.getItem('skipPermissions');
+            document.getElementById('skip-perms-input').checked = saved !== null ? saved === '1' : skipPermissionsDefault;
             document.getElementById('prompt-input').focus();
         }
 
@@ -417,6 +672,7 @@
             if (!prompt) return;
             const workdir = document.getElementById('workdir-input').value.trim() || null;
             const skipPerms = document.getElementById('skip-perms-input').checked;
+            localStorage.setItem('skipPermissions', skipPerms ? '1' : '0');
             const body = {prompt, skip_permissions: skipPerms};
             if (workdir) body.working_dir = workdir;
             try {
@@ -429,6 +685,7 @@
                 document.getElementById('prompt-input').value = '';
                 document.getElementById('workdir-input').value = '';
                 hideModal();
+                await loadTasks();
                 showTask(task.id);
             } catch (e) {
                 showConnectionError(true);
@@ -441,6 +698,110 @@
             return d.innerHTML;
         }
 
+        // --- ANSI-to-HTML converter ---
+        const ANSI_FG = [
+            '#555','#ff5555','#50fa7b','#f1fa8c','#bd93f9','#ff79c6','#8be9fd','#f8f8f2',
+            '#6272a4','#ff6e6e','#69ff94','#ffffa5','#d6acff','#ff92df','#a4ffff','#ffffff',
+        ];
+
+        function color256(n) {
+            if (n < 16) return ANSI_FG[n] || '#e0e0e0';
+            if (n < 232) {
+                n -= 16;
+                const r = Math.floor(n / 36) * 51;
+                const g = Math.floor((n % 36) / 6) * 51;
+                const b = (n % 6) * 51;
+                return `rgb(${r},${g},${b})`;
+            }
+            const v = (n - 232) * 10 + 8;
+            return `rgb(${v},${v},${v})`;
+        }
+
+        function ansiToHtml(text) {
+            text = text.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+            const parts = text.split(/(\x1b\[[\d;]*[a-zA-Z])/);
+            let result = '';
+            let state = {};
+            for (const part of parts) {
+                const m = part.match(/^\x1b\[([\d;]*)m$/);
+                if (m) {
+                    const codes = m[1] ? m[1].split(';').map(Number) : [0];
+                    let i = 0;
+                    while (i < codes.length) {
+                        const c = codes[i];
+                        if (c === 0) state = {};
+                        else if (c === 1) state.bold = true;
+                        else if (c === 2) state.dim = true;
+                        else if (c === 3) state.italic = true;
+                        else if (c === 4) state.underline = true;
+                        else if (c === 22) { delete state.bold; delete state.dim; }
+                        else if (c === 23) delete state.italic;
+                        else if (c === 24) delete state.underline;
+                        else if (c >= 30 && c <= 37) state.fg = ANSI_FG[c - 30];
+                        else if (c >= 90 && c <= 97) state.fg = ANSI_FG[c - 82];
+                        else if (c === 39) delete state.fg;
+                        else if (c >= 40 && c <= 47) state.bg = ANSI_FG[c - 40];
+                        else if (c >= 100 && c <= 107) state.bg = ANSI_FG[c - 92];
+                        else if (c === 49) delete state.bg;
+                        else if (c === 38 && codes[i+1] === 5) { state.fg = color256(codes[i+2] || 0); i += 2; }
+                        else if (c === 38 && codes[i+1] === 2) { state.fg = `rgb(${codes[i+2]||0},${codes[i+3]||0},${codes[i+4]||0})`; i += 4; }
+                        else if (c === 48 && codes[i+1] === 5) { state.bg = color256(codes[i+2] || 0); i += 2; }
+                        else if (c === 48 && codes[i+1] === 2) { state.bg = `rgb(${codes[i+2]||0},${codes[i+3]||0},${codes[i+4]||0})`; i += 4; }
+                        i++;
+                    }
+                } else if (part.match(/^\x1b\[/)) {
+                    // non-SGR ANSI sequence — skip
+                } else if (part) {
+                    const s = [];
+                    if (state.bold) s.push('font-weight:bold');
+                    if (state.dim) s.push('opacity:0.6');
+                    if (state.italic) s.push('font-style:italic');
+                    if (state.underline) s.push('text-decoration:underline');
+                    if (state.fg) s.push('color:' + state.fg);
+                    if (state.bg) s.push('background:' + state.bg);
+                    result += s.length ? `<span style="${s.join(';')}">${part}</span>` : part;
+                }
+            }
+            return result;
+        }
+
+        // --- Block parser (user prompts vs claude responses) ---
+        const ANSI_STRIP_RE = /\x1b\[[\d;]*[a-zA-Z]/g;
+
+        function parseBlocks(text) {
+            const lines = text.split('\n');
+            const blocks = [];
+            let cur = null;
+            for (const line of lines) {
+                const stripped = line.replace(ANSI_STRIP_RE, '').trimStart();
+                if (stripped.startsWith('›') || stripped.startsWith('❯')) {
+                    if (cur) blocks.push(cur);
+                    cur = { type: 'user', lines: [line] };
+                } else if (stripped.startsWith('●') || stripped.startsWith('⏺')) {
+                    if (cur) blocks.push(cur);
+                    cur = { type: 'claude', lines: [line] };
+                } else if (cur) {
+                    cur.lines.push(line);
+                } else {
+                    if (!blocks.length || blocks[blocks.length - 1].type !== 'plain') {
+                        blocks.push({ type: 'plain', lines: [] });
+                    }
+                    blocks[blocks.length - 1].lines.push(line);
+                }
+            }
+            if (cur) blocks.push(cur);
+            return blocks;
+        }
+
+        function renderOutput(text) {
+            const blocks = parseBlocks(text);
+            return blocks.map(b => {
+                const html = ansiToHtml(b.lines.join('\n'));
+                const cls = b.type === 'user' ? 'block-user' : b.type === 'claude' ? 'block-claude' : 'block-plain';
+                return `<div class="output-block ${cls}">${html}</div>`;
+            }).join('');
+        }
+
         // Event listeners
         document.getElementById('new-task-btn').addEventListener('click', showModal);
         document.getElementById('modal-overlay').addEventListener('click', hideModal);
@@ -448,6 +809,9 @@
         document.getElementById('back-btn').addEventListener('click', showList);
         document.getElementById('interrupt-btn').addEventListener('click', interruptTask);
         document.getElementById('kill-btn').addEventListener('click', killTask);
+        document.getElementById('resume-detail-btn').addEventListener('click', () => {
+            if (currentTaskId) resumeTask(currentTaskId);
+        });
         document.getElementById('send-btn').addEventListener('click', sendMessage);
         document.getElementById('message-input').addEventListener('keydown', e => {
             if (e.key === 'Enter') sendMessage();
@@ -456,10 +820,18 @@
             if ((e.metaKey || e.ctrlKey) && e.key === 'Enter') submitTask();
         });
 
+        document.getElementById('search-input').addEventListener('input', loadTasks);
+        document.getElementById('sort-select').addEventListener('change', () => {
+            localStorage.setItem('onakoSort', document.getElementById('sort-select').value);
+            loadTasks();
+        });
+
         // Init
+        const savedSort = localStorage.getItem('onakoSort');
+        if (savedSort) document.getElementById('sort-select').value = savedSort;
         loadConfig();
         loadTasks();
-        setInterval(() => { if (!currentTaskId) loadTasks(); }, 10000);
+        setInterval(() => { if (!currentTaskId || isDesktop()) loadTasks(); }, 10000);
     </script>
 </body>
 </html>

onako/tmux_orchestrator.py

@@ -3,6 +3,7 @@ import secrets
 import shlex
 import sqlite3
 import subprocess
+import uuid
 from datetime import datetime, timezone
 from pathlib import Path
 
@@ -16,6 +17,7 @@ class TmuxOrchestrator:
         self.db_path = db_path or DB_PATH
         self.tasks: dict[str, dict] = {}
         self._window_ids: dict[str, str] = {}  # window_name -> @id
+        self._last_content_length: dict[str, int] = {}  # window_name -> pane content length
         self._init_db()
         self._load_tasks()
         self._ensure_session()
@@ -46,20 +48,26 @@ class TmuxOrchestrator:
                 prompt TEXT,
                 status TEXT,
                 started_at TEXT,
-                origin TEXT DEFAULT 'managed'
+                origin TEXT DEFAULT 'managed',
+                last_activity TEXT,
+                claude_session_id TEXT
             )
         """)
-        # Migrate existing DBs that lack the origin column
+        # Migrate existing DBs that lack newer columns
         cursor = conn.execute("PRAGMA table_info(tasks)")
         columns = [row[1] for row in cursor.fetchall()]
         if "origin" not in columns:
             conn.execute("ALTER TABLE tasks ADD COLUMN origin TEXT DEFAULT 'managed'")
+        if "last_activity" not in columns:
+            conn.execute("ALTER TABLE tasks ADD COLUMN last_activity TEXT")
+        if "claude_session_id" not in columns:
+            conn.execute("ALTER TABLE tasks ADD COLUMN claude_session_id TEXT")
         conn.commit()
         conn.close()
 
     def _load_tasks(self):
         conn = sqlite3.connect(self.db_path)
-        rows = conn.execute("SELECT id, prompt, status, started_at, origin FROM tasks").fetchall()
+        rows = conn.execute("SELECT id, prompt, status, started_at, origin, last_activity, claude_session_id FROM tasks").fetchall()
         conn.close()
         for row in rows:
             self.tasks[row[0]] = {
@@ -68,13 +76,15 @@ class TmuxOrchestrator:
                 "status": row[2],
                 "started_at": row[3],
                 "origin": row[4] or "managed",
+                "last_activity": row[5],
+                "claude_session_id": row[6],
             }
 
     def _save_task(self, task: dict):
         conn = sqlite3.connect(self.db_path)
         conn.execute(
-            "INSERT OR REPLACE INTO tasks (id, prompt, status, started_at, origin) VALUES (?, ?, ?, ?, ?)",
-            (task["id"], task["prompt"], task["status"], task["started_at"], task.get("origin", "managed")),
+            "INSERT OR REPLACE INTO tasks (id, prompt, status, started_at, origin, last_activity, claude_session_id) VALUES (?, ?, ?, ?, ?, ?, ?)",
+            (task["id"], task["prompt"], task["status"], task["started_at"], task.get("origin", "managed"), task.get("last_activity"), task.get("claude_session_id")),
         )
         conn.commit()
         conn.close()
@@ -89,7 +99,7 @@ class TmuxOrchestrator:
             return window_id
         return f"{self.session_name}:{task_id}"
 
-    def create_task(self, command: str, working_dir: str | None = None, prompt: str | None = None) -> dict:
+    def create_task(self, command: str, working_dir: str | None = None, prompt: str | None = None, claude_session_id: str | None = None) -> dict:
         self._ensure_session()
         task_id = f"task-{secrets.token_hex(4)}"
         self._run_tmux(
@@ -112,36 +122,62 @@ class TmuxOrchestrator:
             )
         self._run_tmux(
             "send-keys", "-t", self._task_target(task_id),
-            command, "Enter",
+            "-l", command,
         )
+        self._run_tmux(
+            "send-keys", "-t", self._task_target(task_id),
+            "Enter",
+        )
+        now = datetime.now(timezone.utc).isoformat()
         task = {
             "id": task_id,
             "prompt": prompt or command,
             "status": "running",
-            "started_at": datetime.now(timezone.utc).isoformat(),
+            "started_at": now,
             "origin": "managed",
+            "last_activity": now,
+            "claude_session_id": claude_session_id,
         }
         self.tasks[task_id] = task
         self._save_task(task)
         return task
 
+    def resume_task(self, task_id: str, skip_permissions: bool = False) -> dict:
+        """Resume a done task by its claude_session_id."""
+        task = self.tasks.get(task_id)
+        if not task:
+            raise ValueError("Task not found")
+        if task["status"] == "running":
+            raise ValueError("Task is still running")
+        session_id = task.get("claude_session_id")
+        if not session_id:
+            raise ValueError("Task has no claude_session_id (cannot resume)")
+        cmd = "claude"
+        if skip_permissions:
+            cmd += " --dangerously-skip-permissions"
+        cmd += f" --resume {session_id}"
+        task["status"] = "resumed"
+        self._save_task(task)
+        return self.create_task(cmd, prompt=f"(resumed) {task['prompt']}", claude_session_id=session_id)
+
     def list_tasks(self) -> list[dict]:
         self.rediscover_tasks()
         self._sync_task_status()
         return list(self.tasks.values())
 
+    _ANSI_RE = re.compile(r"\x1b\[[0-9;]*[a-zA-Z]")
+
     def get_output(self, task_id: str) -> str:
         raw = self.get_raw_output(task_id)
-        cleaned = re.sub(r"\x1b\[[0-9;]*[a-zA-Z]", "", raw)
-        return self._strip_claude_chrome(cleaned)
+        return self._strip_claude_chrome(raw)
 
-    @staticmethod
-    def _strip_claude_chrome(text: str) -> str:
+    @classmethod
+    def _strip_claude_chrome(cls, text: str) -> str:
         lines = text.split("\n")
         # Strip from the bottom: Claude Code's TUI draws box-drawing chars,
         # the › prompt, and status lines like "accept edits on..."
         while lines:
-            line = lines[-1].strip()
+            line = cls._ANSI_RE.sub("", lines[-1]).strip()
             if (
                 not line
                 or all(c in "─━╭╮╰╯│┃┌┐└┘├┤┬┴┼╋═║ ›❯▸▶" for c in line)
@@ -159,7 +195,7 @@ class TmuxOrchestrator:
     def get_raw_output(self, task_id: str) -> str:
         result = self._run_tmux(
             "capture-pane", "-t", self._task_target(task_id),
-            "-p", "-S", "-",
+            "-p", "-S", "-", "-e",
         )
         return result.stdout
 
@@ -176,6 +212,14 @@ class TmuxOrchestrator:
     def send_interrupt(self, task_id: str):
         self._run_tmux("send-keys", "-t", self._task_target(task_id), "Escape")
 
+    def window_count(self) -> int:
+        result = self._run_tmux(
+            "list-windows", "-t", self._session_target, "-F", "#{window_name}",
+        )
+        if result.stdout.strip():
+            return len(result.stdout.strip().split("\n"))
+        return 0
+
     def kill_task(self, task_id: str):
         self._run_tmux("kill-window", "-t", self._task_target(task_id))
         if task_id in self.tasks:
@@ -197,6 +241,16 @@ class TmuxOrchestrator:
             if task["status"] == "running" and task_id not in active_windows:
                 task["status"] = "done"
                 self._save_task(task)
+            elif task["status"] == "running" and task_id in active_windows:
+                pane = self._run_tmux(
+                    "capture-pane", "-t", self._task_target(task_id), "-p",
+                )
+                content_len = len(pane.stdout)
+                prev_len = self._last_content_length.get(task_id)
+                self._last_content_length[task_id] = content_len
+                if prev_len is not None and content_len != prev_len:
+                    task["last_activity"] = datetime.now(timezone.utc).isoformat()
+                    self._save_task(task)
 
     def rediscover_tasks(self):
         """Rediscover tasks from existing tmux windows on server restart."""
@@ -212,16 +266,28 @@ class TmuxOrchestrator:
             if window_id:
                 self._window_ids[window_name] = window_id
             if window_name not in self.tasks:
-                is_managed = window_name.startswith("task-")
+                is_managed = window_name.startswith("task-") or window_name == "onako-main"
+                now = datetime.now(timezone.utc).isoformat()
                 task = {
                     "id": window_name,
                     "prompt": "(rediscovered)" if is_managed else window_name,
                     "status": "running",
                     "started_at": None,
                     "origin": "managed" if is_managed else "external",
+                    "last_activity": now,
                 }
                 self.tasks[window_name] = task
                 self._save_task(task)
-            elif self.tasks[window_name]["status"] == "done":
-                self.tasks[window_name]["status"] = "running"
-                self._save_task(self.tasks[window_name])
+            else:
+                changed = False
+                if self.tasks[window_name]["status"] == "done":
+                    self.tasks[window_name]["status"] = "running"
+                    changed = True
+                if window_name == "onako-main" and self.tasks[window_name]["origin"] == "external":
+                    self.tasks[window_name]["origin"] = "managed"
+                    changed = True
+                if not self.tasks[window_name].get("last_activity"):
+                    self.tasks[window_name]["last_activity"] = datetime.now(timezone.utc).isoformat()
+                    changed = True
+                if changed:
+                    self._save_task(self.tasks[window_name])

{onako-0.4.2.dist-info → onako-0.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onako
-Version: 0.4.2
+Version: 0.4.4
 Summary: Dispatch and monitor Claude Code tasks from your phone
 Author: Amir
 License-Expression: MIT

onako-0.4.4.dist-info/RECORD

@@ -0,0 +1,10 @@
+onako/__init__.py,sha256=6G_giX6Ucuweo7w5OiftoXmbNLoqiU_soXJoU8aiLmY,22
+onako/cli.py,sha256=sQgN07VmqF9yklWQrbEdc1PE7PsI94oAJIELiaJdVfI,10233
+onako/server.py,sha256=UL51fROpjQirh8Rwi9WFRPv9xmITpDKrdD8_xsMNc-8,3420
+onako/tmux_orchestrator.py,sha256=yIgnu8T9CmdW9B91JjWJxA-nX51TmMpaPHRgflKnvs0,11703
+onako/static/index.html,sha256=_966Z2fdyJjF0N_TJdvex1Hyo14HBhmhQI_CVTXUKMo,32637
+onako-0.4.4.dist-info/METADATA,sha256=Uu8bxV-TfTpj7PTdNa5G_psnI4kvIfmwz5XMhVxO30I,2175
+onako-0.4.4.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+onako-0.4.4.dist-info/entry_points.txt,sha256=51KRJzuVpr69iT_k4JO0Lj3DQv_HbgtGjTBTev13JAQ,41
+onako-0.4.4.dist-info/top_level.txt,sha256=EZsc5qq2paM9GTbaFE9Xar4B5wFdfIqK9l_bDQVcmZ4,6
+onako-0.4.4.dist-info/RECORD,,

onako-0.4.2.dist-info/RECORD

@@ -1,10 +0,0 @@
-onako/__init__.py,sha256=6hfVa12Q-nXyUEXr6SyKpqPEDJW6vlRHyPxlA27PfTs,22
-onako/cli.py,sha256=_-dWcf7fVD3QmN6wIzbFLydEVX2pzGs2cKBwP6SZWtY,7932
-onako/server.py,sha256=NfP2CaecxAzuq0tSIaatfYX3d98EuLfhIwK00oHNjro,2883
-onako/tmux_orchestrator.py,sha256=QShgrLf0DtYrgXq3a4FxLIBCnq_CZ6skNNuiXcHQvCk,8461
-onako/static/index.html,sha256=ioombLZg8uhVHL64saB50ikYBUYNDgw5yClA-QoNxEo,16802
-onako-0.4.2.dist-info/METADATA,sha256=1v84RX4BpHeleN7txOm_R2Vy_zFZ4ccSkEhxpbAtFxo,2175
-onako-0.4.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-onako-0.4.2.dist-info/entry_points.txt,sha256=51KRJzuVpr69iT_k4JO0Lj3DQv_HbgtGjTBTev13JAQ,41
-onako-0.4.2.dist-info/top_level.txt,sha256=EZsc5qq2paM9GTbaFE9Xar4B5wFdfIqK9l_bDQVcmZ4,6
-onako-0.4.2.dist-info/RECORD,,