@dsh-workbench/shared 1.1.4 → 1.1.6

package/src/host/runtime-links.ts

@@ -0,0 +1,23 @@
+import { existsSync, mkdirSync, symlinkSync } from 'node:fs';
+import { dirname } from 'node:path';
+import { OPENCLI_NPM_PACKAGE, libsPrefix, toolchainOpencliDir } from './paths.js';
+
+/**
+ * 让共用依赖也能 import opencli：把隔离运行时里那份 opencli 链接到 libs 的 node_modules。
+ * 跑在 libs 里的命令（比如 opencli-workflow 带的 gitops）会按包名找 @jackwener/opencli，
+ * 找不到就起不来 —— 它不在 libs 的依赖里，是运行时提供的那一份。
+ * @returns 这次真的建了链接就 `true`；已经有了、或运行时那份还没装，就是 `false`。
+ */
+export function ensureLibsOpencliPeer(): boolean {
+  const link = `${libsPrefix()}/node_modules/${OPENCLI_NPM_PACKAGE}`;
+  if (existsSync(link)) return false;
+  const target = toolchainOpencliDir();
+  if (!existsSync(target)) return false;
+  try {
+    mkdirSync(dirname(link), { recursive: true });
+    symlinkSync(target, link);
+    return true;
+  } catch {
+    return false;
+  }
+}

package/src/host/tool-approval.ts

@@ -1,3 +1,7 @@
+export { APPROVAL_NOTE_ARG } from '../contract/approval.js';
+
+import { APPROVAL_NOTE_ARG } from '../contract/approval.js';
+
 export type AskDecision =
   | {
       readonly kind: 'ask';
@@ -16,8 +20,6 @@ export interface ApprovalDetail {
 
 export type ApprovalFacts = ApprovalDetail | { readonly blocked: string };
 
-export const APPROVAL_NOTE_ARG = 'approval_note';
-
 export const APPROVAL_NOTE_LIMIT = 40;
 
 export const APPROVAL_DETAIL_LIMIT = 20;
@@ -77,7 +79,8 @@ export interface ApprovalCall {
 
 /**
  * 套件对一次写调用给出的判定：`read` 只是看看、`allow` 会写但本套件不问、`deny` 这一次根本跑不成
- * （连问都不该问，`reason` 原样交给 agent）、`ask` 要用户点头（`question` 接在明细后，`fallback` 是没明细时的整句）。
+ * （连问都不该问，`reason` 原样交给 agent）、`ask` 要用户点头（`question` 接在明细后，`fallback` 是没明细时的整句；
+ * `noteInDetail` 为真表示套件把 agent 的附注画在自己的详情座里，标题只留动作、不再追加）。
  */
 export type ApprovalVerdict =
   | { readonly kind: 'read' }
@@ -91,6 +94,7 @@ export type ApprovalVerdict =
       readonly reason: string;
       readonly question: ApprovalDetail;
       readonly fallback: ApprovalDetail;
+      readonly noteInDetail?: boolean;
     };
 
 export type ApprovalPolicy = (call: ApprovalCall) => ApprovalVerdict | undefined;
@@ -168,9 +172,12 @@ export async function approvalFor(
 
   if (context.skipAsk === true) return undefined;
 
+  const note =
+    context.declaredNote === true && verdict.noteInDetail !== true ? approvalNoteOf(call) : undefined;
+
   return {
     kind: 'ask',
     reason: verdict.reason,
-    displayReason: compose(facts, verdict, context.declaredNote === true ? approvalNoteOf(call) : undefined),
+    displayReason: compose(facts, verdict, note),
   };
 }

package/src/host.ts

@@ -42,6 +42,8 @@ export * from './host/data-root.js';
 export * from './host/shell-text.js';
 export * from './host/shell.js';
 export * from './host/data-error.js';
+export * from './host/install-failure.js';
+export * from './host/runtime-links.js';
 export * from './host/provision.js';
 export * from './host/channel-plugin.js';
 export * from './host/recipe.js';
@@ -75,3 +77,4 @@ export * from './host/version-range.js';
 export * from './host/market-index.js';
 export * from './host/market-index-claim.js';
 export * from './host/changelog.js';
+export * from './host/installed-sources.js';

package/src/i18n/en.ts

@@ -134,11 +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': 'Update failed: still {from}. The newest on the registry is {latest} — press Update again.',
+  'panels.market.updateNoChange': 'Update did not swap in: still {from}; the registry has {latest}.',
   'panels.market.updateUnknownVersion': '(unknown)',
   '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.updateBehind': 'Installed {installed}, but the registry has {latest}.',
+  'panels.market.updateStuck.title': 'Update did not swap in',
+  'panels.market.updateStuck.factNoChange': 'Still {from} on disk; the registry has {latest}.',
+  'panels.market.updateStuck.copiedHint': 'Paste it into a terminal, then restart the workbench once.',
   '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': 'Workbench update failed; rolled back to {version}.',
@@ -156,6 +159,41 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'panels.market.confirmNo': 'Cancel',
   'panels.market.noMarketSource': 'The index has no newer version of this module (refresh the index and retry)',
   'panels.market.failed': 'Failed: {reason}',
+  'panels.market.askAgent': 'Ask the agent',
+  'panels.market.askAgentCopied': 'Copied',
+  'panels.market.askAgentText':
+    'This workbench module cannot be used: "{name}" (unit {unit}) — {reason}. Work out what is missing and how to add it, then confirm it works.',
+  'panels.market.failure.permission': "Didn't install: no write access",
+  'panels.market.failure.diskFull': "Didn't install: the disk is full",
+  'panels.market.failure.sandbox': "Didn't install: the system blocked it",
+  'panels.market.failure.unknown': "Didn't install: cause not recognised",
+  'panels.market.failure.factOwner': '{path} belongs to {owner}, and this account ({me}) cannot write to it. Hand it back to yourself (asks for your login password).',
+  'panels.market.failure.factMode': '{path} is mode {mode}, so this account cannot write to it.',
+  'panels.market.failure.factSpace': 'The disk holding {path} is full.',
+  'panels.market.failure.factStuck': 'This command ran in a restricted environment and cannot write to {path}.',
+  'panels.market.failure.nowhere': '(the directory was not identified)',
+  'panels.market.failure.copyFix': 'Copy the fix command',
+  'panels.market.failure.copied': 'Copied',
+  'panels.market.failure.copiedHint': 'Paste it in a terminal, run it, then click Check again.',
+  'panels.market.failure.askAgent': 'Copy for the agent',
+  'panels.market.failure.askAgentText': 'Installing this module could not write: `{command}` exited {code} at {path}. Work out whether the sandbox or file permissions blocked it, then install again somewhere writable.',
+  'panels.market.failure.askAgentHint': 'Paste it into the chat and let the agent carry on.',
+  'panels.market.failure.recheck': 'Check again',
+  'panels.market.failure.showOutput': 'Show install output',
+  'panels.market.failure.hideOutput': 'Hide install output',
+  'panels.market.failure.term.commandLine': 'command on line {line}',
+  'panels.market.failure.term.signal': 'killed by {signal}',
+  'panels.market.failure.term.exitCode': 'exit code {exitCode}',
+  'panels.market.failure.term.noExitCode': 'no exit code',
+  'panels.market.failure.term.running': 'running',
+  'panels.market.failure.term.failed': 'failed',
+  'panels.market.failure.term.done': 'done',
+  'panels.market.failure.term.copy': 'Copy',
+  'panels.market.failure.term.copied': 'Copied',
+  'panels.market.failure.term.noOutput': 'No output',
+  'panels.market.failure.term.collapse': 'Collapse',
+  'panels.market.failure.term.expandAria': 'Show the remaining {hidden} lines',
+  'panels.market.failure.term.expand': 'Show {hidden} lines',
   'panels.market.needEnv': 'Set {env} in the terminal that started the workbench first',
   'panels.market.needCommands': 'Missing commands: {commands}',
   'panels.market.needBinary': 'Install the {command} command first',
@@ -192,9 +230,13 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'panels.market.restartNeeded': 'The new version is installed — restart once to pick it up.',
   'panels.market.foot': 'After installing, enable it in the panel page of that project.',
   'panels.market.checkUpdates': 'Check for updates',
+  'panels.market.checkAll': 'Check all updates',
   'panels.market.checkingNow': 'Checking…',
   'panels.market.checkFailed': 'The last check failed. Check your connection and retry.',
   'panels.market.checkedAt': 'Last checked: {time}',
+  'panels.market.latestPartial': 'Could not check {n} modules',
+  'panels.market.latestNoRegistry': 'No source configured — the latest version was not checked',
+  'panels.market.latestProbeFailed': 'Could not reach the source — try again later',
   'panels.market.justNow': 'just now',
   'panels.market.minutesAgo': '{n} min ago',
   'panels.market.hoursAgo': '{n} h ago',
@@ -255,6 +297,8 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'panels.market.add.failurePermission': 'No write permission, cannot install',
   'panels.market.add.failureBuildBlocked': 'A dependency wants to run install scripts; you have to allow it first',
   'panels.market.add.failureIntegrity': 'The downloaded package failed its integrity check',
+  'panels.market.add.failureStopProfile': 'The old copy is still in use (the workbench has this module loaded), so this dsh version will not overwrite it in place.',
+  'panels.market.add.failureCancelled': 'This run was cancelled and nothing changed.',
   'panels.market.add.failureTimeout': 'The install timed out',
   'panels.market.add.failurePnpmMissing': 'pnpm was not found, cannot install',
   'panels.market.add.failureInstalled':
@@ -339,7 +383,7 @@ 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 build files under packages/<package-name>/. The repository stays owned by its owner.',
+  'panels.discover.initWhat': 'It will write the index directory market/ and README.md on {branch}, commit once, and push. Modules you publish from this workbench will commit their build files under artifacts/<package-name>/<version>/ and their entry under market/<package-name>/<version>.json. The repository stays owned by its owner.',
   'panels.discover.initBranch': 'Branch',
   '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.',
@@ -670,6 +714,9 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'approval.longTask.what': 'Task to stop',
   'approval.longTask.signal':
     'stopping only sends an interrupt signal \u2014 wrapping up the run is up to the module',
+  'approval.plugin.name': 'Plugin',
+  'approval.plugin.command': 'Command',
+  'approval.plugin.note': 'Agent says',
   'approval.publish.module': 'Module',
   'approval.publish.target': 'Target',
   'approval.publish.version': 'Version',
@@ -689,7 +736,7 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'approval.publish.artifacts': 'Build files',
   'approval.publish.index': 'Index',
   'approval.publish.commits': 'Commits',
-  'approval.publish.twoCommits': 'build files + market.json in 2 commits, one push',
+  'approval.publish.twoCommits': 'build files + entry file in 2 commits, one push',
   'approval.publish.reading': 'Reading…',
   'approval.publish.changelog': 'Changelog for {version}',
   'approval.publish.changelogPending': 'This release writes the {version} changelog entry',

package/src/i18n/zh.ts

@@ -133,11 +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.updateBehind': '装上了 {installed}，但源上最新是 {latest} —— 没更到最新，可以再点一次。',
+  'panels.market.updateBehind': '装上了 {installed}，但源上最新是 {latest}。',
+  'panels.market.updateStuck.title': '更新没换上',
+  'panels.market.updateStuck.factNoChange': '盘上还是 {from}；源上最新是 {latest}。',
+  'panels.market.updateStuck.copiedHint': '粘到终端跑一次，跑完重启一次工作台。',
   'panels.market.selfUpdateFailed': '工作台更新失败：{reason}',
   'panels.market.selfUpdateUnknown': '外部进程没留下原因（看 ~/.dsh/workbench/self-update.log）',
   'panels.market.selfUpdateRolledBack': '工作台更新失败，已回滚到 {version}。',
@@ -153,6 +156,41 @@ export const zh = {
   'panels.market.confirmNo': '取消',
   'panels.market.noMarketSource': '索引里没有这个模块的新版本（刷新一次索引再试）',
   'panels.market.failed': '没成功：{reason}',
+  'panels.market.askAgent': '问 agent',
+  'panels.market.askAgentCopied': '已复制',
+  'panels.market.askAgentText':
+    '工作台里「{name}」（单元 {unit}）用不了：{reason}。帮我查清缺什么、怎么补，补完确认真能用。',
+  'panels.market.failure.permission': '没装上：没有写入权限',
+  'panels.market.failure.diskFull': '没装上：磁盘满了',
+  'panels.market.failure.sandbox': '没装上：被系统拦住了',
+  'panels.market.failure.unknown': '没装上：原因没认出来',
+  'panels.market.failure.factOwner': '{path} 属于 {owner}，当前账号（{me}）写不进去。把它还给自己就行（会要开机密码）。',
+  'panels.market.failure.factMode': '{path} 的权限是 {mode}，当前账号没有写权限。',
+  'panels.market.failure.factSpace': '{path} 所在的磁盘满了。',
+  'panels.market.failure.factStuck': '这条命令跑在受限环境里，写不进 {path}。',
+  'panels.market.failure.nowhere': '（没认出是哪个目录）',
+  'panels.market.failure.copyFix': '复制修复命令',
+  'panels.market.failure.copied': '已复制',
+  'panels.market.failure.copiedHint': '粘到终端跑一次，回来点「再检测」。',
+  'panels.market.failure.askAgent': '复制给 agent',
+  'panels.market.failure.askAgentText': '装这个模块时写不进去：`{command}` 退出码 {code}，卡在 {path}。帮我看看是被沙箱拦的还是权限问题，换一条能写进去的路再装。',
+  'panels.market.failure.askAgentHint': '粘到对话里，让 agent 接着弄。',
+  'panels.market.failure.recheck': '再检测',
+  'panels.market.failure.showOutput': '查看安装输出',
+  'panels.market.failure.hideOutput': '收起安装输出',
+  'panels.market.failure.term.commandLine': '第 {line} 行的命令',
+  'panels.market.failure.term.signal': '被 {signal} 终止',
+  'panels.market.failure.term.exitCode': '退出码 {exitCode}',
+  'panels.market.failure.term.noExitCode': '没有退出码',
+  'panels.market.failure.term.running': '在跑',
+  'panels.market.failure.term.failed': '没跑通',
+  'panels.market.failure.term.done': '跑完了',
+  'panels.market.failure.term.copy': '复制',
+  'panels.market.failure.term.copied': '已复制',
+  'panels.market.failure.term.noOutput': '没有输出',
+  'panels.market.failure.term.collapse': '收起',
+  'panels.market.failure.term.expandAria': '展开剩下的 {hidden} 行',
+  'panels.market.failure.term.expand': '展开 {hidden} 行',
   'panels.market.needEnv': '先在启动工作台的终端里设 {env}',
   'panels.market.needCommands': '缺这几条命令：{commands}',
   'panels.market.needBinary': '先装 {command} 命令',
@@ -189,9 +227,13 @@ export const zh = {
   'panels.market.restartNeeded': '新版装好了，重启一次才生效。',
   'panels.market.foot': '装好后到那个项目的面板页勾选它，模块才会出现。',
   'panels.market.checkUpdates': '检查更新',
+  'panels.market.checkAll': '检查全部更新',
   'panels.market.checkingNow': '正在检查…',
   'panels.market.checkFailed': '最近一次没查到，检查网络后重试',
   'panels.market.checkedAt': '最近检查：{time}',
+  'panels.market.latestPartial': '{n} 个模块没查成',
+  'panels.market.latestNoRegistry': '没配来源，未检查新版',
+  'panels.market.latestProbeFailed': '问不到源，稍后重试',
   'panels.market.justNow': '刚刚',
   'panels.market.minutesAgo': '{n} 分钟前',
   'panels.market.hoursAgo': '{n} 小时前',
@@ -252,6 +294,8 @@ export const zh = {
   'panels.market.add.failurePermission': '没有写入权限，无法安装',
   'panels.market.add.failureBuildBlocked': '有依赖的安装脚本需要你允许后才能继续',
   'panels.market.add.failureIntegrity': '下载的安装包校验失败',
+  'panels.market.add.failureStopProfile': '旧版还在用着（工作台正加载这个模块），这一版 dsh 不肯就地覆盖。',
+  'panels.market.add.failureCancelled': '这次操作被取消了，什么都没动。',
   'panels.market.add.failureTimeout': '安装超时',
   'panels.market.add.failurePnpmMissing': '没有找到 pnpm，无法安装',
   'panels.market.add.failureInstalled':
@@ -336,7 +380,7 @@ export const zh = {
   'panels.discover.missingIndex': '仓库里还没有索引文件 {path}',
   'panels.discover.initTitle': '把这个仓库初始化成模块市场索引？',
   'panels.discover.initCta': '初始化成市场索引',
-  'panels.discover.initWhat': '会在 {branch} 分支写 market.json 与 README.md，提交一次并推上去；之后从这个工作台发布的模块会把打包好的文件提交到按包名分的 packages/<包名>/。仓库的写权限归它的所有者。',
+  'panels.discover.initWhat': '会在 {branch} 分支写索引目录 market/ 与 README.md，提交一次并推上去；之后从这个工作台发布的模块会把打包好的文件提交到 artifacts/<包名>/<版本>/，条目写到 market/<包名>/<版本>.json。仓库的写权限归它的所有者。',
   'panels.discover.initBranch': '分支',
   'panels.discover.initBranchHint': '索引和打包文件都发到这个分支；空仓库会新建它。',
   'panels.discover.initBranchBad': '分支名只能用字母、数字、点、下划线、斜杠或短横线',
@@ -665,6 +709,9 @@ export const zh = {
   'approval.record.noSwitch': '录完不会替你切回来（左栏底部会亮一条状态）',
   'approval.longTask.what': '要停的那次任务',
   'approval.longTask.signal': '停了只是让工作台发出中断信号 —— 这次任务怎么收尾由模块自己负责',
+  'approval.plugin.name': '插件',
+  'approval.plugin.command': '命令',
+  'approval.plugin.note': 'agent 说',
   'approval.publish.module': '模块',
   'approval.publish.target': '目标',
   'approval.publish.version': '版本',
@@ -684,7 +731,7 @@ export const zh = {
   'approval.publish.artifacts': '打包文件',
   'approval.publish.index': '索引',
   'approval.publish.commits': '提交',
-  'approval.publish.twoCommits': '打包文件 + market.json 两次提交，一次推送',
+  'approval.publish.twoCommits': '打包文件 + 条目文件两次提交，一次推送',
   'approval.publish.reading': '读取中…',
   'approval.publish.changelog': '{version} 的更新日志',
   'approval.publish.changelogPending': '{version} 这一版会写进更新日志，随包发布',

package/src/index.ts

@@ -35,6 +35,7 @@ export * from './components/board-module.js';
 export * from './components/icons.js';
 export * from './config/constants.js';
 export * from './config/storage.js';
+export * from './contract/approval.js';
 export * from './contract/blocker.js';
 export * from './contract/data.js';
 export * from './contract/extension.js';