kankaku-tui 0.4.0 → 0.9.0

package/README.md

@@ -8,6 +8,9 @@ in. Built with [Ink](https://github.com/vadimdemedes/ink) on Node 24. Four
 screens — Dashboard, Tasks, Catalog and Sync — share one tab bar, and each
 has a plain-text subcommand for scripts and cron.
 
+This package lives in the [kankaku monorepo](https://github.com/soyunninja/kankaku),
+under `packages/tui`.
+
 ## Install everything
 
 ```
@@ -33,9 +36,10 @@ The wizard's steps, `enter` to advance and `esc` to go back throughout
    agent schedules removing kankaku from it, not just skipping it. Codex
    and OpenCode are listed but disabled, showing `no adapter yet` (found,
    but kankaku can't write its config) or `not installed` (not found).
-2. **Claude Code** — the `kankaku-claude` checkout path (only shown when
-   Claude Code is checked and not already configured), guessed from any
-   existing `statusLine`.
+2. **Claude Code** — the `kankaku-claude` checkout path (packages/claude
+   inside a kankaku monorepo checkout; only shown when Claude Code is
+   checked and not already configured), guessed from any existing
+   `statusLine`.
 3. **Hub** — `use an existing hub` (URL, email, masked password, a `c`
    inline health check, reusing the current credentials as the default),
    `install locally`, or `skip`. Installing locally looks for a
@@ -172,7 +176,11 @@ Commands (macOS and Linux only — PocketBase ships no other build):
   — installs (or, run again, verifies) the hub and leaves it running. On
   a real terminal, a missing owner email/password is prompted for
   (masked); without a TTY, both flags are required. Idempotent: re-running
-  with everything already in place changes nothing.
+  with everything already in place changes nothing. If another process
+  already answers on the target port, `install`/`start`/`upgrade` refuse
+  with `port <N> is already in use by another process — pass --port <N>
+  or stop it` instead of provisioning accounts against it; pass a
+  different `--port` or free the port and retry.
 - `kankaku hub start` / `kankaku hub stop` — start or stop the server
   process; `stop` is a no-op when it isn't running.
 - `kankaku hub status` — `local hub: running 0.2.0 (PocketBase 0.40.4) at

package/dist/adapters/hub-manager/install.js

@@ -7,7 +7,7 @@
  * injected (`HubManagerDeps`) so tests never touch the network, spawn a
  * real PocketBase, or run a real script.
  */
-import { chmodSync, cpSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { chmodSync, cpSync, existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { assetKeyFor, classifyStatus, generatePassword, hubLayout, parseHubConfig, serveArgs, } from "../../domain/local-hub-model.js";
 import { locateHubPackage } from "./package.js";
@@ -45,6 +45,64 @@ function copyAppFiles(packageDir, appDir) {
 function baseUrlFor(port) {
     return `http://127.0.0.1:${port}`;
 }
+/** `hub.log`'s lines, oldest first, `[]` when unreadable or empty. Shared by `hubLogs` (public, by line count) and `healthFailureDetail` (the last line only). */
+function readLogLines(layout) {
+    if (!existsSync(layout.logFile))
+        return [];
+    const content = readFileSync(layout.logFile, "utf8");
+    const lines = content.split("\n");
+    if (lines.length > 0 && lines[lines.length - 1] === "")
+        lines.pop();
+    return lines;
+}
+function portInUseMessage(port) {
+    return `port ${port} is already in use by another process — pass --port <N> or stop it`;
+}
+/**
+ * Before spawning: if `GET /api/health` on `port` answers at all (ok or
+ * not — any response means something is already listening), the port is
+ * held by a process that is not ours. Callers only reach this once they
+ * have already established that no pid of ours is alive, so any response
+ * here means a foreign process. Returns the detail message to report, or
+ * `undefined` when the port is free.
+ */
+async function ensurePortFree(port, deps) {
+    try {
+        await deps.fetch(`${baseUrlFor(port)}/api/health`);
+        return portInUseMessage(port);
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * Spawns the hub detached and waits for it to become healthy, stopping
+ * immediately (rather than waiting out the full timeout) if the process
+ * dies first. On an early exit, removes the pid file it just wrote so a
+ * dead process is never left claiming to be running.
+ */
+async function spawnAndAwaitHealth(layout, appVersion, port, deps) {
+    const pid = deps.startDetached(layout.binary, serveArgs(layout, appVersion, port), { logFile: layout.logFile, pidFile: layout.pidFile });
+    const healthy = await waitForHealth(`${baseUrlFor(port)}/api/health`, {
+        fetch: deps.fetch,
+        sleep: deps.sleep,
+        timeoutMs: HEALTH_TIMEOUT_MS,
+        isAlive: () => deps.isAlive(pid),
+    });
+    if (healthy)
+        return { pid, healthy: true, exitedEarly: false };
+    const exitedEarly = !deps.isAlive(pid);
+    if (exitedEarly && existsSync(layout.pidFile))
+        unlinkSync(layout.pidFile);
+    return { pid, healthy: false, exitedEarly };
+}
+/** The error detail for a failed `spawnAndAwaitHealth`: the last `hub.log` line when the process exited early and one is readable, otherwise a plain timeout message. */
+function healthFailureDetail(layout, exitedEarly) {
+    if (!exitedEarly)
+        return "the local hub did not become healthy within 20s";
+    const lastLine = readLogLines(layout).at(-1);
+    return lastLine ? `the hub exited during startup: ${lastLine}` : "the hub exited during startup";
+}
 /**
  * Installs (or, run again, verifies) the local hub under
  * `~/.kankaku/hub`: locates the `kankaku-hub` package, creates the layout
@@ -121,16 +179,23 @@ export async function installHub(options, deps) {
         steps.push({ step: "provision accounts", outcome: "unchanged" });
         return { ok: true, steps, url: baseUrlFor(port) };
     }
+    // Reported as its own step: a hub that cannot start is not an accounts
+    // problem, and the accounts step must never claim to have run.
+    const portConflict = await ensurePortFree(port, deps);
+    if (portConflict) {
+        steps.push({ step: "start hub", outcome: "error", detail: portConflict });
+        return { ok: false, steps };
+    }
     try {
         const superuserPassword = generatePassword(deps.randomBytes);
         await upsertSuperuser(layout.binary, layout.pbData, SUPERUSER_EMAIL, superuserPassword, deps.runner);
-        deps.startDetached(layout.binary, serveArgs(layout, manifest.version, port), { logFile: layout.logFile, pidFile: layout.pidFile });
-        const url = baseUrlFor(port);
-        const healthy = await waitForHealth(`${url}/api/health`, { fetch: deps.fetch, sleep: deps.sleep, timeoutMs: HEALTH_TIMEOUT_MS });
-        if (!healthy) {
-            steps.push({ step: "provision accounts", outcome: "error", detail: "the local hub did not become healthy within 20s" });
+        const spawnResult = await spawnAndAwaitHealth(layout, manifest.version, port, deps);
+        if (!spawnResult.healthy) {
+            steps.push({ step: "start hub", outcome: "error", detail: healthFailureDetail(layout, spawnResult.exitedEarly) });
             return { ok: false, steps };
         }
+        steps.push({ step: "start hub", outcome: "done" });
+        const url = baseUrlFor(port);
         const superuser = { email: SUPERUSER_EMAIL, password: superuserPassword };
         await createUser(url, superuser, { email: options.ownerEmail, password: options.ownerPassword, role: "owner" }, deps.fetch);
         const servicePassword = generatePassword(deps.randomBytes);
@@ -157,13 +222,15 @@ export async function startHub(deps) {
     if (pid !== undefined && isAlive(pid)) {
         return { ok: true, steps: [{ step: "start", outcome: "unchanged", detail: "already running" }], url: baseUrlFor(config.port) };
     }
-    deps.startDetached(layout.binary, serveArgs(layout, config.appVersion, config.port), { logFile: layout.logFile, pidFile: layout.pidFile });
-    const url = baseUrlFor(config.port);
-    const healthy = await waitForHealth(`${url}/api/health`, { fetch: deps.fetch, sleep: deps.sleep, timeoutMs: HEALTH_TIMEOUT_MS });
+    const portConflict = await ensurePortFree(config.port, deps);
+    if (portConflict) {
+        return { ok: false, steps: [{ step: "start", outcome: "error", detail: portConflict }] };
+    }
+    const spawnResult = await spawnAndAwaitHealth(layout, config.appVersion, config.port, deps);
     return {
-        ok: healthy,
-        steps: [{ step: "start", outcome: healthy ? "done" : "error", detail: healthy ? undefined : "did not become healthy within 20s" }],
-        url,
+        ok: spawnResult.healthy,
+        steps: [{ step: "start", outcome: spawnResult.healthy ? "done" : "error", detail: spawnResult.healthy ? undefined : healthFailureDetail(layout, spawnResult.exitedEarly) }],
+        url: baseUrlFor(config.port),
     };
 }
 /** Stops the installed hub via `SIGTERM` (bounded wait, `SIGKILL` as a last resort). A no-op (`unchanged`) when it wasn't running. */
@@ -246,20 +313,19 @@ export async function upgradeHub(deps) {
     writeFileSync(layout.hubJson, JSON.stringify(newConfig, null, 2));
     steps.push({ step: "write hub.json", outcome: "done" });
     await stopProcess(layout.pidFile, { timeoutMs: STOP_TIMEOUT_MS, sleep: deps.sleep });
-    deps.startDetached(layout.binary, serveArgs(layout, newConfig.appVersion, newConfig.port), { logFile: layout.logFile, pidFile: layout.pidFile });
     const url = baseUrlFor(newConfig.port);
-    const healthy = await waitForHealth(`${url}/api/health`, { fetch: deps.fetch, sleep: deps.sleep, timeoutMs: HEALTH_TIMEOUT_MS });
-    steps.push({ step: "restart", outcome: healthy ? "done" : "error", detail: healthy ? undefined : "did not become healthy within 20s" });
-    return { ok: healthy, steps, url };
+    const portConflict = await ensurePortFree(newConfig.port, deps);
+    if (portConflict) {
+        steps.push({ step: "restart", outcome: "error", detail: portConflict });
+        return { ok: false, steps };
+    }
+    const spawnResult = await spawnAndAwaitHealth(layout, newConfig.appVersion, newConfig.port, deps);
+    steps.push({ step: "restart", outcome: spawnResult.healthy ? "done" : "error", detail: spawnResult.healthy ? undefined : healthFailureDetail(layout, spawnResult.exitedEarly) });
+    return { ok: spawnResult.healthy, steps, url };
 }
 /** The last `n` lines of `hub.log`, oldest first; `[]` when the hub has never logged anything. */
 export function hubLogs(n, deps) {
     const layout = hubLayout(deps.homeDir);
-    if (!existsSync(layout.logFile))
-        return [];
-    const content = readFileSync(layout.logFile, "utf8");
-    const lines = content.split("\n");
-    if (lines.length > 0 && lines[lines.length - 1] === "")
-        lines.pop();
+    const lines = readLogLines(layout);
     return lines.slice(Math.max(lines.length - n, 0));
 }

package/dist/adapters/hub-manager/package.js

@@ -1,7 +1,6 @@
 /**
- * Locates the installed `kankaku-hub` npm package (a real dependency —
- * `file:../kankaku-hub-worktrees/npm-package` until the package is
- * published) and reads/validates its `hub-manifest.json`.
+ * Locates the installed `kankaku-hub` npm package (a real registry
+ * dependency) and reads/validates its `hub-manifest.json`.
  */
 import { createRequire } from "node:module";
 import { readFileSync } from "node:fs";

package/dist/adapters/hub-manager/process.js

@@ -87,7 +87,11 @@ export async function stopProcess(pidFile, deps) {
     return killedForcibly ? "killed" : "stopped";
 }
 const HEALTH_POLL_INTERVAL_MS = 500;
-/** Polls `GET url` every 500ms until it responds ok, or `deps.timeoutMs` elapses. Returns whether it became healthy. Never throws. */
+/**
+ * Polls `GET url` every 500ms until it responds ok, `deps.timeoutMs`
+ * elapses, or (when `deps.isAlive` is given) the process dies. Returns
+ * whether it became healthy. Never throws.
+ */
 export async function waitForHealth(url, deps) {
     let elapsedMs = 0;
     for (;;) {
@@ -99,6 +103,8 @@ export async function waitForHealth(url, deps) {
         catch {
             // Not up yet; keep polling until the deadline.
         }
+        if (deps.isAlive && !deps.isAlive())
+            return false;
         if (elapsedMs >= deps.timeoutMs)
             return false;
         await deps.sleep(HEALTH_POLL_INTERVAL_MS);

package/dist/adapters/setup/json-writer.js

@@ -3,8 +3,9 @@
  * atomic tmp+rename, and a one-time `<file>.bak` — mirrors kankaku's own
  * `adapters/project-config.ts#writeProjectTargetIds`.
  */
-import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
+import { chmodSync, existsSync, mkdirSync, readFileSync, renameSync, statSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
+const OWNER_FILE_MODE = 0o600;
 /** Parse `filePath` as a JSON object, defaulting to `{}` on any absence, malformed JSON, or non-object document. Never throws. */
 export function readJsonObjectOrEmpty(filePath) {
     if (!existsSync(filePath))
@@ -19,18 +20,44 @@ export function readJsonObjectOrEmpty(filePath) {
         return {};
     }
 }
+/** Best-effort `chmodSync`; never throws (e.g. a read-only filesystem or an already-gone file). */
+function tightenBestEffort(path) {
+    try {
+        chmodSync(path, OWNER_FILE_MODE);
+    }
+    catch {
+        // Best-effort only.
+    }
+}
 /**
  * Copy `filePath`'s current bytes to `<filePath>.bak`, but only the first
  * time: a no-op when `filePath` does not exist yet (nothing to back up) or
- * `<filePath>.bak` already exists (never overwritten).
+ * `<filePath>.bak` already exists (its content is never overwritten).
+ *
+ * When `filePath` is owner-only (0600, e.g. `~/.kankaku/credentials.json`,
+ * which carries a live hub's service account password), the backup mirrors
+ * that mode instead of the platform's default (umask-derived, typically
+ * world-readable) mode — a previous hub's credentials must never end up
+ * more exposed in the backup than they were in the live file. An existing
+ * `.bak` from before this fix is tightened too, best-effort, whenever a
+ * 0600 source is encountered — mirroring kankaku's own "existing looser
+ * mode is tightened, best-effort, whenever encountered" rule.
  */
 export function backupOnce(filePath) {
     if (!existsSync(filePath))
         return;
     const backupPath = `${filePath}.bak`;
-    if (existsSync(backupPath))
+    const sourceIsOwnerOnly = (statSync(filePath).mode & 0o777) === OWNER_FILE_MODE;
+    if (existsSync(backupPath)) {
+        if (sourceIsOwnerOnly)
+            tightenBestEffort(backupPath);
         return;
-    writeFileSync(backupPath, readFileSync(filePath));
+    }
+    // Created owner-only from the first byte when the source is: a chmod
+    // after the write would leave a window where the secret is readable.
+    writeFileSync(backupPath, readFileSync(filePath), sourceIsOwnerOnly ? { mode: OWNER_FILE_MODE } : {});
+    if (sourceIsOwnerOnly)
+        tightenBestEffort(backupPath);
 }
 /** Write `value` as 2-space-indented JSON to `filePath` via tmp file + rename, creating the parent directory when missing. */
 export function writeJsonAtomic(filePath, value, dirMode) {

package/dist/cli.js

@@ -300,6 +300,7 @@ function buildHubManagerDeps(deps) {
         locatePackage: () => locateHubPackage(),
         platform: process.platform,
         arch: process.arch,
+        isAlive: (pid) => isAlive(pid),
         ...deps.hubManager,
     };
 }

package/dist/domain/setup-wizard.js

@@ -173,7 +173,7 @@ export function next(state, facts) {
             return { ...state, step: claudeStepNeeded(state) ? "claude" : "hub", errors: {} };
         case "claude": {
             if (state.claudeCheckout.trim() === "") {
-                return { ...state, errors: { ...state.errors, claudeCheckout: "enter the kankaku-claude checkout path" } };
+                return { ...state, errors: { ...state.errors, claudeCheckout: "enter the kankaku-claude checkout path (packages/claude in a kankaku checkout)" } };
             }
             return { ...state, step: "hub", errors: clearError(state.errors, "claudeCheckout") };
         }

package/dist/ui/setup/wizard-screen.js

@@ -178,7 +178,7 @@ export function SetupWizard({ facts, actions, onDone, onQuit, version, columns,
     const height = rows ?? stdout?.rows ?? DEFAULT_ROWS;
     const mainWidth = width;
     const mainHeight = Math.max(height - HEADER_ROWS - FOOTER_ROWS, 0);
-    return (_jsxs(Box, { flexDirection: "column", width: width, height: height, children: [_jsx(HeaderBar, { left: `>_ kankaku setup${version ? ` ${version}` : ""}`, width: width }), _jsx(Box, { flexDirection: "column", flexGrow: 1, minHeight: 0, children: _jsxs(Panel, { title: panelTitle(state), width: mainWidth, height: mainHeight, active: true, children: [state.step === "agents" && (_jsx(Checklist, { items: agentChecklistItems(state.agents, state.selected, facts.homeDir), cursor: agentCursor, onToggle: (id) => setState((s) => toggleAgent(s, id)), onMove: (delta) => setAgentCursor((c) => Math.min(Math.max(c + delta, 0), state.agents.length - 1)), focused: true })), state.step === "claude" && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "kankaku-claude checkout path:" }), _jsx(TextInput, { value: state.claudeCheckout, onChange: (value) => setState((s) => setClaudeCheckout(s, value)), focused: true }), state.errors.claudeCheckout && _jsx(Text, { color: theme.error, children: state.errors.claudeCheckout })] })), state.step === "hub" && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Radio, { options: HUB_MODE_OPTIONS, value: state.hub.mode, onChange: (mode) => setState((s) => setHubMode(s, mode)), focused: hubFocus === 0 }), state.hub.mode === "existing" && (_jsxs(Box, { flexDirection: "column", children: [["url", "email", "password"].map((field, index) => (_jsxs(Box, { flexDirection: "row", children: [_jsx(Text, { children: `${field}: ` }), _jsx(TextInput, { value: state.hub[field], onChange: (value) => setState((s) => setHubField(s, field, value)), masked: field === "password", focused: hubFocus === index + 1 })] }, field))), state.errors.url && _jsx(Text, { color: theme.error, children: state.errors.url }), state.errors.email && _jsx(Text, { color: theme.error, children: state.errors.email }), state.errors.password && _jsx(Text, { color: theme.error, children: state.errors.password }), _jsx(Text, { children: `[ check ] c   ${healthLine(state.hub.healthOk, healthChecking)}` })] })), state.hub.mode === "local" && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { dimColor: true, children: `will install and run at http://127.0.0.1:${DEFAULT_HUB_PORT}` }), _jsxs(Box, { flexDirection: "row", children: [_jsx(Text, { children: "owner email: " }), _jsx(TextInput, { value: state.hub.ownerEmail, onChange: (value) => setState((s) => setHubField(s, "ownerEmail", value)), focused: hubFocus === 1 })] }), _jsxs(Box, { flexDirection: "row", children: [_jsx(Text, { children: "owner password: " }), _jsx(TextInput, { value: state.hub.ownerPassword, onChange: (value) => setState((s) => setHubField(s, "ownerPassword", value)), masked: true, focused: hubFocus === 2 })] }), state.errors.ownerEmail && _jsx(Text, { color: theme.error, children: state.errors.ownerEmail }), state.errors.ownerPassword && _jsx(Text, { color: theme.error, children: state.errors.ownerPassword })] }))] })), state.step === "roots" && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "project roots (comma-separated):" }), _jsx(TextInput, { value: rootsText, onChange: (value) => {
+    return (_jsxs(Box, { flexDirection: "column", width: width, height: height, children: [_jsx(HeaderBar, { left: `>_ kankaku setup${version ? ` ${version}` : ""}`, width: width }), _jsx(Box, { flexDirection: "column", flexGrow: 1, minHeight: 0, children: _jsxs(Panel, { title: panelTitle(state), width: mainWidth, height: mainHeight, active: true, children: [state.step === "agents" && (_jsx(Checklist, { items: agentChecklistItems(state.agents, state.selected, facts.homeDir), cursor: agentCursor, onToggle: (id) => setState((s) => toggleAgent(s, id)), onMove: (delta) => setAgentCursor((c) => Math.min(Math.max(c + delta, 0), state.agents.length - 1)), focused: true })), state.step === "claude" && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "kankaku-claude checkout path (packages/claude in a kankaku checkout):" }), _jsx(TextInput, { value: state.claudeCheckout, onChange: (value) => setState((s) => setClaudeCheckout(s, value)), focused: true }), state.errors.claudeCheckout && _jsx(Text, { color: theme.error, children: state.errors.claudeCheckout })] })), state.step === "hub" && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Radio, { options: HUB_MODE_OPTIONS, value: state.hub.mode, onChange: (mode) => setState((s) => setHubMode(s, mode)), focused: hubFocus === 0 }), state.hub.mode === "existing" && (_jsxs(Box, { flexDirection: "column", children: [["url", "email", "password"].map((field, index) => (_jsxs(Box, { flexDirection: "row", children: [_jsx(Text, { children: `${field}: ` }), _jsx(TextInput, { value: state.hub[field], onChange: (value) => setState((s) => setHubField(s, field, value)), masked: field === "password", focused: hubFocus === index + 1 })] }, field))), state.errors.url && _jsx(Text, { color: theme.error, children: state.errors.url }), state.errors.email && _jsx(Text, { color: theme.error, children: state.errors.email }), state.errors.password && _jsx(Text, { color: theme.error, children: state.errors.password }), _jsx(Text, { children: `[ check ] c   ${healthLine(state.hub.healthOk, healthChecking)}` })] })), state.hub.mode === "local" && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { dimColor: true, children: `will install and run at http://127.0.0.1:${DEFAULT_HUB_PORT}` }), _jsxs(Box, { flexDirection: "row", children: [_jsx(Text, { children: "owner email: " }), _jsx(TextInput, { value: state.hub.ownerEmail, onChange: (value) => setState((s) => setHubField(s, "ownerEmail", value)), focused: hubFocus === 1 })] }), _jsxs(Box, { flexDirection: "row", children: [_jsx(Text, { children: "owner password: " }), _jsx(TextInput, { value: state.hub.ownerPassword, onChange: (value) => setState((s) => setHubField(s, "ownerPassword", value)), masked: true, focused: hubFocus === 2 })] }), state.errors.ownerEmail && _jsx(Text, { color: theme.error, children: state.errors.ownerEmail }), state.errors.ownerPassword && _jsx(Text, { color: theme.error, children: state.errors.ownerPassword })] }))] })), state.step === "roots" && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "project roots (comma-separated):" }), _jsx(TextInput, { value: rootsText, onChange: (value) => {
                                         setRootsText(value);
                                         setState((s) => setRoots(s, value));
                                     }, focused: true }), state.errors.roots && _jsx(Text, { color: theme.error, children: state.errors.roots })] })), state.step === "review" && (_jsx(Table, { columns: reviewColumns(mainWidth), rows: state.plan, rowKey: (row) => `${row.kind}-${row.file}`, cell: reviewCell, emptyText: "nothing to change" })), state.step === "apply" && (_jsxs(Box, { flexDirection: "column", children: [state.results.map((result, index) => (_jsx(Text, { children: applyResultLine(result) }, `${result.action.kind}-${index}`))), state.results.length < state.plan.length && _jsx(Text, { dimColor: true, children: "applying\u2026" })] })), state.step === "done" && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: `setup complete: ${state.results.length} change(s) applied` }), _jsx(Text, { dimColor: true, children: "enter open dashboard" })] }))] }) }), _jsx(KeyHints, { hints: hints })] }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kankaku-tui",
-  "version": "0.4.0",
+  "version": "0.9.0",
   "description": "Terminal app that shows today's kankaku work across every project on disk",
   "license": "MIT",
   "type": "module",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "ink": "^7.1.1",
-    "kankaku": "^0.8.2",
+    "kankaku": "^0.9.0",
     "kankaku-hub": "^0.2.0",
     "react": "^19.3.0"
   },
@@ -35,5 +35,10 @@
     "ink-testing-library": "^4",
     "tsx": "^4",
     "typescript": "^5.7.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/soyunninja/kankaku.git",
+    "directory": "packages/tui"
   }
 }

package/dist/ui/today-screen.js

@@ -1,161 +0,0 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { 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 { Layout } from "./layout.js";
-import { Panel } from "./components/panel.js";
-import { Table } from "./components/table.js";
-import { Sparkline } from "./components/sparkline.js";
-import { renderBar } from "./components/bar.js";
-const KEY_HINTS = [
-    { key: "↑↓", label: "move" },
-    { key: "enter", label: "open" },
-    { key: "r", label: "refresh" },
-    { key: "1-4", label: "screens" },
-    { key: "q", label: "quit" },
-];
-/** `HH:MM`, local time, from an ISO timestamp. */
-function formatTime(iso) {
-    const date = new Date(iso);
-    const hours = String(date.getHours()).padStart(2, "0");
-    const minutes = String(date.getMinutes()).padStart(2, "0");
-    return `${hours}:${minutes}`;
-}
-function formatCost(cost) {
-    return `$${cost.toFixed(2)}`;
-}
-/** The header bar's right-hand hub status, or `undefined` when the hub is not configured. */
-function hubHeaderText(hub) {
-    if (hub.status !== "ready")
-        return undefined;
-    const domain = hub.catalog?.url.replace(/^https?:\/\//, "");
-    const domainPart = domain !== undefined ? `${domain} · ` : "";
-    const syncedPart = hub.lastSyncAt !== undefined ? `synced ${formatTime(hub.lastSyncAt)}` : "no sync yet";
-    return `hub ${hub.lastSyncOk ? "●" : "✕"} ${domainPart}${syncedPart}`;
-}
-function TodayPanel({ today, width, height }) {
-    const cacheHitPart = today.cacheHit !== undefined ? `   cache hit ${Math.round(today.cacheHit * 100)}%` : "";
-    return (_jsxs(Panel, { title: "Today", width: width, height: height, children: [_jsx(Text, { children: `work   ${formatMinutes(today.workMs)}` }), _jsx(Text, { children: `wait   ${formatMinutes(today.waitingMs)}   cost  ${formatCost(today.cost)}` }), _jsx(Text, { children: `tasks  ${today.tasks}${cacheHitPart}` })] }));
-}
-function Last7DaysPanel({ points, width, height }) {
-    return (_jsxs(Panel, { title: "Last 7 days", width: width, height: height, children: [_jsxs(Text, { children: ["work  ", _jsx(Sparkline, { values: points.map((point) => point.workMs) }), "   cost  ", _jsx(Sparkline, { values: points.map((point) => point.cost) })] }), _jsx(Text, { dimColor: true, children: points.map((point) => point.weekday).join(" ") })] }));
-}
-/** Combined width of every fixed-width column but `project`, plus their separating spaces, the row's own `› `/`  ` marker prefix, and the panel's own left/right border columns. */
-const PROJECT_FIXED_COLUMNS_WIDTH = 8 + 1 + 7 + 1 + 12 + 1 + 2 + 2;
-/** Floor for the `project` column so a very narrow table still shows a sliver of the name instead of collapsing to nothing. */
-const MIN_PROJECT_NAME_WIDTH = 4;
-/**
- * `work`/`cost`/`share` are fixed-width; `project` absorbs whatever width
- * is left in `panelWidth` (the panel's own outer width, including its
- * border columns) so the row's total text never exceeds the panel's
- * actual content width — which would otherwise wrap inside the
- * fixed-height, `overflow: hidden` panel and corrupt the scrolling
- * window (see the matching fix in `tasks-screen.tsx`).
- */
-function projectColumns(panelWidth) {
-    const nameWidth = Math.max(panelWidth - PROJECT_FIXED_COLUMNS_WIDTH, MIN_PROJECT_NAME_WIDTH);
-    return [
-        { key: "name", header: "project", width: nameWidth },
-        { key: "work", header: "work", width: 8, align: "right" },
-        { key: "cost", header: "cost", width: 7, align: "right" },
-        { key: "share", header: "share", width: 12 },
-    ];
-}
-function projectCell(row, key) {
-    switch (key) {
-        case "name":
-            return row.name;
-        case "work":
-            return formatMinutes(row.workMs);
-        case "cost":
-            return formatCost(row.cost);
-        case "share":
-            return renderBar(row.share, 1, 10);
-        default:
-            return "";
-    }
-}
-function ProjectsPanel({ rows, selectedIndex, width, height, maxRows, active }) {
-    return (_jsx(Panel, { title: "Projects", width: width, height: height, active: active, children: _jsx(Table, { columns: projectColumns(width), rows: rows, rowKey: (row) => row.name, cell: projectCell, selectedIndex: selectedIndex, emptyText: "no work recorded today", maxRows: maxRows }) }));
-}
-function HubPanel({ hub, width, height }) {
-    return (_jsx(Panel, { title: "Hub", width: width, height: height, children: hub.status === "unavailable" ? (_jsx(Text, { dimColor: true, children: "hub not configured" })) : (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: `pending ${hub.pending} · stale ${hub.staleOutsideWindow}` }), _jsx(Text, { children: `last sync ${hub.lastSyncOk ? "ok" : "error"}${hub.lastSyncAt !== undefined ? ` ${formatTime(hub.lastSyncAt)}` : ""}` }), hub.catalog !== undefined && _jsx(Text, { children: `catalog ${hub.catalog.clientCount} clients · ${hub.catalog.projectCount} projects` })] })) }));
-}
-/** Below this main-content width, the two-column grid collapses to one column, stacking every panel. */
-const GRID_BREAKPOINT = 70;
-/** Rows the Today card's panel takes: 1 top border + 3 content lines + 1 bottom border. */
-const TODAY_PANEL_ROWS = 5;
-/** Rows the Last 7 days panel takes: 1 top border + 2 content lines + 1 bottom border. */
-const LAST7_PANEL_ROWS = 4;
-/** Rows the Hub panel takes at most: 1 top border + up to 3 content lines + 1 bottom border. */
-const HUB_PANEL_ROWS = 5;
-/** Rows the Projects panel's own chrome (border + table header) takes outside its data rows. */
-const TABLE_CHROME_ROWS = 3;
-/** How many data rows the Projects table can show for a given `mainHeight`, depending on whether the grid is two columns (`grid`) or stacked to one (`stacked`). */
-function projectsMaxRows(mainHeight, layout) {
-    const fixedRows = layout === "grid" ? TODAY_PANEL_ROWS : TODAY_PANEL_ROWS + LAST7_PANEL_ROWS + HUB_PANEL_ROWS;
-    return Math.max(mainHeight - fixedRows - TABLE_CHROME_ROWS, 1);
-}
-/**
- * The Projects panel's own explicit height for a given `mainHeight`/`layout`
- * — `TABLE_CHROME_ROWS` plus however many data rows `projectsMaxRows`
- * allows, so the panel itself never grows past what its own table renders
- * (see the layout-stability rule this screen's panels all follow).
- */
-function projectsPanelHeight(mainHeight, layout) {
-    return TABLE_CHROME_ROWS + projectsMaxRows(mainHeight, layout);
-}
-function DashboardGrid({ model, selectedIndex, mainWidth, mainHeight, focused, }) {
-    if (mainWidth < GRID_BREAKPOINT) {
-        return (_jsxs(Box, { flexDirection: "column", children: [_jsx(TodayPanel, { today: model.today, width: mainWidth, height: TODAY_PANEL_ROWS }), _jsx(Last7DaysPanel, { points: model.last7Days, width: mainWidth, height: LAST7_PANEL_ROWS }), _jsx(ProjectsPanel, { rows: model.projects, selectedIndex: selectedIndex, width: mainWidth, height: projectsPanelHeight(mainHeight, "stacked"), maxRows: projectsMaxRows(mainHeight, "stacked"), active: focused }), _jsx(HubPanel, { hub: model.hub, width: mainWidth, height: HUB_PANEL_ROWS })] }));
-    }
-    const leftWidth = Math.floor(mainWidth * 0.55);
-    const rightWidth = Math.max(mainWidth - leftWidth - 1, 1);
-    return (_jsxs(Box, { flexDirection: "row", children: [_jsxs(Box, { flexDirection: "column", width: leftWidth, children: [_jsx(TodayPanel, { today: model.today, width: leftWidth, height: TODAY_PANEL_ROWS }), _jsx(ProjectsPanel, { rows: model.projects, selectedIndex: selectedIndex, width: leftWidth, height: projectsPanelHeight(mainHeight, "grid"), maxRows: projectsMaxRows(mainHeight, "grid"), active: focused })] }), _jsx(Box, { width: 1 }), _jsxs(Box, { flexDirection: "column", width: rightWidth, children: [_jsx(Last7DaysPanel, { points: model.last7Days, width: rightWidth, height: LAST7_PANEL_ROWS }), _jsx(HubPanel, { hub: model.hub, width: rightWidth, height: HUB_PANEL_ROWS })] })] }));
-}
-/**
- * The Today screen: a dashboard (Today card, Last 7 days sparklines,
- * Projects table with share bars, Hub card) inside the shared
- * header/sidebar/footer frame. `r` reloads through `load`; `↑↓` move the
- * Projects selection; `enter` opens the selected project in Tasks via
- * `onOpenProject`. Never writes anything to disk.
- */
-export function TodayScreen({ load, roots, version, columns, rows, focused = true, onOpenProject }) {
-    const [model, setModel] = useState(load);
-    const [selected, setSelected] = useState(0);
-    const maxRowsRef = useRef(0);
-    useInput((input, key) => {
-        const lastIndex = Math.max(model.projects.length - 1, 0);
-        if (input === "r") {
-            setModel(load());
-        }
-        else if (key.downArrow) {
-            setSelected((index) => Math.min(index + 1, lastIndex));
-        }
-        else if (key.upArrow) {
-            setSelected((index) => Math.max(index - 1, 0));
-        }
-        else if (key.pageDown) {
-            setSelected((index) => Math.min(index + Math.max(maxRowsRef.current, 1), lastIndex));
-        }
-        else if (key.pageUp) {
-            setSelected((index) => Math.max(index - Math.max(maxRowsRef.current, 1), 0));
-        }
-        else if (key.home) {
-            setSelected(0);
-        }
-        else if (key.end) {
-            setSelected(lastIndex);
-        }
-        else if (key.return) {
-            const project = model.projects[selected];
-            if (project)
-                onOpenProject?.(project.name);
-        }
-    }, { isActive: focused });
-    return (_jsx(Layout, { columns: columns, rows: rows, headerLeft: `>_ kankaku ${version}`, headerRight: hubHeaderText(model.hub), sidebarItems: SCREENS, activeId: "today", sidebarStats: [`roots ${roots.length}`, `projects ${model.projects.length}`], keyHints: hintsFor("today", focused ? "main" : "sidebar", KEY_HINTS), focus: focused ? "main" : "sidebar", children: ({ mainWidth, mainHeight }) => {
-            maxRowsRef.current = projectsMaxRows(mainHeight, mainWidth < GRID_BREAKPOINT ? "stacked" : "grid");
-            return _jsx(DashboardGrid, { model: model, selectedIndex: selected, mainWidth: mainWidth, mainHeight: mainHeight, focused: focused });
-        } }));
-}