taskai-cli 1.8.0__tar.gz → 1.8.1__tar.gz

{taskai_cli-1.8.0 → taskai_cli-1.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: taskai-cli
-Version: 1.8.0
+Version: 1.8.1
 Author-email: Alex Paskal <alexcpaskal@gmail.com>
 Requires-Python: >=3.12
 Requires-Dist: fastapi>=0.141.1

{taskai_cli-1.8.0 → taskai_cli-1.8.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "taskai-cli"
-version = "1.8.0"
+version = "1.8.1"
 description = ""
 authors = [{name = "Alex Paskal", email = "alexcpaskal@gmail.com"}]
 readme = "README.md"

{taskai_cli-1.8.0 → taskai_cli-1.8.1}/taskai/browser.py

@@ -81,6 +81,25 @@ def get_tree():
 
 class CommandRequest(BaseModel):
     input: str
+    # raw filter args from the last `show <attr><op>value ...` the frontend
+    # ran, if any — so a mutation's refreshed tree stays scoped to that view
+    # instead of snapping back to the whole forest
+    filter: str | None = None
+
+
+def _response_tree(filter_str):
+    """The tree a mutation should return: pruned to `filter_str`'s matches
+    (+ their parent chains) when one is active, else the whole forest."""
+    if not filter_str:
+        return _full_tree()
+    tokens = _parse_arg_string(filter_str)
+    if not looks_like_filters(tokens):
+        return _full_tree()
+    try:
+        exprs = parse_filters(tokens)
+    except FilterError:
+        return _full_tree()
+    return _filtered_tree(with_ancestors(db, match_items(db, exprs)))
 
 
 @app.post("/api/command")
@@ -89,7 +108,7 @@ def run_command(request: CommandRequest):
     args, kwargs = _parse_remaining(arg_parts)
 
     if not args:
-        return {"output": "", "tree": _full_tree(), "focus": None}
+        return {"output": "", "tree": _response_tree(request.filter), "focus": None}
 
     if args[0] == "show":
         return _run_show(args)
@@ -101,7 +120,7 @@ def run_command(request: CommandRequest):
     except TaskCLIError:
         pass  # Controller.throw_error() already printed the error into `output`
 
-    return {"output": output.getvalue(), "tree": _full_tree(), "focus": None}
+    return {"output": output.getvalue(), "tree": _response_tree(request.filter), "focus": None}
 
 
 def _run_show(args):

{taskai_cli-1.8.0 → taskai_cli-1.8.1}/taskai/static/canvas.js

@@ -403,7 +403,9 @@ function fitAll(duration = STYLE.zoom.focusDurationMs) {
 
 	const pad = 60; // screen px of breathing room around the content
 	const scale = Math.min(
-		STYLE.zoom.max,
+		// don't auto-zoom in past the focus threshold — a small subset
+		// shouldn't fill the screen; the user can still wheel in past this
+		STYLE.zoom.focusScale,
 		Math.max(
 			STYLE.zoom.min,
 			Math.min(
@@ -741,10 +743,13 @@ canvas.addEventListener("dblclick", (e) => {
 	const rect = canvas.getBoundingClientRect();
 	const { x, y } = screenToWorld(e.clientX - rect.left, e.clientY - rect.top);
 	const clicked = nodes.find(node => hitTest(node, x, y));
+	if (!clicked) return;
 
-	if (clicked) {
-		focusOnNode(clicked);
-	}
+	// single click already selected it; double click also opens the editor
+	selectedNode = clicked;
+	if (typeof onNodeSelected === "function") onNodeSelected(itemForNode(clicked));
+	if (typeof openEditPanel === "function") openEditPanel();
+	focusOnNode(clicked); // after openEditPanel so the ease tracks the narrowed canvas
 })
 
 canvas.addEventListener("mousedown", (e) => {

{taskai_cli-1.8.0 → taskai_cli-1.8.1}/taskai/static/console.js

@@ -29,6 +29,12 @@ function appendLine(text) {
 	consoleScrollback.scrollTop = consoleScrollback.scrollHeight;
 }
 
+// raw filter args from the last `show <attr><op>value ...` query (e.g.
+// `priority>3 status="IN PROGRESS"`), or null. Sent with every /api/command
+// POST so a mutation's refreshed tree stays scoped to the same filtered view.
+// Cleared by `show all` and by navigating to a specific node.
+let activeFilter = null;
+
 const PAN_AMOUNT = 250; // screen pixels per pan command
 const ZOOM_FACTOR = 1.5;
 
@@ -62,10 +68,12 @@ function resolveDotRefs(command) {
 // POST a raw command string to the shared endpoint; returns the parsed
 // { output, tree, focus } (or throws). Callers decide what to echo.
 async function postCommand(input) {
+	const body = { input };
+	if (activeFilter) body.filter = activeFilter;
 	const res = await fetch("/api/command", {
 		method: "POST",
 		headers: { "Content-Type": "application/json" },
-		body: JSON.stringify({ input }),
+		body: JSON.stringify(body),
 	});
 	return res.json();
 }
@@ -82,6 +90,7 @@ async function showAll() {
 		return;
 	}
 	applyTree(tree);
+	activeFilter = null; // `show all` drops any filter
 	selectedNode = rootNode;
 	if (typeof onNodeSelected === "function") onNodeSelected(null);
 	fitAll();
@@ -153,6 +162,7 @@ consoleInput.addEventListener("keydown", async (e) => {
 
 		// `show <attr><op><value> ...` — server returns a pruned tree + a flag
 		if (data.filtered) {
+			activeFilter = target; // remember it so mutations keep this view
 			selectedNode = rootNode;
 			if (typeof onNodeSelected === "function") onNodeSelected(null);
 			fitAll();
@@ -161,6 +171,7 @@ consoleInput.addEventListener("keydown", async (e) => {
 		}
 
 		if (data.focus) {
+			activeFilter = null; // navigated to a specific node — no longer filtered
 			const node = nodes.find(n => n.id === String(data.focus));
 			if (node) {
 				selectedNode = node;
@@ -208,12 +219,7 @@ consoleInput.addEventListener("keydown", async (e) => {
 
 	let data;
 	try {
-		const res = await fetch("/api/command", {
-			method: "POST",
-			headers: { "Content-Type": "application/json" },
-			body: JSON.stringify({ input: command }),
-		});
-		data = await res.json();
+		data = await postCommand(command);
 	} catch (err) {
 		appendLine("Error: " + err.message);
 		return;

{taskai_cli-1.8.0 → taskai_cli-1.8.1}/taskai/static/editpanel.js

@@ -64,12 +64,7 @@ async function sendFieldUpdate(item, def, value) {
 
 	let data;
 	try {
-		const res = await fetch("/api/command", {
-			method: "POST",
-			headers: { "Content-Type": "application/json" },
-			body: JSON.stringify({ input: command }),
-		});
-		data = await res.json();
+		data = await postCommand(command); // carries the active filter, if any
 	} catch (err) {
 		appendLine(`Error updating item ${item.id}: ${err.message}`);
 		return;
@@ -87,12 +82,7 @@ async function sendComment(itemId, text) {
 
 	let data;
 	try {
-		const res = await fetch("/api/command", {
-			method: "POST",
-			headers: { "Content-Type": "application/json" },
-			body: JSON.stringify({ input: command }),
-		});
-		data = await res.json();
+		data = await postCommand(command); // carries the active filter, if any
 	} catch (err) {
 		appendLine(`Error adding comment to item ${itemId}: ${err.message}`);
 		return;

{taskai_cli-1.8.0 → taskai_cli-1.8.1}/taskai/static/shortcuts.js

@@ -31,10 +31,19 @@ function toggleShortcutPanel(force) {
 shortcutToggle.addEventListener("click", () => toggleShortcutPanel());
 
 function toggleEditPanel() {
-	if (editPanel.classList.contains("expanded")) closeEditPanel();
+	if (editPanel.classList.contains("expanded")) closeEditPanelAndRefocus();
 	else openEditPanel();
 }
 
+// close the edit panel, then ease the selected node back to center as the
+// canvas widens out — without this the panel's width animation re-anchors on
+// the old center and leaves the node cut off at the edge
+function closeEditPanelAndRefocus() {
+	closeEditPanel();
+	const node = selectedRealNode();
+	if (node) focusOnNode(node);
+}
+
 // --- action helpers --------------------------------------------------------
 
 // the selected node, or null when the selection is the synthetic root
@@ -69,9 +78,6 @@ function toggleDoneSelected() {
 function deleteSelected() {
 	const node = selectedRealNode();
 	if (!node) return;
-	const item = itemForNode(node);
-	const label = item ? item.name : node.id;
-	if (!window.confirm(`Delete "${label}" and everything under it?`)) return;
 	runMutation(`delete ${node.id}`);
 }
 
@@ -115,6 +121,10 @@ function handleEscape() {
 		el.blur();
 		return;
 	}
+	if (editPanel.classList.contains("expanded")) {
+		closeEditPanelAndRefocus();
+		return;
+	}
 	// deselect, but leave the camera where it is — Esc shouldn't move/zoom
 	selectedNode = rootNode;
 	if (typeof onNodeSelected === "function") onNodeSelected(null);
@@ -130,9 +140,13 @@ const PAN_VEC = { ArrowUp: [0, 1], ArrowDown: [0, -1], ArrowLeft: [1, 0], ArrowR
 const SHORTCUTS = [
 	{ section: "Panels" },
 	{
-		combos: [{ key: "`" }], glyphs: ["`"], desc: "Toggle terminal",
+		combos: [{ key: "`" }, { key: "~" }], glyphs: ["`"], desc: "Terminal (focus / close)",
 		whileTyping: (el) => el === consoleInput, // also closes it from inside
-		run: () => toggleConsole(),
+		run: () => {
+			if (document.activeElement === consoleInput) toggleConsole(false); // close from inside
+			else if (consolePanel.classList.contains("expanded")) consoleInput.focus(); // open but unfocused -> jump in
+			else toggleConsole(true); // closed -> open (focuses input)
+		},
 	},
 	{
 		combos: [{ key: "?" }], glyphs: ["?"], desc: "Toggle this panel",
@@ -185,7 +199,7 @@ const SHORTCUTS = [
 		run: () => toggleDoneSelected(),
 	},
 	{
-		combos: [{ key: "Delete" }], glyphs: ["Del"], desc: "Delete (asks first)",
+		combos: [{ key: "Delete" }], glyphs: ["Del"], desc: "Delete",
 		run: () => deleteSelected(),
 	},
 ];