@ohzw/worktree-command-tui 0.1.4 → 0.1.6

package/dist/core/session-store.js

@@ -1,26 +1,41 @@
 import { mkdir, readFile, rm, stat, writeFile } from 'node:fs/promises';
 import path from 'node:path';
-const MAX_SESSION_BYTES = 16 * 1024;
 function isSafeProcessId(value) {
     return typeof value === 'number' && Number.isInteger(value) && value > 1;
 }
-function isValidPort(value) {
+function isSafePort(value) {
     return typeof value === 'number' && Number.isInteger(value) && value > 0 && value <= 65535;
 }
-function isSessionRecord(value) {
+function normalizeSessionRecordPorts(port, ports) {
+    if (ports !== undefined && ports.length > 0) {
+        return ports;
+    }
+    if (port !== undefined) {
+        return [port];
+    }
+    return [];
+}
+function parseSessionRecord(value) {
     if (typeof value !== 'object' || value === null) {
-        return false;
+        return null;
     }
     const record = value;
-    return (typeof record.namespace === 'string' &&
-        typeof record.worktreePath === 'string' &&
-        typeof record.branch === 'string' &&
-        isSafeProcessId(record.pid) &&
-        isSafeProcessId(record.pgid) &&
-        isValidPort(record.port) &&
-        typeof record.logPath === 'string' &&
-        typeof record.startedAt === 'string');
+    const parsedPorts = normalizeSessionRecordPorts(record.port, Array.isArray(record.ports) ? record.ports : undefined);
+    if (typeof record.namespace !== 'string' ||
+        typeof record.worktreePath !== 'string' ||
+        typeof record.branch !== 'string' ||
+        !isSafeProcessId(record.pgid) ||
+        !isSafeProcessId(record.pid) ||
+        !isSafePort(record.port) ||
+        !parsedPorts.every(isSafePort) ||
+        parsedPorts.length === 0 ||
+        typeof record.logPath !== 'string' ||
+        typeof record.startedAt !== 'string') {
+        return null;
+    }
+    return { ...record, ports: parsedPorts };
 }
+const MAX_SESSION_BYTES = 16 * 1024;
 export function getSessionPaths(gitCommonDir, namespace) {
     const baseDir = path.join(gitCommonDir, 'worktree-command-tui');
     return {
@@ -42,8 +57,8 @@ export async function readSessionRecord(paths, { isSessionAlive }) {
         if (source === null) {
             return null;
         }
-        const parsed = JSON.parse(source);
-        if (!isSessionRecord(parsed)) {
+        const parsed = parseSessionRecord(JSON.parse(source));
+        if (parsed === null) {
             await rm(paths.sessionFile, { force: true });
             return null;
         }
@@ -59,7 +74,10 @@ export async function readSessionRecord(paths, { isSessionAlive }) {
 }
 export async function writeSessionRecord(paths, record) {
     await mkdir(paths.baseDir, { recursive: true });
-    await writeFile(paths.sessionFile, JSON.stringify(record, null, 2));
+    await writeFile(paths.sessionFile, JSON.stringify({
+        ...record,
+        ports: record.ports ?? [record.port],
+    }, null, 2));
 }
 export async function clearSessionRecord(paths) {
     await rm(paths.sessionFile, { force: true });

package/dist/core/tui-interaction.d.ts

@@ -26,6 +26,7 @@ export interface AsyncInteractionState {
 export declare function getNextSelectedPath(rows: readonly AppRow[], currentPath: string | null): string | null;
 export declare function getSelectedIndex(rows: readonly AppRow[], selectedPath: string | null): number;
 export declare function clampSelectionIndex(nextIndex: number, rowCount: number): number | null;
+export declare function wrapSelectionIndex(nextIndex: number, rowCount: number): number | null;
 export declare function decideEnterInteraction(selected: AppRow | undefined, activePath: string | null): EnterInteractionDecision;
 export declare function decideSetupInteraction(selected: AppRow | undefined, setupAvailable: boolean): SetupInteractionDecision;
 export declare function shouldApplyAsyncResult(state: AsyncInteractionState): boolean;

package/dist/core/tui-interaction.js

@@ -20,6 +20,12 @@ export function clampSelectionIndex(nextIndex, rowCount) {
     }
     return Math.min(Math.max(nextIndex, 0), rowCount - 1);
 }
+export function wrapSelectionIndex(nextIndex, rowCount) {
+    if (rowCount <= 0) {
+        return null;
+    }
+    return ((nextIndex % rowCount) + rowCount) % rowCount;
+}
 export function decideEnterInteraction(selected, activePath) {
     if (selected === undefined) {
         return { kind: 'ignore' };

package/dist/core/worktree-projection.d.ts

@@ -41,6 +41,14 @@ export type UpstreamProjection = {
     ahead: number;
     behind: number;
 };
+export type HeadCommitProjection = {
+    kind: 'unavailable';
+} | {
+    kind: 'found';
+    hash?: string;
+    message?: string;
+    label: string;
+};
 export type WorkingTreePartKind = 'staged' | 'unstaged' | 'untracked' | 'conflicts';
 export type WorkingTreeProjection = {
     kind: 'unavailable';
@@ -68,6 +76,7 @@ export type PullRequestProjection = {
 };
 export declare function sanitizeInlineText(value: string): string;
 export declare function projectWorktreeListRow(row: AppRow, isSelected: boolean): WorktreeListRowProjection;
+export declare function projectHeadCommit(row: AppRow): HeadCommitProjection;
 export declare function getOrderedNonActiveTags(tags: readonly string[]): TagProjection[];
 export declare function projectAction(row: AppRow, activePath: string | null): ActionProjection;
 export declare function projectNote(row: AppRow): NoteProjection;

package/dist/core/worktree-projection.js

@@ -43,6 +43,19 @@ export function projectWorktreeListRow(row, isSelected) {
         isMain: hasTag(row, 'main'),
     };
 }
+export function projectHeadCommit(row) {
+    const hash = sanitizeInlineText(row.headSha ?? '');
+    const message = sanitizeInlineText(row.headCommit?.message ?? '');
+    if (hash.length === 0 && message.length === 0) {
+        return { kind: 'unavailable' };
+    }
+    return {
+        kind: 'found',
+        hash: hash.length === 0 ? undefined : hash,
+        message: message.length === 0 ? undefined : message,
+        label: [hash, message].filter(part => part.length > 0).join(' '),
+    };
+}
 export function getOrderedNonActiveTags(tags) {
     return tags
         .filter(tag => tag !== 'active')

package/dist/main.js

@@ -6,8 +6,9 @@ import { sanitizeInlineText } from './core/worktree-projection.js';
 import { ThemeProvider } from '@inkjs/ui';
 import { render } from 'ink';
 import { APP_RENDER_OPTIONS } from './render-options.js';
-import { App } from './app.js';
+import { App, RESIZE_DEBOUNCE_MS } from './app.js';
 import { buildActions, buildInitialModel } from './core/runtime.js';
+import { debounceResizeListeners } from './core/debounced-resize.js';
 import { appTheme } from './ui-theme.js';
 const cwd = process.cwd();
 const args = process.argv.slice(2);
@@ -66,31 +67,22 @@ if (subcommand !== undefined) {
     console.error(`Unknown command: ${sanitizeInlineText(subcommand)}`);
     process.exit(1);
 }
+let restoreStdoutResize = () => { };
 try {
     const [initialModel, actions] = await Promise.all([buildInitialModel(cwd), buildActions(cwd)]);
     const createApp = () => (_jsx(ThemeProvider, { theme: appTheme, children: _jsx(App, { initialModel: initialModel, actions: actions }) }));
+    if (process.stdout.isTTY) {
+        restoreStdoutResize = debounceResizeListeners(process.stdout, RESIZE_DEBOUNCE_MS);
+    }
     const instance = render(createApp(), APP_RENDER_OPTIONS);
-    let repaintTimer;
-    const repaintAfterResize = () => {
-        // Give Ink/useWindowSize one tick to observe the new size, then force a fresh root render.
-        if (repaintTimer) {
-            clearTimeout(repaintTimer);
-        }
-        repaintTimer = setTimeout(() => {
-            instance.rerender(createApp());
-        }, 25);
-    };
     if (process.stdout.isTTY) {
-        process.stdout.on('resize', repaintAfterResize);
         void instance.waitUntilExit().finally(() => {
-            if (repaintTimer) {
-                clearTimeout(repaintTimer);
-            }
-            process.stdout.off('resize', repaintAfterResize);
+            restoreStdoutResize();
         });
     }
 }
 catch (error) {
+    restoreStdoutResize();
     console.error(sanitizeInlineText(describeError(error)));
     process.exit(1);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohzw/worktree-command-tui",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "A TUI for managing git worktrees",
   "private": false,
   "type": "module",