@dsh-workbench/shared 1.1.6 → 1.1.8

package/src/host/opencli-runner.ts

@@ -0,0 +1,76 @@
+import type { DataError, DataRequest, DataResult } from '../contract/data.js';
+
+/**
+ * 一条 opencli 命令的执行器：同一形状的 `execFile('opencli', args)`，结果只留 stdout。
+ */
+export type OpencliRunner = (
+  args: readonly string[],
+) => Promise<{ readonly stdout: string }>;
+
+/**
+ * 读缝（`DataReader.read`）的形状；模块直接把自己的 `data.read` 传进来即可。
+ */
+export type OpencliRead = (
+  request: DataRequest,
+) => Promise<DataResult<unknown>>;
+
+export interface OpencliRunnerOptions {
+  readonly timeoutMs?: number;
+}
+
+const AUTH_REQUIRED_EXIT_CODE = 77;
+
+function textOf(value: unknown): string {
+  return typeof value === 'string' ? value : '';
+}
+
+function failedOf(args: readonly string[], error: DataError | undefined): Error {
+  const head = `Command failed: opencli ${args.join(' ')}`;
+  const auth = error?.pageCode === 'auth-required';
+  const helpUrl = textOf(error?.helpUrl);
+  const detail = textOf(error?.detail);
+  const hint = textOf(error?.hint);
+  const failed = new Error(
+    [
+      head,
+      ...(auth
+        ? ['code: AUTH_REQUIRED', `message: ${textOf(error?.message)}`]
+        : [textOf(error?.message) || 'opencli 这条命令没跑通']),
+      ...(detail === '' ? [] : [detail]),
+      ...(hint === '' ? [] : [hint]),
+      ...(auth && helpUrl !== ''
+        ? [`help: Please open Chrome or Chromium and log in to ${helpUrl}`]
+        : []),
+    ].join('\n'),
+  );
+  if (auth) (failed as Error & { code?: number }).code = AUTH_REQUIRED_EXIT_CODE;
+  return failed;
+}
+
+/**
+ * 把读缝包成一条 opencli 命令的执行器：给还按 `execFile('opencli', args)` 收结果的编排库用，
+ * 让它们跑在面板用的那份 opencli 上（同一套插件、同一份登录态）。
+ *
+ * 失败按 opencli 自己的约定还原：未登录是 `code: AUTH_REQUIRED` + 退出码 77，编排库的
+ * 「等登录再重试」才接得上；其它失败保留 `Command failed: opencli …` 那句外壳。
+ * @param read 模块手里的读缝（`data.read`）。
+ * @param options `timeoutMs` 透传给读缝；不传就用读缝自己的默认值。
+ * @returns 执行器；直接交给编排库的 `setOpencliRunner`。
+ */
+export function opencliRunnerOf(
+  read: OpencliRead,
+  options: OpencliRunnerOptions = {},
+): OpencliRunner {
+  return async (args) => {
+    const result = await read({
+      kind: 'command',
+      adapter: 'opencli',
+      argv: [...args],
+      ...(options.timeoutMs === undefined
+        ? {}
+        : { timeoutMs: options.timeoutMs }),
+    });
+    if (result.ok) return { stdout: JSON.stringify(result.data) };
+    throw failedOf(args, result.error);
+  };
+}

package/src/host.ts

@@ -34,6 +34,8 @@ export * from './host/tokens.js';
 export * from './host/tool-approval.js';
 export * from './host/tool-kit.js';
 export * from './host/unit-face.js';
+export * from './host/opencli-runner.js';
+export * from './host/lib-runners.js';
 export * from './host/value-handoff.js';
 export * from './host/workspace-store.js';
 export * from './host/write-result.js';

package/src/i18n/en.ts

@@ -383,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 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.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>/ and their entry in market/<package-name>.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.',
@@ -722,6 +722,8 @@ export const en: Record<keyof WorkbenchMessages, string> = {
   'approval.publish.version': 'Version',
   'approval.publish.author': 'Author',
   'approval.publish.authorMissing': 'unsigned',
+  'approval.publish.labels': 'Labels',
+  'approval.publish.labelsMissing': 'none yet (1–2 picked on publish)',
   'approval.publish.owner': 'Owner',
   'approval.publish.ownerUnowned': 'originally unattributed',
   'approval.publish.ownerTaken': 'Owned by {owner}',

package/src/i18n/zh.ts

@@ -380,7 +380,7 @@ export const zh = {
   'panels.discover.missingIndex': '仓库里还没有索引文件 {path}',
   'panels.discover.initTitle': '把这个仓库初始化成模块市场索引？',
   'panels.discover.initCta': '初始化成市场索引',
-  'panels.discover.initWhat': '会在 {branch} 分支写索引目录 market/ 与 README.md，提交一次并推上去；之后从这个工作台发布的模块会把打包好的文件提交到 artifacts/<包名>/<版本>/，条目写到 market/<包名>/<版本>.json。仓库的写权限归它的所有者。',
+  'panels.discover.initWhat': '会在 {branch} 分支写索引目录 market/ 与 README.md，提交一次并推上去；之后从这个工作台发布的模块会把打包好的文件提交到 artifacts/<包名>/，条目写到 market/<包名>.json。仓库的写权限归它的所有者。',
   'panels.discover.initBranch': '分支',
   'panels.discover.initBranchHint': '索引和打包文件都发到这个分支；空仓库会新建它。',
   'panels.discover.initBranchBad': '分支名只能用字母、数字、点、下划线、斜杠或短横线',
@@ -717,6 +717,8 @@ export const zh = {
   'approval.publish.version': '版本',
   'approval.publish.author': '作者',
   'approval.publish.authorMissing': '未署名',
+  'approval.publish.labels': '标签',
+  'approval.publish.labelsMissing': '还没有（发布到市场时补 1–2 个）',
   'approval.publish.owner': '认领人',
   'approval.publish.ownerUnowned': '原来没署名',
   'approval.publish.ownerTaken': '已有主人：{owner}',