@dsh-cc/cli 0.7.0 → 0.7.1-rc.1

package/bin/dsh-cc.js

@@ -9,7 +9,7 @@ import { existsSync, readFileSync } from 'node:fs'
 import { homedir } from 'node:os'
 import { dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
-import { bootstrapCommand, devStoreRestoreDecision, dshUnavailableMessage, existingWorktreeDecision, formatVersionLabel, interceptResume, parseLocalConfig, parseWorktreeFlag, parseWorktreeRef, planWorktree, planWorktreeRef, prFetchRefs, remoteHost, PROFILE, readBuildInfo, repoRootFromCommonDir, runStoreRestore, sanitizeInheritedEnv, slugRetryDecision, spawnEnv, symlinkedPath, versionGate, worktreeAddArgv, worktreeEnv, worktreeIdentityRefusal } from '../bootstrap.mjs'
+import { bootstrapCommand, BOOTSTRAP_STAMP, devStoreRestoreDecision, dshUnavailableMessage, existingWorktreeDecision, formatVersionLabel, healDecision, interceptResume, parseLocalConfig, parseWorktreeFlag, parseWorktreeRef, planWorktree, planWorktreeRef, prFetchRefs, readBootstrapVersion, remoteHost, PROFILE, readBuildInfo, repoRootFromCommonDir, runStoreHeal, runStoreRestore, sanitizeInheritedEnv, slugRetryDecision, spawnEnv, symlinkedPath, versionGate, worktreeAddArgv, worktreeEnv, worktreeIdentityRefusal, writeBootstrapStamp } from '../bootstrap.mjs'
 import { readWorktreeSettings, resolveBaseRef, sweepWorktrees, SWEEP_CAP_MS, worktreeReuseReset, worktreeSettingsPaths } from '../worktree-lifecycle.mjs'
 
 const here = dirname(fileURLToPath(import.meta.url))
@@ -27,7 +27,8 @@ if (process.argv.includes('--version') || process.argv.includes('-V')) {
   console.log(formatVersionLabel(ownVersion, buildInfo))
   process.exit(0)
 }
-const add = bootstrapCommand(existsSync(join(profileDir, 'package.json')), ownVersion)
+const profileExisted = existsSync(join(profileDir, 'package.json'))
+const add = bootstrapCommand(profileExisted, ownVersion)
 if (add !== undefined) {
   console.error(`dsh-cc: initializing profile "${PROFILE}"…`)
   // Minimum-version gate runs ONLY here (bootstrap/install path), never on
@@ -51,13 +52,33 @@ if (add !== undefined) {
     console.error(`dsh-cc: plugin install failed. Retry:\n  dsh ${add.join(' ')}`)
     process.exit(installed.status ?? 1)
   }
+  // First install of this launcher version: record it so later launches can
+  // tell "converged" from "installed before the heal mechanism existed".
+  writeBootstrapStamp(join(profileDir, BOOTSTRAP_STAMP), ownVersion)
 }
 
 // A dev-synced profile paired with a DIFFERENT launcher version converges
 // back to store bundles before the session starts (plan 2026-09-13 §3.4).
 // A fresh profile has no stamp, so this can never fire on the bootstrap path.
+// A successful restore IS this version's install: stamp afterwards.
 const restorePlan = devStoreRestoreDecision(buildInfo, ownVersion)
-if (restorePlan !== null) runStoreRestore(profileDir, ownVersion)
+if (restorePlan !== null) {
+  const restored = runStoreRestore(profileDir, ownVersion)
+  if (restored.restored) writeBootstrapStamp(join(profileDir, BOOTSTRAP_STAMP), ownVersion)
+} else {
+  // A pre-existing store profile converges to this launcher's version on
+  // version change (or on a missing stamp — installs made before the heal
+  // existed, including every 0.7.0-broken profile). Never fires on a
+  // dev-synced profile (that pairing belongs to the restore path) nor on a
+  // launch that just bootstrapped.
+  const heal = healDecision({
+    profileExists: profileExisted && add === undefined,
+    stampVersion: readBootstrapVersion(join(profileDir, BOOTSTRAP_STAMP)),
+    ownVersion,
+    buildInfo,
+  })
+  if (heal !== null) runStoreHeal(profileDir, ownVersion, { from: heal.from })
+}
 
 // A parent dsh-cc TUI process leaks DSH_CC_RESUME_SESSION / DSH_CC_AUTO_RESUME
 // / DSH_CC_CONTINUE into a child launcher's environment. Strip them up front —

package/bootstrap.mjs

@@ -4,7 +4,7 @@
  */
 
 import { spawnSync } from 'node:child_process'
-import { closeSync, existsSync, lstatSync, openSync, readFileSync, renameSync, rmSync, statSync } from 'node:fs'
+import { closeSync, existsSync, lstatSync, openSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from 'node:fs'
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from 'node:path'
 
 export const PROFILE = 'tui'
@@ -815,3 +815,137 @@ export function runStoreRestore(profileDir, ownVersion, deps = {}) {
     if (locked) tryRm(lock, false)
   }
 }
+
+// --- store heal: converge an existing profile after a launcher update --------
+
+/** Marker file recording the launcher version that last installed the bundles. */
+export const BOOTSTRAP_STAMP = '.dsh-cc-bootstrap.json'
+/** Exclusive lock for the heal path (same freshness semantics as the restore lock). */
+export const HEAL_LOCK = '.dsh-cc-heal.lock'
+
+/**
+ * Read the launcher version recorded by the last successful bundle install.
+ * Missing/malformed stamp -> null (pre-heal profiles, i.e. every install made
+ * before this mechanism existed) — that is a HEAL, not a skip: those profiles
+ * carry whatever the first bootstrap pinned, forever.
+ *
+ * @param {string} stampPath
+ * @returns {string | null}
+ */
+export function readBootstrapVersion(stampPath) {
+  try {
+    const value = JSON.parse(readFileSync(stampPath, 'utf8'))
+    return typeof value.launcherVersion === 'string' && value.launcherVersion.length > 0
+      ? value.launcherVersion
+      : null
+  } catch {
+    return null
+  }
+}
+
+/**
+ * Decide whether an EXISTING profile needs its store bundles re-added at this
+ * launcher's version. Skipped for dev pairings (channel `dev`, regardless of
+ * version match): the registry `plugin add` here would clobber the
+ * workspace-symlinked dev scope — dev convergence is `runStoreRestore`'s job
+ * alone. The first-install path is separate (`bootstrapCommand`), so callers
+ * must not heal on a launch that just bootstrapped.
+ *
+ * @param {{ profileExists: boolean, stampVersion: string | null, ownVersion: string, buildInfo?: Record<string, unknown> | null }} input
+ * @returns {{ from: string } | null}
+ */
+export function healDecision({ profileExists, stampVersion, ownVersion, buildInfo = null }) {
+  if (!profileExists) return null
+  if (buildInfo?.channel === 'dev') return null
+  if (stampVersion === ownVersion) return null
+  return { from: stampVersion ?? 'unknown (pre-heal profile)' }
+}
+
+/**
+ * Write the bootstrap stamp. A failure here is reported LOUDLY, not swallowed:
+ * a launcher that heals but cannot record it re-runs a full network install on
+ * every single launch — silent degradation is unacceptable.
+ *
+ * @param {string} stampPath
+ * @param {string} ownVersion
+ * @param {(...a: unknown[]) => void} [log]
+ */
+export function writeBootstrapStamp(stampPath, ownVersion, log = console.error) {
+  try {
+    writeFileSync(stampPath, `${JSON.stringify({ launcherVersion: ownVersion }, null, 2)}\n`)
+  } catch (error) {
+    log(`dsh-cc: CRITICAL: profile healed to ${ownVersion} but the stamp could not be written `
+      + `(${/** @type {Error} */ (error).message}); the full plugin install will repeat on every launch until this is fixed`)
+  }
+}
+
+/**
+ * Re-run the bundle add against an existing profile (launcher update path).
+ * `pnpm add` upserts the pinned ranges and `dsh plugin add` reconciles
+ * `dsh.profile.bundles` idempotently — the same command surface the first
+ * bootstrap and `runStoreRestore` rely on. A failed add warns and continues
+ * launching (the stale stamp retries next launch); a failed stamp write is
+ * loud (see writeBootstrapStamp).
+ *
+ * @param {string} profileDir
+ * @param {string} ownVersion
+ * @param {{ from?: string, spawnSyncImpl?: typeof import('node:child_process').spawnSync, log?: (...a: unknown[]) => void, now?: () => number }} [options]
+ * @returns {{ healed: boolean, reason?: 'locked' | 'plugin-add-failed' }}
+ */
+export function runStoreHeal(profileDir, ownVersion, options = {}) {
+  const { from, spawnSyncImpl = spawnSync, log = console.error, now = Date.now } = options
+  const lock = join(profileDir, HEAL_LOCK)
+  const stamp = join(profileDir, BOOTSTRAP_STAMP)
+  const home = dirname(dirname(profileDir))
+  const profileName = basename(profileDir)
+  let locked = false
+
+  try {
+    // Exclusive create; a lock younger than ten minutes means another launch
+    // is mid-heal — launch as-is rather than race pnpm on one profile dir.
+    try {
+      closeSync(openSync(lock, 'wx'))
+      locked = true
+    } catch (error) {
+      if (/** @type {NodeJS.ErrnoException} */ (error).code !== 'EEXIST') throw error
+      let fresh = true
+      try {
+        fresh = now() - statSync(lock).mtimeMs < 10 * 60 * 1000
+      } catch { /* lock vanished between EEXIST and stat: proceed */ }
+      if (fresh) {
+        log('dsh-cc: profile heal already in progress, skipping')
+        return { healed: false, reason: 'locked' }
+      }
+      try {
+        rmSync(lock, { force: true })
+        closeSync(openSync(lock, 'wx'))
+        locked = true
+      } catch {
+        log('dsh-cc: profile heal already in progress, skipping')
+        return { healed: false, reason: 'locked' }
+      }
+    }
+
+    const result = spawnSyncImpl('dsh', ['plugin', '--profile', profileName, 'add', ...BUNDLES.map(n => `${n}@${ownVersion}`)], {
+      stdio: 'inherit',
+      env: spawnEnv(sanitizeInheritedEnv(process.env), home),
+    })
+    const success = !result.error && result.status === 0
+    if (!success) {
+      log(`dsh-cc: profile heal to ${ownVersion} failed (will retry on next launch; if the new dsh-cc version was just published, npm/pnpm's minimum-release-age window may still be hiding it)`)
+      return { healed: false, reason: 'plugin-add-failed' }
+    }
+    writeBootstrapStamp(stamp, ownVersion, log)
+    log(`dsh-cc: launcher updated ${from ?? 'unknown'} → ${ownVersion}; re-installed store bundles in profile "${profileName}"`)
+    return { healed: true }
+  } catch (error) {
+    log(`dsh-cc: profile heal failed unexpectedly: ${/** @type {Error} */ (error).message}`)
+    return { healed: false, reason: 'plugin-add-failed' }
+  } finally {
+    if (locked) {
+      try {
+        rmSync(lock, { force: true })
+      } catch { /* best-effort; a stale lock is taken over next launch */ }
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-cc/cli",
-  "version": "0.7.0",
+  "version": "0.7.1-rc.1",
   "description": "Optional dsh-cc shortcut: bootstraps the tui profile and runs dsh --profile tui",
   "type": "module",
   "bin": {