kankaku 1.0.2 → 1.2.0

package/dist/ui/tasks-screen.js

@@ -1,9 +1,12 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useMemo, useRef, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
 import { Box, Text, useInput } from "ink";
 import { formatMinutes } from "../domain/today-model.js";
 import { SCREENS, hintsFor } from "../domain/nav-model.js";
 import { wrapText } from "../domain/text-wrap.js";
+import { NOT_ON_HUB, describeAssignment, eligibleForBulk } from "../domain/reassign-model.js";
+import { advance, back, finishApplying, jumpSelection, moveSelection, openPicker, pickerHints, pickerRowCount } from "../domain/reassign-picker.js";
+import { ReassignPanel, pickerMaxRows } from "./reassign-panel.js";
 import { Layout } from "./layout.js";
 import { Panel } from "./components/panel.js";
 import { Table } from "./components/table.js";
@@ -63,7 +66,7 @@ const DETAIL_CHROME_ROWS = 2;
  * `muted` `… N more lines` line instead of letting Ink's own overflow
  * clipping silently swallow the rest with no visible cue.
  */
-function DetailPanel({ row, width, height }) {
+function DetailPanel({ row, hub, width, height }) {
     const theme = useTheme();
     if (row === undefined) {
         return (_jsx(Panel, { title: "Task", width: width, height: height, children: _jsx(Text, { dimColor: true, children: "no task selected" }) }));
@@ -77,6 +80,8 @@ function DetailPanel({ row, width, height }) {
         metaLines.push({ text: `project  ${row.projectName}`, dim: true });
     if (row.hubTaskTitle !== undefined)
         metaLines.push({ text: `task     ${row.hubTaskTitle}`, dim: true });
+    if (hub !== undefined)
+        metaLines.push({ text: `hub      ${hub}`, dim: true });
     metaLines.push({ text: `wall ${formatMinutes(row.wallMs)}   work ${formatMinutes(row.workMs)}   wait ${formatMinutes(row.waitingMs)}`, dim: false });
     metaLines.push({ text: `cost ${formatCost(row.cost)}${row.cacheHit !== undefined ? `   cache hit ${Math.round(row.cacheHit * 100)}%` : ""}`, dim: false });
     metaLines.push({ text: `subagents ${row.subagentCount}`, dim: false });
@@ -86,38 +91,186 @@ function DetailPanel({ row, width, height }) {
     const visiblePromptLines = truncated ? wrappedPrompt.slice(0, Math.max(promptBudget - 1, 0)) : wrappedPrompt.slice(0, promptBudget);
     const hiddenCount = wrappedPrompt.length - visiblePromptLines.length;
     const showIndicator = truncated && promptBudget > 0;
-    return (_jsx(Panel, { title: "Task", width: width, height: height, children: _jsxs(Box, { flexDirection: "column", children: [visiblePromptLines.map((line, index) => (_jsx(Text, { children: line }, `prompt-${index}`))), showIndicator && _jsx(Text, { color: theme.muted, children: `… ${hiddenCount} more lines` }), metaLines.map((line, index) => (_jsx(Text, { dimColor: line.dim, children: line.text }, `meta-${index}`)))] }) }));
+    return (_jsx(Panel, { title: "Task", width: width, height: height, children: _jsxs(Box, { flexDirection: "column", children: [visiblePromptLines.map((line, index) => (_jsx(Text, { children: line }, `prompt-${index}`))), showIndicator && _jsx(Text, { color: theme.muted, children: `… ${hiddenCount} more lines` }), metaLines.map((line, index) => (_jsx(Text, { dimColor: line.dim, wrap: "truncate-end", children: line.text }, `meta-${index}`)))] }) }));
 }
 const KEY_HINTS = [
     { key: "↑↓", label: "select" },
     { key: "a", label: "today/all" },
+    { key: "m", label: "move" },
+    { key: "M", label: "move all" },
     { key: "r", label: "refresh" },
-    { key: "esc", label: "clear filter" },
     { key: "1-4", label: "screens" },
     { key: "q", label: "quit" },
 ];
+/** With a project filter set, `esc` clears it; listed only then, so the footer stays on one line in narrower terminals. */
+const FILTERED_KEY_HINTS = [...KEY_HINTS.slice(0, 5), { key: "esc", label: "clear filter" }, ...KEY_HINTS.slice(5)];
 /** Below this main-content width, the detail panel stacks under the table instead of beside it. */
 const DETAIL_BREAKPOINT = 70;
 /** Rows the `Panel` chrome (top border line + bottom border line) and the `Table`'s own header line take, outside its data rows. */
 const TABLE_CHROME_ROWS = 3;
+/** Footer messages of the reassignment flow. */
+const ASKING_HUB = "asking the hub…";
+const REASSIGN_UNAVAILABLE = "reassignment is not available: no hub connection in this session";
+const NOTHING_UNASSIGNED = "no unassigned tasks on the hub in this view";
+function toTarget(row) {
+    return { taskId: row.id, label: row.prompt };
+}
 /**
  * The Tasks screen: a table of tasks (via `domain/tasks-model.ts`, never
  * reimplemented here) with a `[ Task ]` detail panel for the selected row.
  * `a` toggles today/all, `r` reloads, `↑↓` move the selection. When
  * `projectFilter` is set (via Today's `enter`), the table is restricted to
- * that project and `esc` clears it through `onClearFilter`. Never writes
- * anything to disk.
+ * that project and `esc` clears it through `onClearFilter`.
+ *
+ * `m` moves (reassigns) the selected task on the hub and `M` every task of the
+ * current view that is unassigned there: the screen asks the hub for the
+ * rows involved (`reassign.prepare`, a progress message in the footer
+ * meanwhile), then opens the picker (`domain/reassign-picker.ts`) as a
+ * panel over the content zone. The picker is a modal flow: while it is
+ * open (or the hub is being asked) every other key of the screen is inert.
+ * Nothing is written to disk; the hub is written only by `reassign.apply`,
+ * after the review step.
  */
-export function TasksScreen({ load, roots, version, columns, rows, focused = true, projectFilter, onClearFilter }) {
+export function TasksScreen({ load, roots, version, columns, rows, focused = true, projectFilter, onClearFilter, reassign, onModalChange }) {
     const allRef = useRef(false);
     const [all, setAll] = useState(false);
     const [model, setModel] = useState(() => load({ all: false }));
     const [selected, setSelected] = useState(0);
+    const [picker, setPickerState] = useState(undefined);
+    const pickerRef = useRef(undefined);
+    const [asking, setAsking] = useState(false);
+    const askingRef = useRef(false);
+    const [note, setNote] = useState(undefined);
+    /** The hub's assignment (by names) for the tasks asked about in this session, keyed by kankaku task id. */
+    const [hubAssignments, setHubAssignments] = useState({});
     const visibleRows = useMemo(() => (projectFilter !== undefined ? model.rows.filter((row) => row.project === projectFilter) : model.rows), [model.rows, projectFilter]);
     const maxRowsRef = useRef(0);
+    const pickerRowsRef = useRef(1);
+    const setPicker = (next) => {
+        pickerRef.current = next;
+        setPickerState(next);
+    };
+    const modalOpen = asking || picker !== undefined;
+    useEffect(() => {
+        onModalChange?.(modalOpen);
+    }, [modalOpen]);
+    const rememberHubRows = (found, catalog) => {
+        setHubAssignments((current) => {
+            const next = { ...current };
+            for (const [taskId, hubRow] of found)
+                next[taskId] = describeAssignment(hubRow, catalog);
+            return next;
+        });
+    };
+    const startReassign = (mode) => {
+        if (reassign === undefined) {
+            setNote(REASSIGN_UNAVAILABLE);
+            return;
+        }
+        const chosen = mode === "single" ? [visibleRows[Math.min(selected, Math.max(visibleRows.length - 1, 0))]] : visibleRows;
+        const targets = chosen.filter((row) => row !== undefined).map(toTarget);
+        if (targets.length === 0) {
+            setNote("no tasks to reassign");
+            return;
+        }
+        askingRef.current = true;
+        setAsking(true);
+        setNote(ASKING_HUB);
+        void reassign
+            .prepare(targets.map((target) => target.taskId))
+            .then((prepared) => {
+            if (!prepared.ok) {
+                setNote(prepared.message);
+                return;
+            }
+            rememberHubRows(prepared.rows, prepared.catalog);
+            if (mode === "single" && !prepared.rows.has(targets[0].taskId)) {
+                setNote(NOT_ON_HUB);
+                return;
+            }
+            if (mode === "bulk" && eligibleForBulk(targets, prepared.rows, prepared.catalog).length === 0) {
+                setNote(NOTHING_UNASSIGNED);
+                return;
+            }
+            setNote(undefined);
+            setPicker(openPicker({ mode, catalog: prepared.catalog, targets, rows: prepared.rows }));
+        })
+            .catch((error) => setNote(error instanceof Error ? error.message : String(error)))
+            .finally(() => {
+            askingRef.current = false;
+            setAsking(false);
+        });
+    };
+    const startApply = (state) => {
+        const plan = state.plan;
+        if (reassign === undefined || plan === undefined || !plan.ok)
+            return;
+        const settle = (outcomes) => {
+            const current = pickerRef.current ?? state;
+            setPicker(finishApplying(current, outcomes));
+            setHubAssignments((assignments) => {
+                const next = { ...assignments };
+                for (const line of plan.plan.lines) {
+                    if (line.kind === "reassign" && outcomes.some((outcome) => outcome.taskId === line.taskId && outcome.status === "reassigned"))
+                        next[line.taskId] = line.to;
+                }
+                return next;
+            });
+        };
+        void reassign.apply(plan.plan).then(settle, (error) => {
+            const reason = error instanceof Error ? error.message : String(error);
+            settle(plan.plan.lines.filter((line) => line.kind === "reassign").map((line) => ({ taskId: line.taskId, status: "failed", reason })));
+        });
+    };
+    const handlePickerKey = (current, key) => {
+        if (current.step === "applying")
+            return;
+        const page = Math.max(pickerRowsRef.current, 1);
+        if (key.escape || key.leftArrow) {
+            setPicker(back(current));
+        }
+        else if (key.return) {
+            const next = advance(current);
+            setPicker(next);
+            if (next !== undefined && next.step === "applying" && current.step === "review")
+                startApply(next);
+        }
+        else if (key.downArrow) {
+            setPicker(moveSelection(current, 1));
+        }
+        else if (key.upArrow) {
+            setPicker(moveSelection(current, -1));
+        }
+        else if (key.pageDown) {
+            setPicker(moveSelection(current, page));
+        }
+        else if (key.pageUp) {
+            setPicker(moveSelection(current, -page));
+        }
+        else if (key.home) {
+            setPicker(jumpSelection(current, "first"));
+        }
+        else if (key.end) {
+            setPicker(jumpSelection(current, "last"));
+        }
+    };
     useInput((input, key) => {
+        if (askingRef.current)
+            return;
+        setNote(undefined);
+        const openPickerState = pickerRef.current;
+        if (openPickerState !== undefined) {
+            handlePickerKey(openPickerState, key);
+            return;
+        }
         const lastIndex = Math.max(visibleRows.length - 1, 0);
-        if (input === "a") {
+        if (input === "m") {
+            startReassign("single");
+        }
+        else if (input === "M") {
+            startReassign("bulk");
+        }
+        else if (input === "a") {
             const nextAll = !allRef.current;
             allRef.current = nextAll;
             setAll(nextAll);
@@ -149,7 +302,11 @@ export function TasksScreen({ load, roots, version, columns, rows, focused = tru
             onClearFilter?.();
         }
     }, { isActive: focused });
-    return (_jsx(Layout, { columns: columns, rows: rows, headerLeft: `>_ kankaku ${version}`, headerRight: projectFilter !== undefined ? `filtered: ${projectFilter}` : undefined, sidebarItems: SCREENS, activeId: "tasks", sidebarStats: [`tasks ${visibleRows.length}`, all ? "scope all" : "scope today"], keyHints: hintsFor("tasks", focused ? "main" : "sidebar", KEY_HINTS), focus: focused ? "main" : "sidebar", children: ({ mainWidth, mainHeight }) => {
+    return (_jsx(Layout, { columns: columns, rows: rows, headerLeft: `>_ kankaku ${version}`, headerRight: projectFilter !== undefined ? `filtered: ${projectFilter}` : undefined, sidebarItems: SCREENS, activeId: "tasks", sidebarStats: [`tasks ${visibleRows.length}`, all ? "scope all" : "scope today"], keyHints: picker !== undefined ? pickerHints(picker) : hintsFor("tasks", focused ? "main" : "sidebar", projectFilter !== undefined ? FILTERED_KEY_HINTS : KEY_HINTS), ...(note !== undefined ? { footerNote: note } : {}), focus: focused ? "main" : "sidebar", children: ({ mainWidth, mainHeight }) => {
+            if (picker !== undefined) {
+                pickerRowsRef.current = pickerMaxRows(mainHeight);
+                return _jsx(ReassignPanel, { state: picker, width: mainWidth, height: mainHeight });
+            }
             const wide = mainWidth >= DETAIL_BREAKPOINT;
             const tableWidth = wide ? Math.floor(mainWidth * 0.62) : mainWidth;
             const detailWidth = wide ? Math.max(mainWidth - tableWidth - 1, 1) : mainWidth;
@@ -160,7 +317,7 @@ export function TasksScreen({ load, roots, version, columns, rows, focused = tru
             const maxRows = Math.max(tableHeight - TABLE_CHROME_ROWS, 1);
             maxRowsRef.current = maxRows;
             const table = (_jsx(Panel, { title: "Tasks", width: tableWidth, height: wide ? mainHeight : tableHeight, active: focused, children: _jsx(Table, { columns: taskColumns(tableWidth), rows: visibleRows, rowKey: (row) => row.id, cell: taskCell, selectedIndex: selected, emptyText: "no tasks", maxRows: maxRows }) }));
-            const detail = _jsx(DetailPanel, { row: selectedRow, width: detailWidth, height: detailHeight });
+            const detail = _jsx(DetailPanel, { row: selectedRow, hub: selectedRow !== undefined ? hubAssignments[selectedRow.id] : undefined, width: detailWidth, height: detailHeight });
             return wide ? (_jsxs(Box, { flexDirection: "row", children: [table, _jsx(Box, { width: 1 }), detail] })) : (_jsxs(Box, { flexDirection: "column", children: [table, detail] }));
         } }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kankaku",
-  "version": "1.0.2",
+  "version": "1.2.0",
   "description": "Terminal app that shows today's kankaku work across every project on disk",
   "keywords": [
     "pi-package",
@@ -38,8 +38,8 @@
   },
   "dependencies": {
     "ink": "^7.1.1",
-    "kankaku-pi": "^1.0.2",
-    "kankaku-claude": "^1.0.2",
+    "kankaku-pi": "^1.2.0",
+    "kankaku-claude": "^1.2.0",
     "kankaku-hub": "^0.2.0",
     "react": "^19.3.0"
   },

package/vendor/kankaku-pi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kankaku-pi",
-  "version": "1.0.2",
+  "version": "1.2.0",
   "description": "pi extension that records agent work time per prompt, excluding waits for the user, with subagent linkage and task/session views",
   "license": "MIT",
   "author": "soyunninja",
@@ -58,8 +58,8 @@
     "prepublishOnly": "npm run check"
   },
   "devDependencies": {
-    "@earendil-works/pi-coding-agent": "0.85.1",
-    "@earendil-works/pi-tui": "^0.85.1",
+    "@earendil-works/pi-coding-agent": "0.87.1",
+    "@earendil-works/pi-tui": "^0.87.1",
     "@types/node": "^24.13.4",
     "typescript": "^5.7.0"
   }