@brimveyn/aimux 1.2.5 → 1.3.1

package/src/ui/status-bar-model.ts

@@ -1,5 +1,8 @@
+import type { ModeId, ResolvedKeymapConfig } from '@brimveyn/aimux-config'
+
 import type { AppState, TabSession } from '../state/types'
 
+import { buildHintText } from './keymap-context'
 import { abbreviatePath } from './path-format'
 
 export interface StatusBarModel {
@@ -8,6 +11,7 @@ export interface StatusBarModel {
 }
 
 const MAX_TAB_LABEL_LENGTH = 24
+const HINT_LIMIT = 6
 
 function truncateLabel(label: string): string {
   if (label.length <= MAX_TAB_LABEL_LENGTH) {
@@ -25,39 +29,15 @@ function getActiveTabLabel(tab?: TabSession): string {
   return `${truncateLabel(tab.title)} (${tab.status})`
 }
 
-function getNavigationHint(activeTab?: TabSession): string {
-  if (!activeTab) {
-    return 'Ctrl+g sessions  Ctrl+n new  Ctrl+b toggle  Ctrl+h/l resize  ? help'
-  }
-
-  if (activeTab.status === 'disconnected') {
-    return 'Ctrl+r restart restored tab  Ctrl+w close  i focus'
-  }
-
-  return 'Ctrl+g sessions  j/k move  Shift+J/K reorder  Ctrl+r restart  Ctrl+w close  i focus  ? help'
-}
-
-function getInputHint(activeTab?: TabSession): string {
-  if (!activeTab) {
-    return 'Ctrl+n new  no active tab to focus'
-  }
-
-  if (activeTab.status === 'disconnected') {
-    return 'Ctrl+z unfocus  Ctrl+w layout  Ctrl+r restart'
-  }
-
-  return 'Ctrl+z unfocus  Ctrl+w layout  typing goes to active tab'
+function hintForMode(config: ResolvedKeymapConfig, modeId: ModeId): string {
+  return buildHintText(config, modeId, HINT_LIMIT)
 }
 
-function getGitHint(modalType: AppState['modal']['type']): string {
-  if (modalType === 'git-commit') {
-    return 'Tab switch field  Enter newline  Ctrl+Enter commit  Esc cancel'
-  }
-
-  return 'j/k file  Ctrl+d/u page  a stage  d unstage/delete  c commit  p push  Esc exit'
-}
-
-export function getStatusBarModel(state: AppState, activeTab?: TabSession): StatusBarModel {
+export function getStatusBarModel(
+  state: AppState,
+  activeTab: TabSession | undefined,
+  config: ResolvedKeymapConfig
+): StatusBarModel {
   const currentSession = state.currentSessionId
     ? state.sessions.find((session) => session.id === state.currentSessionId)
     : undefined
@@ -73,33 +53,81 @@ export function getStatusBarModel(state: AppState, activeTab?: TabSession): Stat
     case 'terminal-input':
       return {
         left: `${getActiveTabLabel(activeTab)}  ${sessionIcon}  ${sessionLabel}`,
-        right: getInputHint(activeTab),
+        right: hintForMode(config, 'terminal-input'),
       }
-    case 'modal':
+    case 'modal': {
+      const modalMode = deriveModalModeId(state.modal.type)
       return {
         left: `${sessionIcon}  ${sessionLabel}`,
-        right: 'j/k move  Enter confirm  n/r/d actions  Esc cancel',
+        right: modalMode ? hintForMode(config, modalMode) : '',
       }
+    }
     case 'layout':
       return {
         left: `${getActiveTabLabel(activeTab)}  ${sessionIcon}  ${sessionLabel}`,
-        right: 'h/j/k/l focus  |/- split  H/L resize  q close  Esc cancel',
+        right: hintForMode(config, 'layout'),
       }
     case 'git':
       return {
         left: `${sessionIcon}  ${sessionLabel}`,
-        right: getGitHint(state.modal.type),
+        right: hintForMode(config, 'git-mode'),
       }
-    case 'command-edit':
+    case 'command-edit': {
+      const commandEditMode = deriveCommandEditModeId(state.modal.type)
       return {
         left: `${sessionIcon}  ${sessionLabel}`,
-        right: state.modal.type === 'git-commit' ? getGitHint('git-commit') : 'Esc cancel',
+        right: commandEditMode ? hintForMode(config, commandEditMode) : '',
       }
+    }
     case 'navigation':
     default:
       return {
         left: `${sessionIcon}  ${sessionLabel}  ${getActiveTabLabel(activeTab)}`,
-        right: getNavigationHint(activeTab),
+        right: hintForMode(config, 'navigation'),
       }
   }
 }
+
+function deriveModalModeId(modalType: AppState['modal']['type']): ModeId | null {
+  switch (modalType) {
+    case 'help':
+      return 'modal.help'
+    case 'new-tab':
+      return 'modal.new-tab'
+    case 'session-picker':
+      return 'modal.session-picker'
+    case 'snippet-picker':
+      return 'modal.snippet-picker'
+    case 'split-picker':
+      return 'modal.split-picker'
+    case 'theme-picker':
+      return 'modal.theme-picker'
+    case 'update-available':
+      return 'modal.update-available'
+    default:
+      return null
+  }
+}
+
+function deriveCommandEditModeId(modalType: AppState['modal']['type']): ModeId | null {
+  switch (modalType) {
+    case 'create-session':
+      return 'modal.create-session'
+    case 'git-commit':
+      return 'modal.git-commit'
+    case 'new-tab':
+      return 'modal.new-tab.command-edit'
+    case 'rename-tab':
+      return 'modal.rename-tab'
+    case 'session-name':
+      return 'modal.session-name'
+    case 'session-picker':
+      return 'modal.session-picker.filtering'
+    case 'snippet-editor':
+      return 'modal.snippet-editor'
+    case 'snippet-picker':
+      return 'modal.snippet-picker.filtering'
+    default:
+      return null
+  }
+}

package/src/update/version-check.ts

@@ -0,0 +1,67 @@
+import { logDebug } from '../debug/input-log'
+
+const NPM_REGISTRY_BASE = 'https://registry.npmjs.org'
+
+export async function getCurrentPackageVersion(): Promise<string> {
+  const { version } = await import('../../package.json')
+  return version
+}
+
+export async function fetchLatestNpmVersion(packageName: string): Promise<string | null> {
+  const debugOverride = process.env.AIMUX_DEBUG_UPDATE_LATEST
+  if (debugOverride) {
+    return debugOverride
+  }
+
+  try {
+    const url = `${NPM_REGISTRY_BASE}/${encodeURIComponent(packageName).replace('%40', '@')}/latest`
+    const controller = new AbortController()
+    const timer = setTimeout(() => controller.abort(), 5_000)
+    const res = await fetch(url, { signal: controller.signal })
+    clearTimeout(timer)
+    if (!res.ok) {
+      logDebug('update.fetchLatest.nonOk', { packageName, status: res.status })
+      return null
+    }
+    const data = (await res.json()) as { version?: unknown }
+    if (typeof data.version !== 'string' || data.version.length === 0) {
+      return null
+    }
+    return data.version
+  } catch (error) {
+    logDebug('update.fetchLatest.error', {
+      error: error instanceof Error ? error.message : String(error),
+      packageName,
+    })
+    return null
+  }
+}
+
+function parseSemver(version: string): number[] | null {
+  const trimmed = version.trim().replace(/^v/, '')
+  const core = trimmed.split(/[-+]/)[0] ?? ''
+  const parts = core.split('.')
+  if (parts.length === 0) return null
+  const numeric: number[] = []
+  for (const part of parts) {
+    const n = Number.parseInt(part, 10)
+    if (!Number.isFinite(n) || n < 0) return null
+    numeric.push(n)
+  }
+  return numeric
+}
+
+export function isNewerVersion(latest: string, current: string): boolean {
+  const a = parseSemver(latest)
+  const b = parseSemver(current)
+  if (!a || !b) return false
+
+  const len = Math.max(a.length, b.length)
+  for (let i = 0; i < len; i++) {
+    const av = a[i] ?? 0
+    const bv = b[i] ?? 0
+    if (av > bv) return true
+    if (av < bv) return false
+  }
+  return false
+}

package/src/update.ts

@@ -1,5 +1,5 @@
 import { getDaemonSocketPath } from './daemon/runtime-paths'
-import { findDaemonPid } from './platform/daemon-control'
+import { findIpcDaemonPid } from './platform/daemon-control'
 import { runRestartDaemon } from './restart-daemon'
 
 const REPO = 'BrimVeyn/aimux'
@@ -52,9 +52,9 @@ export async function runUpdate(): Promise<number> {
 
   process.stdout.write(`Updated to ${latest}.\n`)
 
-  const pid = await findDaemonPid(getDaemonSocketPath())
+  const pid = await findIpcDaemonPid()
   if (pid !== null) {
-    process.stdout.write('Restarting daemon...\n')
+    process.stdout.write(`Restarting IPC daemon at ${getDaemonSocketPath()}...\n`)
     await runRestartDaemon()
   }