@dsh-workbench/shared 1.0.0 → 1.1.0

package/src/host/provision.ts

@@ -15,6 +15,8 @@ export const PROVISION_ACTIONS = [
   'update-plugin',
   'uninstall-plugin',
   'update-workbench',
+  'migrate-workbench',
+  'dismiss-followup',
 ] as const satisfies readonly ProvisionAction[];
 
 export const DEPENDENCY_ACTIONS = ['update-dependency'] as const satisfies readonly ProvisionAction[];
@@ -37,7 +39,8 @@ export function provisionTargetOf(action: ProvisionAction): ProvisionTarget {
   if (action === 'install-bundle' || action === 'install-version') return 'spec';
   if (action === 'remove-bundle') return 'name';
   if (action === 'update-plugin' || action === 'uninstall-plugin') return 'name';
-  if (action === 'update-workbench') return 'name';
+  if (action === 'update-workbench' || action === 'migrate-workbench') return 'name';
+  if (action === 'dismiss-followup') return 'id';
   if (action === 'cancel-install') return 'requestId';
   return 'unit';
 }
@@ -81,7 +84,8 @@ function requestOf(action: ProvisionAction, value: string): ProvisionRequest {
   if (action === 'install-bundle' || action === 'install-version') return { action, spec: value };
   if (action === 'remove-bundle') return { action, name: value };
   if (action === 'update-plugin' || action === 'uninstall-plugin') return { action, name: value };
-  if (action === 'update-workbench') return { action, name: value };
+  if (action === 'update-workbench' || action === 'migrate-workbench') return { action, name: value };
+  if (action === 'dismiss-followup') return { action, id: value };
   if (action === 'cancel-install') return { action, requestId: value };
   return { action, unit: value };
 }

package/src/host/supply-index.ts

@@ -1,10 +1,15 @@
 import type { ExtensionNeed, LibNeed, Need, SupplySource } from '../contract/needs.js';
+import { npmRegistryOf } from './plugin-source.js';
 
 export interface SupplyDeclaration {
   readonly id: string;
   readonly needs?: readonly Need[];
 }
 
+export interface SupplyIndexOptions {
+  readonly env?: Readonly<Record<string, string | undefined>>;
+}
+
 export interface SupplyEntry {
   readonly key: string;
   readonly kind: 'extension' | 'lib';
@@ -81,16 +86,28 @@ function keyOf(kind: 'extension' | 'lib', pkg: string): string {
   return `${kind}:${pkg}`;
 }
 
-function sourceCompatible(left: SupplySource, right: SupplySource): boolean {
+function registryAddressOf(
+  source: Extract<SupplySource, { kind: 'npm' }>,
+  env: Readonly<Record<string, string | undefined>>,
+): string | undefined {
+  const resolved = npmRegistryOf(source, env);
+  return resolved.ok ? resolved.value : undefined;
+}
+
+function sourceCompatible(
+  left: SupplySource,
+  right: SupplySource,
+  env: Readonly<Record<string, string | undefined>>,
+): boolean {
   if (left.kind !== right.kind) return false;
   if (left.kind === 'npm' && right.kind === 'npm') {
     if (text(left.package) !== '' && text(right.package) !== '' && text(left.package) !== text(right.package)) {
       return false;
     }
-    if (text(left.registryEnv) !== text(right.registryEnv)) return false;
-    const l = text(left.registryDefault);
-    const r = text(right.registryDefault);
-    return l === '' || r === '' || l === r;
+    const l = registryAddressOf(left, env);
+    const r = registryAddressOf(right, env);
+    if (l !== undefined && r !== undefined) return l === r;
+    return text(left.registryEnv) === text(right.registryEnv);
   }
   if (left.kind === 'git' && right.kind === 'git') return text(left.url) === text(right.url);
   if (left.kind === 'local' && right.kind === 'local') {
@@ -99,11 +116,15 @@ function sourceCompatible(left: SupplySource, right: SupplySource): boolean {
   return false;
 }
 
-function sourcesCompatible(left: readonly SupplySource[], right: readonly SupplySource[]): boolean {
+function sourcesCompatible(
+  left: readonly SupplySource[],
+  right: readonly SupplySource[],
+  env: Readonly<Record<string, string | undefined>>,
+): boolean {
   if (left.length !== right.length) return false;
   return left.every((source, index) => {
     const other = right[index];
-    return other !== undefined && sourceCompatible(source, other);
+    return other !== undefined && sourceCompatible(source, other, env);
   });
 }
 
@@ -120,13 +141,17 @@ function mergedSource(left: SupplySource, right: SupplySource): SupplySource {
   return left;
 }
 
-function mergeSources(entry: MutableEntry, sources: readonly SupplySource[]): boolean {
+function mergeSources(
+  entry: MutableEntry,
+  sources: readonly SupplySource[],
+  env: Readonly<Record<string, string | undefined>>,
+): boolean {
   if (!entry.declared) {
     entry.declared = true;
     entry.sources = [...sources];
     return true;
   }
-  if (!sourcesCompatible(entry.sources, sources)) {
+  if (!sourcesCompatible(entry.sources, sources, env)) {
     entry.conflicted = true;
     return false;
   }
@@ -150,7 +175,11 @@ function addDeclarer(entry: MutableEntry, unit: string, commands: readonly strin
   for (const command of commands) if (!entry.commands.includes(command)) entry.commands.push(command);
 }
 
-export function buildSupplyIndex(declarations: readonly SupplyDeclaration[]): SupplyIndex {
+export function buildSupplyIndex(
+  declarations: readonly SupplyDeclaration[],
+  options: SupplyIndexOptions = {},
+): SupplyIndex {
+  const env = options.env ?? {};
   const entries = new Map<string, MutableEntry>();
   const byName = new Map<string, MutableEntry>();
   const conflicts: SupplyConflict[] = [];
@@ -186,7 +215,7 @@ export function buildSupplyIndex(declarations: readonly SupplyDeclaration[]): Su
       } else {
         addDeclarer(entry, declaration.id, []);
       }
-      const same = mergeSources(entry, need.sources ?? []);
+      const same = mergeSources(entry, need.sources ?? [], env);
       if (!same) {
         conflicts.push({
           kind: 'source-mismatch',

package/src/i18n/en.ts

@@ -134,14 +134,14 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'panels.market.update': 'Update',
   'panels.market.swapSlow': 'Not swapped yet — maybe a slow or failed download. Press Update again; if it stays like this, restart dsh.',
   'panels.market.removeSlow': 'Not removed yet — maybe a slow network or an uninstall that did not finish. Check again in a moment; if it stays like this, restart dsh.',
-  'panels.market.updateNoChange': 'Not updated: you were on {from}, and after the run the disk still has that version; the newest on the registry is {latest}.',
+  'panels.market.updateNoChange': 'Update failed: still {from}. The newest on the registry is {latest} — press Update again.',
   'panels.market.updateUnknownVersion': '(unknown)',
-  'panels.market.updateGone': 'Not updated: after the run the module cannot be read from disk.',
-  'panels.market.updateRestored': 'Not updated: the new version was missing from disk, so {version} was put back.',
+  'panels.market.updateGone': 'Update failed: the module is gone after the update.',
+  'panels.market.updateRestored': 'Update failed: the new version could not be found after the update, so {version} was put back.',
   'panels.market.updateBehind': 'Installed {installed}, but the newest on the registry is {latest} — not the latest; you can update once more.',
-  'panels.market.selfUpdateFailed': 'Self-update failed: {reason}',
+  'panels.market.selfUpdateFailed': 'Workbench update failed: {reason}',
   'panels.market.selfUpdateUnknown': 'the outside process left no reason (see ~/.dsh/workbench/self-update.log)',
-  'panels.market.selfUpdateRolledBack': 'Not swapped; rolled back to {version}.',
+  'panels.market.selfUpdateRolledBack': 'Workbench update failed; rolled back to {version}.',
   'panels.market.uninstall': 'Uninstall',
   'panels.market.uninstallLabel': 'Uninstall {name}',
   'panels.market.installing': 'Installing…',
@@ -165,9 +165,27 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'panels.market.empty': 'No modules available',
   'panels.market.sectionPlugins': 'Installed opencli plugins',
   'panels.market.moduleOutdated': 'update available',
+  'panels.market.updateNeedsWorkbench': 'this version needs a newer workbench first',
+  'panels.market.updateIncompatible': 'the new version does not match this workbench, so it cannot be installed now',
   'panels.market.moduleRefused': 'This module does not match this workbench, so it cannot be used for now.',
   'panels.market.moduleRestartHint': 'restart dsh once to bring it up',
   'panels.market.pendingRestart': 'restart required',
+  'panels.market.pendingFollowUp': 'old data to migrate',
+  'panels.market.migrationHint': 'old sessions and projects are not merged yet',
+  'panels.market.migrateAction': 'Migrate old data',
+  'panels.market.migrating': 'Migrating…',
+  'panels.market.migrateConfirmTitle': 'Migrate old data?',
+  'panels.market.migrateConfirmDetail': 'Quit dsh web / Desktop first. Only missing data is added; nothing is overwritten.',
+  'panels.market.migrateConfirmAck': "I've quit dsh web / Desktop",
+  'panels.market.migrateConfirmYes': 'Start migration',
+  'panels.market.migrateDone': 'Migration complete: {added} projects added; restart the workbench and dsh web to see them.',
+  'panels.market.dismissFollowUp': "Don't remind me",
+  'panels.market.dismissing': 'Dismissing…',
+  'panels.market.dismissFollowUpTitle': 'Stop reminding about this?',
+  'panels.market.dismissFollowUpDetail': "The reminder will be hidden from the market, but old data will not be migrated or deleted. Old sessions and projects stay in the old directory and won't appear in the new version; you can still run dsh-workbench migrate later.",
+  'panels.market.dismissFollowUpAck': "I understand the old data won't appear automatically",
+  'panels.market.dismissFollowUpYes': "Don't remind me",
+  'panels.market.dismissed': 'No longer reminded; old data stays in the old directory and can still be migrated with dsh-workbench migrate.',
   'panels.market.workbenchName': 'Workbench',
   'panels.market.pluginBroken': 'This plugin install is broken: it cannot be identified. Uninstall it first, then ask the agent to reinstall it by package name.',
   'panels.market.restartNeeded': 'The new version is installed — restart once to pick it up.',
@@ -254,7 +272,7 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'panels.market.add.exampleTitle': 'Examples',
   'panels.market.add.exampleFill': 'Fill in an example',
   'panels.market.add.registryLabel': 'Source',
-  'panels.market.add.registryProfile': "This profile's registry",
+  'panels.market.add.registryProfile': "This workbench's registry",
   'panels.market.add.registryPnpm': "pnpm's own registry",
   'panels.market.add.check': 'Check',
   'panels.market.add.checking': 'Checking…',
@@ -275,12 +293,16 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'panels.market.tabs': 'The two faces of the module market',
   'panels.tab.discover': 'Discover',
   'panels.discover.loading': 'Reading the index',
+  'panels.discover.slowHint': 'Slow to load: finish any authorization prompt, or switch sources.',
   'panels.discover.lead': 'Browse modules from an index source; install and go.',
   'panels.discover.addSource': 'Add',
   'panels.discover.addingSource': 'Adding…',
   'panels.discover.addFirstSource': 'Add index source',
   'panels.discover.removeSource': 'Remove',
   'panels.discover.removeSourceNamed': 'Remove {url}',
+  'panels.discover.useSource': 'Use',
+  'panels.discover.useSourceNamed': 'Use {label}',
+  'panels.discover.sourceCurrent': 'In use',
   'panels.discover.refresh': 'Refresh',
   'panels.discover.search': 'Search modules',
   'panels.discover.all': 'All',
@@ -292,8 +314,8 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'panels.discover.sourcePlaceholder': 'https://example.com/index.json or git@git.example.com:wb/market.git',
   'panels.discover.sourceRef': 'Branch',
   'panels.discover.sourcePath': 'Index file',
-  'panels.discover.sourceLocal': 'Local clone (optional)',
-  'panels.discover.sourceLocalHint': 'Leave empty to clone into ~/.dsh/workbench/market-index/.',
+  'panels.discover.sourceLocal': 'Local copy folder (optional)',
+  'panels.discover.sourceLocalHint': 'Leave empty to keep it in ~/.dsh/workbench/market-index/.',
   'panels.discover.save': 'Save and refresh',
   'panels.discover.cancel': 'Cancel',
   'panels.discover.retry': 'Retry',
@@ -306,9 +328,9 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'panels.discover.missingIndex': 'This repository has no {path} yet.',
   'panels.discover.initTitle': 'Initialize this repository as a module market index?',
   'panels.discover.initCta': 'Initialize market index',
-  'panels.discover.initWhat': 'It will write market.json and README.md on {branch}, commit once, and push. Modules you publish from this workbench will commit their artifacts under packages/<unit>/. The repository stays owned by its owner.',
+  'panels.discover.initWhat': 'It will write market.json and README.md on {branch}, commit once, and push. Modules you publish from this workbench will commit their build files under packages/<unit>/. The repository stays owned by its owner.',
   'panels.discover.initBranch': 'Branch',
-  'panels.discover.initBranchHint': 'The index and artifacts go to this branch; an empty repository gets it created.',
+  'panels.discover.initBranchHint': 'The index and build files go to this branch; an empty repository gets it created.',
   'panels.discover.initBranchBad': 'Use only letters, digits, dots, underscores, slashes, or dashes in a branch name.',
   'panels.discover.initOk': 'Initialize',
   'panels.discover.initBusy': 'Initializing…',
@@ -412,12 +434,12 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'panels.market.add.doneApplied': 'Installed and live.',
   'panels.market.add.doneRestart': 'Installed — restart once to pick it up.',
   'panels.market.add.restartWhy': 'Why this needs a restart: {reason}',
-  'panels.market.add.restartWhy.no-hmr': 'this configuration only applies changes at startup (hot reload is off)',
+  'panels.market.add.restartWhy.no-hmr': 'this configuration is only read at startup, so a restart is needed',
   'panels.market.add.restartWhy.package-moved':
     'an installed package now resolves to another directory, or the change replaced something dsh itself provides',
   'panels.market.add.restartWhy.host-module': 'the change reaches modules dsh itself loaded',
-  'panels.market.add.restartWhy.unmanaged-plugin': 'the change reaches a plugin running outside the plugin list',
-  'panels.market.add.restartWhy.module-comparison': 'dsh could not compare loaded plugins with their files',
+  'panels.market.add.restartWhy.unmanaged-plugin': 'the change reaches a plugin that is running but not on the install list',
+  'panels.market.add.restartWhy.module-comparison': 'dsh could not confirm that the running plugin is the copy installed on this machine',
   'panels.market.add.cancelled': 'Cancelled.',
   'panels.market.add.failed': "Didn't work: {reason}",
   'panels.market.add.removed': 'It has been removed.',
@@ -427,10 +449,10 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'panels.market.add.removedRestart': 'Removed — restart once to finish.',
   'panels.market.add.remove': 'Remove it',
   'panels.market.add.problem.invalidSpec': "That is not a spec we accept: it cannot be empty or start with a dash.",
-  'panels.market.add.problem.alreadyInstalled': 'That package is already in the profile (add @version to switch versions).',
+  'panels.market.add.problem.alreadyInstalled': 'That package is already in this workbench (add @version to switch versions).',
   'panels.market.add.problem.notFound': 'No such package on that source. Try another name or version.',
   'panels.market.add.problem.notAPackage': 'There is no package at that location. Pick a folder that contains a package.json.',
-  'panels.market.add.problem.notABundle': 'It is an npm package, but not a dsh plugin (it is missing the dsh wiring declaration).',
+  'panels.market.add.problem.notABundle': 'It is an npm package, but not a dsh plugin (dsh cannot find what to load inside it).',
   'panels.market.add.problem.network': 'The source is unreachable. Check the network and retry.',
   'panels.market.add.problem.unknown': 'The check did not pass (reason unknown). Open the install details for the raw output, or retry.',
   'panels.market.add.reason.invalidSpec': 'the spec is not accepted',
@@ -438,7 +460,7 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'panels.market.add.reason.notBundle': 'it is not a dsh plugin package',
   'panels.market.add.reason.notRemovable': 'it ships with the installation and cannot be removed',
   'panels.market.add.reason.bundleInUse': 'something is still using it',
-  'panels.market.add.reason.stopProfile': 'this configuration has no hot reload, so stop the process first',
+  'panels.market.add.reason.stopProfile': 'this configuration needs a restart, so stop the workbench first',
   'panels.market.add.reason.staleApproval': 'the scripts to allow changed — start over',
   'panels.market.add.reason.operationError': 'pnpm failed (see the install output)',
   'panels.market.add.reason.buildBlocked': 'pnpm blocked install scripts',
@@ -468,8 +490,8 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'blocker.forbidden.titleGeneric': 'No access',
   'blocker.forbidden.hint': 'You are signed in, but this project/repo is not permitted for your account.',
   'blocker.forbidden.open': 'Open permissions page',
-  'blocker.timeout.hint': 'The headless browser may not have started; retrying usually helps.',
-  'blocker.exec.hint': 'Make sure opencli is installed and on PATH (which opencli).',
+  'blocker.timeout.hint': 'The background browser may not have started; retrying usually helps.',
+  'blocker.exec.hint': 'Make sure opencli is installed and runs from your terminal (which opencli).',
   'blocker.unknown.title': 'Something went wrong',
   'panels.reading': 'Reading the panel setup…',
   'panels.cardBroken': 'This module will not render: {unit} ({reason})',
@@ -483,7 +505,7 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'env.elapsed': 'Waiting {seconds}s',
   'env.stepFailed.install': 'install failed',
   'env.stepFailed.path': 'installed but not found',
-  'env.stepFailed.shell': 'no shell channel',
+  'env.stepFailed.shell': 'cannot reach the command line',
   'env.toolchain.ok': 'Looks good',
   'env.toolchain.warn': 'Almost ready',
   'env.opencli.ok': 'Ready',
@@ -500,10 +522,10 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'env.fix.title': 'How to fix it',
   'env.fix.why': 'The workbench uses its own background tool (installed separately from the one in your terminal), and it is not set up on this machine yet.',
   'env.fix.whyPath': 'The background tool is installed, but this environment cannot find it \u2014 usually a PATH or shell-session issue.',
-  'env.fix.whyShell': 'The workbench has no shell channel, so it cannot fetch data \u2014 you cannot install this from here; someone needs to fix the background environment.',
+  'env.fix.whyShell': 'The workbench cannot reach the command line on this machine, so it cannot fetch data \u2014 you cannot install this from here; someone needs to fix the background environment.',
   'env.fix.step': 'Run this in a terminal, then hit Retry:',
   'env.fix.stepPath': 'Open a new terminal window (or make sure npm\u2019s global bin directory is on PATH), then hit Retry.',
-  'env.fix.stepShell': 'Restart the workbench (or dsh); if it keeps happening, the shell channel is not wired up.',
+  'env.fix.stepShell': 'Restart the workbench (or dsh); if it keeps happening, the workbench still cannot reach the command line.',
   'env.fix.permission': 'Permission denied: rerun with sudo, or point npm\u2019s global directory at your home.',
   'env.fix.network': 'Network unreachable: check your network or proxy, then retry.',
   'env.fix.details': 'Details (for troubleshooting)',
@@ -532,9 +554,9 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'env.warm.done': 'Ready ({n} sites)',
   'env.warm.short': 'Could not sign in early this time \u2014 nothing breaks; the first read fills it in',
   'env.unit.failed': 'This module cannot start',
-  'env.unit.failedHint': 'It failed while assembling itself; other modules are unaffected.',
-  'env.unit.unchecked': 'Cannot check: no shell channel',
-  'env.unit.uncheckedHint': 'The module is not the problem \u2014 the shell channel is unavailable. Restart the workbench.',
+  'env.unit.failedHint': 'It failed while starting up; other modules are unaffected.',
+  'env.unit.unchecked': 'Cannot check: no command line',
+  'env.unit.uncheckedHint': 'The module is not the problem \u2014 the workbench cannot reach the command line. Restart the workbench.',
   'adapterSet.not-configured': 'No adapter set configured; using the default.',
   'adapterSet.no-profile': 'No profile found, so the adapter set cannot load; using the default.',
   'adapterSet.malformed': 'An adapter set must be a package name (for example @acme/adapters-set); using the default.',
@@ -581,7 +603,7 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'sidebarEdition.official': 'Official',
   'sidebarEdition.officialHint': 'Matches dsh exactly and stays stable: search, view options, show more, archive, add workspace — no waiting for us to catch up. Pick it to keep things simple.',
   'sidebarEdition.custom': 'Custom',
-  'sidebarEdition.customHint': 'Built for multi-project work: one project per dropdown, recency-first sessions, edge fades, marquee, DIY new session. Easier when you juggle projects.',
+  'sidebarEdition.customHint': 'Built for multi-project work: one project per dropdown, recency-first sessions, long names scroll, edges fade, DIY new session. Easier when you juggle projects.',
   'sidebarEdition.saving': 'Configuring…',
   'sidebarEdition.reloadRequired': 'Saved. Reload the page to apply — no workbench restart needed.',
   'sidebarEdition.reload': 'Reload page',
@@ -612,26 +634,26 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'record.act.halt': 'Halt',
   'approval.record.site': 'Site',
   'approval.record.what': 'Records',
-  'approval.record.lands': 'Lands in',
+  'approval.record.lands': 'Saves to',
   'approval.record.noUrl': 'no site given (this call gets refused)',
   'approval.record.oneAction': 'one action',
   'approval.record.noSwitch': 'it will not switch you back (the leftbar footer shows the state)',
-  'approval.longTask.what': 'Stops',
+  'approval.longTask.what': 'Task to stop',
   'approval.longTask.signal':
-    'stopping only sends an interrupt signal — how the platform-side run finishes is up to the module',
+    'stopping only sends an interrupt signal \u2014 wrapping up the run is up to the module',
   'approval.publish.module': 'Module',
   'approval.publish.target': 'Target',
   'approval.publish.version': 'Version',
   'approval.publish.author': 'Author',
-  'approval.publish.authorMissing': 'unsigned (commits use the local git identity)',
+  'approval.publish.authorMissing': 'unsigned',
   'approval.publish.registry': 'Registry',
   'approval.publish.repo': 'Repository',
   'approval.publish.branch': 'Branch',
   'approval.publish.defaultBranch': 'default branch',
-  'approval.publish.artifacts': 'Artifacts',
+  'approval.publish.artifacts': 'Build files',
   'approval.publish.index': 'Index',
   'approval.publish.commits': 'Commits',
-  'approval.publish.twoCommits': 'artifacts + market.json in 2 commits, one push',
+  'approval.publish.twoCommits': 'build files + market.json in 2 commits, one push',
   'approval.publish.reading': 'Reading…',
   'approval.publish.changelog': 'Changelog for {version}',
   'approval.publish.changelogMissing': 'No changelog entry for {version}; publishing will be blocked',

package/src/i18n/zh.ts

@@ -133,14 +133,14 @@ export const zh = {
   'panels.market.update': '更新',
   'panels.market.swapSlow': '还没换上：可能网慢或没装上。再点一次「更新」；一直这样就把 dsh 重启一遍。',
   'panels.market.removeSlow': '还没卸掉：可能网慢或卸载没走完。等一下再看；一直这样就把 dsh 重启一遍。',
-  'panels.market.updateNoChange': '没换成：点下去是 {from}，跑完盘上还是这一版；源上最新是 {latest}。',
+  'panels.market.updateNoChange': '更新失败：还是 {from}；源上最新是 {latest}，可以再点一次「更新」。',
   'panels.market.updateUnknownVersion': '（问不到）',
-  'panels.market.updateGone': '没换成：更新跑完盘上读不到这个模块。',
-  'panels.market.updateRestored': '没换成：盘上已经读不到新版本，已把 {version} 装回去。',
+  'panels.market.updateGone': '更新失败：更新后找不到这个模块。',
+  'panels.market.updateRestored': '更新失败：更新后找不到新版本，已把 {version} 装回去。',
   'panels.market.updateBehind': '装上了 {installed}，但源上最新是 {latest} —— 没更到最新，可以再点一次。',
-  'panels.market.selfUpdateFailed': '自更新没成：{reason}',
+  'panels.market.selfUpdateFailed': '工作台更新失败：{reason}',
   'panels.market.selfUpdateUnknown': '外部进程没留下原因（看 ~/.dsh/workbench/self-update.log）',
-  'panels.market.selfUpdateRolledBack': '没换成，已回滚到 {version}。',
+  'panels.market.selfUpdateRolledBack': '工作台更新失败，已回滚到 {version}。',
   'panels.market.uninstall': '卸载',
   'panels.market.uninstallLabel': '卸载 {name}',
   'panels.market.installing': '正在安装…',
@@ -162,9 +162,27 @@ export const zh = {
   'panels.market.empty': '暂无可用模块',
   'panels.market.sectionPlugins': '已安装 opencli 插件',
   'panels.market.moduleOutdated': '有新版',
+  'panels.market.updateNeedsWorkbench': '新版本要先把工作台升级才能用',
+  'panels.market.updateIncompatible': '新版本和当前的工作台不匹配，暂时不能更新',
   'panels.market.moduleRefused': '模块版本与工作台不匹配，暂时无法使用',
   'panels.market.moduleRestartHint': '重启后生效',
   'panels.market.pendingRestart': '重启后生效',
+  'panels.market.pendingFollowUp': '旧数据待迁移',
+  'panels.market.migrationHint': '旧会话和项目还没搬过来',
+  'panels.market.migrateAction': '迁移旧数据',
+  'panels.market.migrating': '正在迁移…',
+  'panels.market.migrateConfirmTitle': '迁移旧数据？',
+  'panels.market.migrateConfirmDetail': '先退出 dsh web / Desktop。迁移只补缺、不覆盖；旧目录保留。',
+  'panels.market.migrateConfirmAck': '我已经退出 dsh web / Desktop',
+  'panels.market.migrateConfirmYes': '开始迁移',
+  'panels.market.migrateDone': '迁移完成：补了 {added} 个项目；重启工作台和 dsh web 后出现。',
+  'panels.market.dismissFollowUp': '不再提醒',
+  'panels.market.dismissing': '正在收起…',
+  'panels.market.dismissFollowUpTitle': '不再提醒这件事？',
+  'panels.market.dismissFollowUpDetail': '提示会从模块市场收起，但不会迁移或删除旧数据。旧会话和项目仍留在旧目录，新版本里看不到；以后需要时仍可运行 dsh-workbench migrate。',
+  'panels.market.dismissFollowUpAck': '我知道旧数据不会自动出现',
+  'panels.market.dismissFollowUpYes': '不再提醒',
+  'panels.market.dismissed': '已不再提醒；旧数据仍在旧目录，需要时仍可运行 dsh-workbench migrate。',
   'panels.market.workbenchName': '工作台',
   'panels.market.pluginBroken': '这份插件装坏了：认不出它是什么。可以先卸载，再让 agent 按包名重装一次。',
   'panels.market.restartNeeded': '新版装好了，重启一次才生效。',
@@ -251,7 +269,7 @@ export const zh = {
   'panels.market.add.exampleTitle': '示例',
   'panels.market.add.exampleFill': '填入示例',
   'panels.market.add.registryLabel': '安装源',
-  'panels.market.add.registryProfile': '这个 profile 配的源',
+  'panels.market.add.registryProfile': '这份工作台配的源',
   'panels.market.add.registryPnpm': 'pnpm 自己配的源',
   'panels.market.add.check': '预检',
   'panels.market.add.checking': '正在预检…',
@@ -272,12 +290,16 @@ export const zh = {
   'panels.market.tabs': '模块市场的两个面',
   'panels.tab.discover': '发现',
   'panels.discover.loading': '正在读取索引',
+  'panels.discover.slowHint': '读取较慢：如有授权提示，先完成它，或换一个索引源。',
   'panels.discover.lead': '从索引源浏览模块；装上就能用。',
   'panels.discover.addSource': '添加',
   'panels.discover.addingSource': '正在添加…',
   'panels.discover.addFirstSource': '添加索引源',
   'panels.discover.removeSource': '移除',
   'panels.discover.removeSourceNamed': '移除 {url}',
+  'panels.discover.useSource': '使用',
+  'panels.discover.useSourceNamed': '使用 {label}',
+  'panels.discover.sourceCurrent': '当前使用',
   'panels.discover.refresh': '刷新',
   'panels.discover.search': '搜索模块',
   'panels.discover.all': '全部',
@@ -289,8 +311,8 @@ export const zh = {
   'panels.discover.sourcePlaceholder': 'https://example.com/index.json 或 git@git.example.com:wb/market.git',
   'panels.discover.sourceRef': '分支',
   'panels.discover.sourcePath': '索引文件',
-  'panels.discover.sourceLocal': '本地 clone（可选）',
-  'panels.discover.sourceLocalHint': '不填就 clone 到 ~/.dsh/workbench/market-index/。',
+  'panels.discover.sourceLocal': '本地副本目录（可选）',
+  'panels.discover.sourceLocalHint': '不填就放到 ~/.dsh/workbench/market-index/。',
   'panels.discover.save': '保存并刷新',
   'panels.discover.cancel': '取消',
   'panels.discover.retry': '重试',
@@ -303,9 +325,9 @@ export const zh = {
   'panels.discover.missingIndex': '仓库里还没有索引文件 {path}',
   'panels.discover.initTitle': '把这个仓库初始化成模块市场索引？',
   'panels.discover.initCta': '初始化成市场索引',
-  'panels.discover.initWhat': '会在 {branch} 分支写 market.json 与 README.md，提交一次并推上去；之后从这个工作台发布的模块会把产物提交到 packages/<unit>/。仓库的写权限归它的所有者。',
+  'panels.discover.initWhat': '会在 {branch} 分支写 market.json 与 README.md，提交一次并推上去；之后从这个工作台发布的模块会把打包好的文件提交到 packages/<unit>/。仓库的写权限归它的所有者。',
   'panels.discover.initBranch': '分支',
-  'panels.discover.initBranchHint': '索引与产物都发到这个分支；空仓库会新建它。',
+  'panels.discover.initBranchHint': '索引和打包文件都发到这个分支；空仓库会新建它。',
   'panels.discover.initBranchBad': '分支名只能用字母、数字、点、下划线、斜杠或短横线',
   'panels.discover.initOk': '初始化',
   'panels.discover.initBusy': '正在初始化…',
@@ -409,11 +431,11 @@ export const zh = {
   'panels.market.add.doneApplied': '装好了，已经生效。',
   'panels.market.add.doneRestart': '装好了，重启一次才生效。',
   'panels.market.add.restartWhy': '为什么这一版要重启：{reason}',
-  'panels.market.add.restartWhy.no-hmr': '这个配置只在启动时应用改动（没开热更新）',
+  'panels.market.add.restartWhy.no-hmr': '这份配置只在启动时读一次，改了得重启',
   'panels.market.add.restartWhy.package-moved': '某个已经装着的包换到了新的目录，或者这一下换掉了 dsh 自己提供的那份',
   'panels.market.add.restartWhy.host-module': '这一下动到了 dsh 自己加载的模块',
-  'panels.market.add.restartWhy.unmanaged-plugin': '这一下动到了插件清单之外正在跑的插件',
-  'panels.market.add.restartWhy.module-comparison': 'dsh 没能把已加载的插件与盘上的文件对上',
+  'panels.market.add.restartWhy.unmanaged-plugin': '这一下动到了没登记过、正在运行的插件',
+  'panels.market.add.restartWhy.module-comparison': 'dsh 没法确认正在跑的插件就是这台机器上装好的那一份',
   'panels.market.add.cancelled': '已取消。',
   'panels.market.add.failed': '没成功：{reason}',
   'panels.market.add.removed': '已经移除了。',
@@ -423,10 +445,10 @@ export const zh = {
   'panels.market.add.removedRestart': '卸掉了，重启一次才彻底生效。',
   'panels.market.add.remove': '移除它',
   'panels.market.add.problem.invalidSpec': '这个写法不认：不能是空的，也不能以横杠开头。',
-  'panels.market.add.problem.alreadyInstalled': '这个包已经在 profile 里了（要换版本请带上 @版本）。',
+  'panels.market.add.problem.alreadyInstalled': '这个包已经在这份工作台里了（要换版本请带上 @版本）。',
   'panels.market.add.problem.notFound': '源上没有这个包。换个包名或版本再试。',
   'panels.market.add.problem.notAPackage': '这个位置没有包。选一个包含 package.json 的目录。',
-  'panels.market.add.problem.notABundle': '它是一个 npm 包，但不是 dsh 插件包（缺 dsh 的接线声明）。',
+  'panels.market.add.problem.notABundle': '它是一个 npm 包，但不是 dsh 插件包（dsh 在里面找不到该加载什么）。',
   'panels.market.add.problem.network': '源连不上。检查网络后重试。',
   'panels.market.add.problem.unknown': '预检没通过（原因未知）。展开安装详情看原始输出，或重试。',
   'panels.market.add.reason.invalidSpec': '写法不认',
@@ -434,7 +456,7 @@ export const zh = {
   'panels.market.add.reason.notBundle': '它不是一个 dsh 插件包',
   'panels.market.add.reason.notRemovable': '它是安装自带的组合包，不能卸',
   'panels.market.add.reason.bundleInUse': '还有东西在用它，卸不掉',
-  'panels.market.add.reason.stopProfile': '这个配置没开热更新，得先停掉进程',
+  'panels.market.add.reason.stopProfile': '这份配置改了要重启，得先停掉工作台',
   'panels.market.add.reason.staleApproval': '要允许的安装脚本已经变了，重新来一次',
   'panels.market.add.reason.operationError': 'pnpm 执行出错（详情见安装输出）',
   'panels.market.add.reason.buildBlocked': 'pnpm 拦下了安装脚本',
@@ -457,15 +479,15 @@ export const zh = {
   'blocker.market.open': '去模块市场',
   'blocker.login.title': '需要登录 {platform}',
   'blocker.login.titleGeneric': '需要登录',
-  'blocker.login.hint': '工作台用你的浏览器登录态；登录一次就行，之后不用再登。',
+  'blocker.login.hint': '工作台借你浏览器里的登录状态；登录一次就行，之后不用再登。',
   'blocker.login.go': '去登录',
   'blocker.login.manual': '在终端执行该插件的登录命令（见插件的文档），按提示完成登录后重试。',
   'blocker.forbidden.title': '没有权限访问 {platform}',
   'blocker.forbidden.titleGeneric': '没有权限',
   'blocker.forbidden.hint': '账号已登录，但没有这个项目/仓库的权限；申请之后再试。',
   'blocker.forbidden.open': '打开权限页',
-  'blocker.timeout.hint': '无头浏览器可能没起来，重试一次通常就好。',
-  'blocker.exec.hint': '确认 opencli 已安装且在 PATH 里（which opencli）。',
+  'blocker.timeout.hint': '后台浏览器没起来，重试一次通常就好。',
+  'blocker.exec.hint': '确认 opencli 已经装好、在终端里能直接运行（which opencli）。',
   'blocker.unknown.title': '出了点问题',
   'panels.reading': '正在读取面板配置…',
   'panels.cardBroken': '这个模块起不来：{unit}（{reason}）',
@@ -479,7 +501,7 @@ export const zh = {
   'env.elapsed': '已等待 {seconds} 秒',
   'env.stepFailed.install': '装不上',
   'env.stepFailed.path': '装了但还找不到',
-  'env.stepFailed.shell': '执行通道不可用',
+  'env.stepFailed.shell': '连不上命令行',
   'env.toolchain.ok': '正常',
   'env.toolchain.warn': '还没完全准备好',
   'env.opencli.ok': '已就绪',
@@ -496,10 +518,10 @@ export const zh = {
   'env.fix.title': '怎么解决',
   'env.fix.why': '工作台用它自己那份后台工具（与你在终端里那套分开装，互不影响），这台机器上还没装好它。',
   'env.fix.whyPath': '后台工具装上了，但当前环境还找不到它 —— 通常是 PATH 或终端会话的问题。',
-  'env.fix.whyShell': '工作台拿不到执行命令的通道，所以取不了数据 —— 这一步你装不了，需要有人处理后台环境。',
+  'env.fix.whyShell': '工作台拿不到这台机器的命令行，所以取不了数据 —— 这一步你装不了，需要有人处理后台环境。',
   'env.fix.step': '在终端里运行下面这条命令，装好之后点「重试」：',
   'env.fix.stepPath': '新开一个终端窗口（或确认 npm 的全局 bin 目录在 PATH 里），然后点「重试」。',
-  'env.fix.stepShell': '重启一次工作台（或 dsh）；如果反复出现，说明执行通道没配好。',
+  'env.fix.stepShell': '重启一次工作台（或 dsh）；如果反复出现，说明工作台还是拿不到命令行。',
   'env.fix.permission': '权限不够：在命令前加 sudo 重跑，或先把 npm 的全局目录配到你的用户目录。',
   'env.fix.network': '网络不通：检查网络或代理设置后重试。',
   'env.fix.details': '详细输出（排障用）',
@@ -528,9 +550,9 @@ export const zh = {
   'env.warm.done': '已就绪（{n} 个站点）',
   'env.warm.short': '这次没提前连上 —— 不影响用，第一次取数会自己补',
   'env.unit.failed': '这个模块起不来',
-  'env.unit.failedHint': '它自己装配时报了错，别的模块不受影响。',
-  'env.unit.unchecked': '检测不了：拿不到执行通道',
-  'env.unit.uncheckedHint': '不是这个模块的问题，是执行通道不可用 —— 重启一次工作台再试。',
+  'env.unit.failedHint': '它自己启动时报了错，别的模块不受影响。',
+  'env.unit.unchecked': '检测不了：拿不到命令行',
+  'env.unit.uncheckedHint': '不是这个模块的问题，是工作台拿不到命令行 —— 重启一次工作台再试。',
   'adapterSet.not-configured': '没配置适配器集合，用默认的。',
   'adapterSet.no-profile': '找不到 profile，没法加载适配器集合；先用默认的。',
   'adapterSet.malformed': '适配器集合要写包名（如 @acme/adapters-set）；先用默认的。',
@@ -577,7 +599,7 @@ export const zh = {
   'sidebarEdition.official': '官方',
   'sidebarEdition.officialHint': '跟 dsh 官方一致、最稳：搜索、视图选项、显示更多、归档、添加工作区都齐，升级也不等我们适配。想省心就选它。',
   'sidebarEdition.custom': '自定义',
-  'sidebarEdition.customHint': '为多项目工作流做的：项目下拉一屏一个项目，会话按最近更新排，两端淡出、跑马灯、工坊 DIY 新会话。项目多时更顺手。',
+  'sidebarEdition.customHint': '为多项目工作流做的：项目下拉一屏一个项目，会话按最近更新排，名字自动滚动、两侧渐隐，工坊 DIY 新会话。项目多时更顺手。',
   'sidebarEdition.saving': '配置中…',
   'sidebarEdition.reloadRequired': '已写入。刷新页面后生效（不用重启工作台）。',
   'sidebarEdition.reload': '刷新页面',
@@ -608,25 +630,25 @@ export const zh = {
   'record.act.halt': '停',
   'approval.record.site': '站点',
   'approval.record.what': '录制功能',
-  'approval.record.lands': '落点',
+  'approval.record.lands': '保存到',
   'approval.record.noUrl': '没给站点地址（这次会被当场拒）',
   'approval.record.oneAction': '一次操作',
   'approval.record.noSwitch': '录完不会替你切回来（左栏底部会亮一条状态）',
-  'approval.longTask.what': '要停的那一趟',
-  'approval.longTask.signal': '停了只是让工作台发出中断信号 —— 平台侧那趟活儿的收尾看模块自己',
+  'approval.longTask.what': '要停的那次任务',
+  'approval.longTask.signal': '停了只是让工作台发出中断信号 —— 这次任务怎么收尾由模块自己负责',
   'approval.publish.module': '模块',
   'approval.publish.target': '目标',
   'approval.publish.version': '版本',
   'approval.publish.author': '作者',
-  'approval.publish.authorMissing': '未署名（提交用本机 git 身份）',
+  'approval.publish.authorMissing': '未署名',
   'approval.publish.registry': '源',
   'approval.publish.repo': '仓库',
   'approval.publish.branch': '分支',
   'approval.publish.defaultBranch': '默认分支',
-  'approval.publish.artifacts': '产物',
+  'approval.publish.artifacts': '打包文件',
   'approval.publish.index': '索引',
   'approval.publish.commits': '提交',
-  'approval.publish.twoCommits': '产物 + market.json 两个 commit，一次 push',
+  'approval.publish.twoCommits': '打包文件 + market.json 两次提交，一次推送',
   'approval.publish.reading': '读取中…',
   'approval.publish.changelog': '{version} 的更新日志',
   'approval.publish.changelogMissing': '这一版还没有更新日志（{version}），发布会被拦下',

package/src/lib/dsh-client.ts

@@ -130,11 +130,13 @@ export interface DshSlots {
 }
 
 /**
- * dsh 的语言服务：按命名空间注册字典，再取回那个命名空间的文案函数。
+ * dsh 的语言服务：按命名空间注册字典，再取回那个命名空间的文案函数；
+ * `resolveText` 按当前语言取一份字面量（字符串原样返回，映射按语言回退链取）。
  */
 export interface DshLocale {
   register(namespace: string, dictionaries: Record<string, Record<string, string>>): () => void;
   bind(namespace: string): Translate;
+  resolveText?(text: string | Readonly<Record<string, string | undefined>>): string;
 }
 
 /**