@xp266/dshtui 0.1.2 → 0.1.4

package/bin/dshtui.js

@@ -4,54 +4,133 @@
  * carries this TUI, equivalent to `dsh --profile <profile> [args...]`.
  *
  * The dsh CLI's subcommands are hardcoded upstream, so the command lives in
- * this package's bin instead. The profile defaults to `dshtui` and can be
- * overridden with DSH_TUI_PROFILE. On first run (profile directory absent)
- * the profile is bootstrapped from the published package version, which is
- * also the version the profile later upgrades through `dsh plugin add`.
+ * this package's bin. Profile resolution: DSH_TUI_PROFILE overrides; else the
+ * `dshtui` profile when it exists; else the one profile that already mounts
+ * this package (an existing profile carries the user's session history —
+ * bootstrapping a fresh one would hide it); else the `dshtui` profile is
+ * bootstrapped. Before an install or upgrade, the profile's
+ * minimumReleaseAgeExclude gains this package's name so pnpm's
+ * supply-chain age policy never rejects freshly published releases.
  *
  * This file must stay free of lib/ imports so it works from a global
  * install, a profile copy, and a dev checkout alike.
  */
 import { spawn, spawnSync } from 'node:child_process'
-import { existsSync, readFileSync } from 'node:fs'
+import { existsSync, readFileSync, readdirSync, writeFileSync } from 'node:fs'
 import { homedir } from 'node:os'
 import { dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
 const packageRoot = dirname(dirname(fileURLToPath(import.meta.url)))
 const manifest = JSON.parse(readFileSync(join(packageRoot, 'package.json'), 'utf8'))
-const profile = process.env.DSH_TUI_PROFILE ?? 'dshtui'
+const packageName = manifest.name
+const windows = process.platform === 'win32'
 const dshHome = process.env.DSH_HOME ?? join(homedir(), '.dsh')
-const profileDir = join(dshHome, 'profiles', profile)
+const profilesDir = join(dshHome, 'profiles')
 
 function fail(message) {
   console.error(`dshtui: ${message}`)
   process.exit(1)
 }
 
+const quote = arg => /^[A-Za-z0-9_@%+=:,./-]+$/.test(arg) ? arg : `"${arg.replaceAll('"', '\\"')}"`
 // Windows resolves `dsh` through a .cmd shim, which only spawns with a
-// shell; the command line is built as one quoted string there because
-// passing an args array alongside shell:true is deprecated (DEP0190).
-const windows = process.platform === 'win32'
-const dshProbe = spawnSync('dsh', ['--version'], { stdio: 'ignore', shell: windows })
-if (dshProbe.error !== undefined) {
+// shell; the command line is one quoted string there because passing an
+// args array alongside shell:true is deprecated (DEP0190).
+function runDsh(args) {
+  return windows
+    ? spawnSync(['dsh', ...args].map(quote).join(' '), { stdio: 'inherit', shell: true })
+    : spawnSync('dsh', args, { stdio: 'inherit' })
+}
+
+function readJson(path) {
+  try {
+    return JSON.parse(readFileSync(path, 'utf8'))
+  } catch {
+    return undefined
+  }
+}
+
+function profileMountsPackage(profileDir) {
+  const profileManifest = readJson(join(profileDir, 'package.json'))
+  if (profileManifest === undefined) return false
+  const bundles = profileManifest?.dsh?.profile?.bundles ?? []
+  if (bundles.includes(packageName)) return true
+  return packageName in (profileManifest.dependencies ?? {})
+}
+
+function installedVersion(profileDir) {
+  return readJson(join(profileDir, 'node_modules', packageName, 'package.json'))?.version
+}
+
+function versionLessThan(installed, wanted) {
+  const core = version => version.split('-')[0].split('.').map(Number)
+  const [a, b] = [core(installed), core(wanted)]
+  for (let index = 0; index < 3; index++) {
+    if ((a[index] ?? 0) !== (b[index] ?? 0)) return (a[index] ?? 0) < (b[index] ?? 0)
+  }
+  return false
+}
+
+function ensureReleaseAgeExclude(profileDir) {
+  // The exclude matches the bare package name, so every version of this
+  // package bypasses the age policy while the rest of the tree stays
+  // protected by it.
+  const workspaceFile = join(profileDir, 'pnpm-workspace.yaml')
+  let content = ''
+  try {
+    content = readFileSync(workspaceFile, 'utf8')
+  } catch {
+    return
+  }
+  if (new RegExp(`- ['"]?${packageName.replace('/', '\\/')}['"]?\\s*$`, 'm').test(content)) return
+  const line = `  - '${packageName}'`
+  content = /^minimumReleaseAgeExclude:\s*$/m.test(content)
+    ? content.replace(/^minimumReleaseAgeExclude:\s*$/m, `minimumReleaseAgeExclude:\n${line}`)
+    : `${content.trimEnd()}\nminimumReleaseAgeExclude:\n${line}\n`
+  writeFileSync(workspaceFile, content)
+}
+
+function resolveProfile() {
+  const override = process.env.DSH_TUI_PROFILE
+  if (override !== undefined) return override
+  if (profileMountsPackage(join(profilesDir, 'dshtui'))) return 'dshtui'
+  const candidates = existsSync(profilesDir)
+    ? readdirSync(profilesDir).filter(name => name !== 'node_modules' && profileMountsPackage(join(profilesDir, name)))
+    : []
+  if (candidates.length === 1) return candidates[0]
+  if (candidates.length > 1) {
+    fail(`multiple profiles mount ${packageName} (${candidates.join(', ')}); pick one with DSH_TUI_PROFILE=<name>`)
+  }
+  return 'dshtui'
+}
+
+const profile = resolveProfile()
+const profileDir = join(profilesDir, profile)
+const dshProbe = runDsh(['--version'])
+if (dshProbe.error !== undefined || dshProbe.status !== 0) {
   fail('the dsh CLI was not found on PATH; install it with: npm install -g @deepseek-ai/dsh')
 }
 
 if (!existsSync(profileDir)) {
-  console.error(`dshtui: profile "${profile}" not found under ${join(dshHome, 'profiles')}; installing ${manifest.name}@${manifest.version} into it`)
-  const bootstrap = spawnSync(
-    'dsh',
-    ['plugin', '--profile', profile, 'add', `${manifest.name}@${manifest.version}`],
-    { stdio: 'inherit', shell: process.platform === 'win32' },
-  )
+  console.error(`dshtui: profile "${profile}" not found under ${profilesDir}; installing ${packageName}@${manifest.version} into it`)
+  const bootstrap = runDsh(['plugin', '--profile', profile, 'add', `${packageName}@${manifest.version}`])
   if (bootstrap.status !== 0) {
-    fail(`bootstrapping the profile failed; create it manually with: dsh plugin --profile ${profile} add ${manifest.name}`)
+    fail(`bootstrapping the profile failed; run manually: dsh plugin --profile ${profile} add ${packageName}`)
+  }
+} else {
+  const installed = installedVersion(profileDir)
+  if (installed !== undefined && versionLessThan(installed, manifest.version)) {
+    ensureReleaseAgeExclude(profileDir)
+    console.error(`dshtui: upgrading profile "${profile}": ${packageName} ${installed} -> ${manifest.version}`)
+    const upgrade = runDsh(['plugin', '--profile', profile, 'add', `${packageName}@${manifest.version}`])
+    if (upgrade.status !== 0) {
+      fail(`the upgrade failed; run manually: dsh plugin --profile ${profile} add ${packageName}@${manifest.version}`)
+    }
   }
 }
 
 const argv = process.argv.slice(2)
-const quote = arg => /^[A-Za-z0-9_@%+=:,./-]+$/.test(arg) ? arg : `"${arg.replaceAll('"', '\\"')}"`
 const command = ['dsh', '--profile', profile, ...argv].map(quote).join(' ')
 const child = spawn(windows ? command : 'dsh', windows ? [] : ['--profile', profile, ...argv], {
   stdio: 'inherit',

package/lib/index.mjs

@@ -7193,6 +7193,14 @@ function sessionTime(session) {
 * (one log read, then persisted), never a repeated full read.
 */
 async function computeSessionList(ctx) {
+	try {
+		return await computeSessionListInner(ctx);
+	} catch (error$2) {
+		error("boot", `session list failed: ${error$2 instanceof Error ? error$2.message : String(error$2)}`);
+		throw error$2;
+	}
+}
+async function computeSessionListInner(ctx) {
 	const workspacePaths = collectWorkspacePaths(ctx);
 	const archived = collectArchivedIds(ctx);
 	const summaries = [];
@@ -10497,12 +10505,12 @@ async function createChatBridge(ctx) {
 		currentEffort,
 		effortName,
 		selectEffort,
-		permissionMode: () => permission()?.current(activeAgent.session.snapshotEvents()) ?? PERMISSION_PRESETS[0],
+		permissionMode: () => permission()?.current(activeAgent.session) ?? PERMISSION_PRESETS[0],
 		cyclePermission: () => {
 			const service = permission();
 			if (service === void 0) return;
 			try {
-				const current = service.current(activeAgent.session.snapshotEvents());
+				const current = service.current(activeAgent.session);
 				const names = service.names.length > 0 ? service.names : PERMISSION_PRESETS;
 				const next = names[(names.indexOf(current) + 1) % names.length];
 				service.set(activeAgent.session, next);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xp266/dshtui",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "type": "module",
   "description": "ink-based terminal UI plugin for DeepSeek Harness",
   "engines": {

package/src/chat/bridge.ts

@@ -46,7 +46,7 @@ import { applyTheme } from '../apply-theme.ts'
 import { THEME_SETTINGS_NAMESPACE } from '../theme-settings.ts'
 import { themeMode } from '../theme.ts'
 import type { ThemeMode } from '../theme.ts'
-import { warn } from '../log.ts'
+import { error as logError, warn } from '../log.ts'
 
 interface AttachmentsServiceLike {
   saveImage(input: { data: Uint8Array; mediaType: string; name?: string }): Promise<ImageAttachmentRef>
@@ -143,7 +143,7 @@ interface PresetSessionLike {
 export const PERMISSION_PRESETS = ['workspace-write', 'danger-full-access', 'read-only'] as const
 
 interface PermissionPresetsLike {
-  current(events: readonly SessionEvent[]): string
+  current(session: Session): string
   set(session: Session, name: string): void
   readonly names: readonly string[]
   readonly defaultPreset: string
@@ -1040,12 +1040,12 @@ export async function createChatBridge(ctx: Context): Promise<ChatBridge> {
     currentEffort,
     effortName,
     selectEffort,
-    permissionMode: () => permission()?.current(activeAgent.session.snapshotEvents()) ?? PERMISSION_PRESETS[0],
+    permissionMode: () => permission()?.current(activeAgent.session) ?? PERMISSION_PRESETS[0],
     cyclePermission: () => {
       const service = permission()
       if (service === undefined) return
       try {
-        const current = service.current(activeAgent.session.snapshotEvents())
+        const current = service.current(activeAgent.session)
         const names = service.names.length > 0 ? service.names : PERMISSION_PRESETS
         const index = names.indexOf(current)
         const next = names[(index + 1) % names.length]

package/src/chat/session-list.ts

@@ -2,6 +2,7 @@ import { stat } from 'node:fs/promises'
 import type { Context } from '@deepseek-ai/cordis'
 import type { SessionEvent } from '@deepseek-ai/dsh-session'
 import { textFromBlocks } from './blocks.ts'
+import { error as logError } from '../log.ts'
 import { isBlankSession } from './presets.ts'
 
 export interface SessionSummary {
@@ -27,6 +28,15 @@ export function sessionTime(session: SessionSummary): number {
  * (one log read, then persisted), never a repeated full read.
  */
 export async function computeSessionList(ctx: Context): Promise<SessionSummary[]> {
+  try {
+    return await computeSessionListInner(ctx)
+  } catch (error) {
+    logError('boot', `session list failed: ${error instanceof Error ? error.message : String(error)}`)
+    throw error
+  }
+}
+
+async function computeSessionListInner(ctx: Context): Promise<SessionSummary[]> {
   const workspacePaths = collectWorkspacePaths(ctx)
   const archived = collectArchivedIds(ctx)
   const summaries: SessionSummary[] = []