@dsh-workbench/core 1.0.0-beta.1 → 1.0.1

package/dist/host/index.js

@@ -964,69 +964,6 @@ function wroteNow(result) {
 function unitFactScope(unit) {
 	return `${unit}*`;
 }
-//#endregion
-//#region ../shared/dist/host/shell-text.js
-/**
-* 按目标平台把一个值裹成 shell 字面量：POSIX 用单引号，win32 用双引号（cmd 与 PowerShell 都认）。
-* @param value - 任意值；不是字符串的先 `String()`。
-* @param platform - 目标平台，默认当前 `process.platform`。
-* @returns 可安全拼进该平台 shell 命令的一段文本；含空格 / 元字符的值不会被当成语法。
-*/
-function quoteShellArgFor(value, platform = process.platform) {
-	const text = String(value);
-	if (platform === "win32") return `"${text.replace(/"/g, "\\\"")}"`;
-	return `'${text.replace(/'/g, `'\\''`)}'`;
-}
-/**
-* 按当前平台把值裹成 shell 字面量；跨平台代码要固定平台时用 `quoteShellArgFor`。
-* @param value - 任意值；不是字符串的先 `String()`。
-* @returns 可安全拼进当前平台 shell 命令的一段文本。
-*/
-function quoteShellArg(value) {
-	return quoteShellArgFor(value, process.platform);
-}
-/**
-* 取一段文本的末尾若干行（如命令输出），顺带去掉首尾空白。
-* @param text - 原文；`null` / `undefined` 当空串。
-* @param lines - 最多留几行，默认 6；0 给全篇、负数从开头砍掉那么多行（都是 `slice` 语义），调用方传正数。
-* @returns 末尾若干行、去首尾空行后的文本；原文行数不够就全给，空输入给空串。
-*/
-function tailLines(text, lines = 6) {
-	return String(text ?? "").trim().split("\n").slice(-lines).join("\n");
-}
-//#endregion
-//#region ../shared/dist/host/shell.js
-var DEFAULT_MAX_BYTES$2 = 8388608;
-async function runShell(shell, command, options = {}) {
-	const { workdir, timeoutMs = GIT_TIMEOUT_MS, signal } = options;
-	const spec = shell.resolve({
-		command,
-		...workdir === void 0 ? {} : { workdir },
-		timeoutMs,
-		onExpiry: "kill",
-		stdoutMaxBytes: DEFAULT_MAX_BYTES$2,
-		...signal === void 0 ? {} : { signal }
-	});
-	const result = await (await shell.execute(spec)).result();
-	return {
-		exitCode: result.exitCode,
-		timedOut: result.timedOut === true,
-		aborted: result.aborted === true,
-		stdout: result.stdout.text,
-		stderr: result.stderr.text,
-		truncated: result.stdout.truncated || result.stderr.truncated
-	};
-}
-function backgroundPrefix() {
-	return [quoteShellArg("env"), quoteShellArg("OPENCLI_WINDOW=background")];
-}
-function backgroundLine(command, argv) {
-	return [
-		...backgroundPrefix(),
-		quoteShellArg(command),
-		...argv.map(quoteShellArg)
-	].join(" ");
-}
 /**
 * 上报文本字段的截断长度（2000 字符；workspace / reason / message 共用）。
 */
@@ -2385,6 +2322,69 @@ function createWorkspaceStore(options) {
 	};
 }
 //#endregion
+//#region ../shared/dist/host/shell-text.js
+/**
+* 按目标平台把一个值裹成 shell 字面量：POSIX 用单引号，win32 用双引号（cmd 与 PowerShell 都认）。
+* @param value - 任意值；不是字符串的先 `String()`。
+* @param platform - 目标平台，默认当前 `process.platform`。
+* @returns 可安全拼进该平台 shell 命令的一段文本；含空格 / 元字符的值不会被当成语法。
+*/
+function quoteShellArgFor(value, platform = process.platform) {
+	const text = String(value);
+	if (platform === "win32") return `"${text.replace(/"/g, "\\\"")}"`;
+	return `'${text.replace(/'/g, `'\\''`)}'`;
+}
+/**
+* 按当前平台把值裹成 shell 字面量；跨平台代码要固定平台时用 `quoteShellArgFor`。
+* @param value - 任意值；不是字符串的先 `String()`。
+* @returns 可安全拼进当前平台 shell 命令的一段文本。
+*/
+function quoteShellArg(value) {
+	return quoteShellArgFor(value, process.platform);
+}
+/**
+* 取一段文本的末尾若干行（如命令输出），顺带去掉首尾空白。
+* @param text - 原文；`null` / `undefined` 当空串。
+* @param lines - 最多留几行，默认 6；0 给全篇、负数从开头砍掉那么多行（都是 `slice` 语义），调用方传正数。
+* @returns 末尾若干行、去首尾空行后的文本；原文行数不够就全给，空输入给空串。
+*/
+function tailLines(text, lines = 6) {
+	return String(text ?? "").trim().split("\n").slice(-lines).join("\n");
+}
+//#endregion
+//#region ../shared/dist/host/shell.js
+var DEFAULT_MAX_BYTES$2 = 8388608;
+async function runShell(shell, command, options = {}) {
+	const { workdir, timeoutMs = GIT_TIMEOUT_MS, signal } = options;
+	const spec = shell.resolve({
+		command,
+		...workdir === void 0 ? {} : { workdir },
+		timeoutMs,
+		onExpiry: "kill",
+		stdoutMaxBytes: DEFAULT_MAX_BYTES$2,
+		...signal === void 0 ? {} : { signal }
+	});
+	const result = await (await shell.execute(spec)).result();
+	return {
+		exitCode: result.exitCode,
+		timedOut: result.timedOut === true,
+		aborted: result.aborted === true,
+		stdout: result.stdout.text,
+		stderr: result.stderr.text,
+		truncated: result.stdout.truncated || result.stderr.truncated
+	};
+}
+function backgroundPrefix() {
+	return [quoteShellArg("env"), quoteShellArg("OPENCLI_WINDOW=background")];
+}
+function backgroundLine(command, argv) {
+	return [
+		...backgroundPrefix(),
+		quoteShellArg(command),
+		...argv.map(quoteShellArg)
+	].join(" ");
+}
+//#endregion
 //#region ../shared/dist/host/paths.js
 function isolatedRoot() {
 	return `${workbenchRoot()}/opencli`;
@@ -5738,10 +5738,11 @@ function stopVerdict(call, runs) {
 function publishVerdict(call, preview) {
 	const raw = argsOf$1(call);
 	if (raw["verify"] === true || raw["target"] === "local") return { kind: "allow" };
+	const refresh = raw["refresh"] === true;
 	const unit = textOf$3(raw, "unit");
 	const found = unit === "" ? null : preview?.(unit) ?? null;
 	const asked = textOf$3(raw, "target");
-	const target = asked === "" ? found?.market === void 0 ? found?.registry === void 0 ? "tarball" : "team" : "market" : asked;
+	const target = refresh ? "market" : asked === "" ? found?.market === void 0 ? found?.registry === void 0 ? "tarball" : "team" : "market" : asked;
 	const label = unit === "" ? "工作台模块" : `工作台模块 [${unit}]`;
 	const labelEn = unit === "" ? "the workbench module" : `the workbench module [${unit}]`;
 	const copies = {
@@ -5771,7 +5772,9 @@ function publishVerdict(call, preview) {
 		}
 	};
 	const copy = copies[target] ?? copies["team"];
-	return askOf(`${DIY_PUBLISH_TOOL} ${found === null ? target : target === "market" && found.market !== void 0 ? `${found.name}@${found.version} → market (${found.market.url})` : `${found.name}@${found.version} → ${target}${found.registry === void 0 ? "" : ` (${found.registry})`}`}`, pair(copy.zh, copy.en), pair(copy.zh, copy.en));
+	const targetLabel = found === null ? target : target === "market" && found.market !== void 0 ? `${found.name}@${found.version} → market (${found.market.url})` : `${found.name}@${found.version} → ${target}${found.registry === void 0 ? "" : ` (${found.registry})`}`;
+	const question = refresh ? pair(`只刷新${label}在市集里的元数据（标题 / 作者 / 说明），不升版本、不重发产物，允许吗？`, `Only refresh ${labelEn}'s market metadata (title, author, description); no version bump, no artifacts. Allow?`) : pair(copy.zh, copy.en);
+	return askOf(`${DIY_PUBLISH_TOOL} ${targetLabel}${refresh ? "（元数据）" : ""}`, question, question);
 }
 var panelsApproval = (call) => {
 	if (call.name === "workbench_long_tasks_stop") return stopVerdict(call, void 0);
@@ -6792,10 +6795,10 @@ var OUTPUT$2 = {
 			},
 			unit: { type: "string" },
 			path: { type: "string" },
-			install: {
+			install: { oneOf: [{
 				type: "object",
 				additionalProperties: true
-			},
+			}, { type: "string" }] },
 			alreadyInstalled: { type: "boolean" },
 			panel: {
 				type: "object",
@@ -8873,6 +8876,10 @@ function renderStatus(root, lines, options = {}) {
 	});
 	return `${notice === void 0 ? `工作区：${root}` : `工作区：${root}\n${notice}`}\n${block.join("\n")}`;
 }
+function publishStatusOf(preview) {
+	if (preview === null) return "";
+	return [preview.market === void 0 ? preview.registry === void 0 ? "发布出口：安装包（这个环境没配可写市场索引源，模块也没声明 publishConfig.registry）" : `发布出口：团队源 ${preview.registry}（package.json 的 publishConfig.registry）` : `发布出口：市场索引 ${preview.market.url}${preview.market.ref === void 0 ? "" : `（${preview.market.ref}）`}—— 不填 target 时默认发这里；这一版会发 ${preview.market.nextVersion ?? preview.version}`, preview.changelog === void 0 ? void 0 : preview.changelog.missing ? `发布前置：CHANGELOG 还差 ${preview.changelog.version} 这一版 —— 先 workbench_diy_changelog（unit=…）` : `发布前置：CHANGELOG 里已有 ${preview.changelog.version}`].filter((one) => one !== void 0).join("\n");
+}
 function renderList(root, modules, shape = "bare") {
 	if (modules.length === 0) return [
 		`这个工作区里没有模块源码（${root}）—— ${shape === "workspace" ? "它声明了 workspace，但里面的包没有一个报 dsh.workbench.unit" : shape === "package" ? "它是一个包（有 package.json），但没声明 dsh.workbench.unit，也没声明 workspace" : "它没有 package.json（空项目 / 一堆散文件都算这一档）"}；这条会话也还没装过任何模块。`,
@@ -8887,7 +8894,7 @@ function renderList(root, modules, shape = "bare") {
 //#endregion
 //#region src/modules/panels/model/diy-tools.ts
 var PUBLISH_TIMEOUT_MS = 18e5;
-function registerDiyTools(ctx, market, panels, debug) {
+function registerDiyTools(ctx, market, panels, debug, previewOf = () => null) {
 	const supply = supplyPortOf(ctx);
 	const tools = ctx.get("tools");
 	if (tools === void 0) {
@@ -8928,10 +8935,13 @@ function registerDiyTools(ctx, market, panels, debug) {
 					installed: one.installed
 				})
 			}));
+			const preview = wanted === "" ? null : previewOf(wanted);
+			const text = [renderStatus(root, rows), publishStatusOf(preview)].filter((one) => one !== "").join("\n");
 			return plainJson({
 				workspace: root,
 				status: rows,
-				text: renderStatus(root, rows)
+				...preview === null ? {} : { publish: preview },
+				text
 			});
 		}
 	};
@@ -9125,7 +9135,7 @@ function registerDiyTools(ctx, market, panels, debug) {
 	};
 	const publishTool = {
 		name: DIY_PUBLISH_TOOL,
-		description: "用户说“发布”后才用：把这一格发到团队源/公网 npm/安装包/git/市场索引。先跑全门禁（验收没打完不发），发完给安装命令。",
+		description: "用户说“发布”后才用：把这一格发到 target 指定的出口（不填按环境默认）。",
 		parameters: {
 			type: "object",
 			properties: {
@@ -9160,6 +9170,10 @@ function registerDiyTools(ctx, market, panels, debug) {
 				license: {
 					type: "string",
 					description: "公开发布用的许可证（MIT / Apache-2.0 / 仓库已有 LICENSE）。"
+				},
+				refresh: {
+					type: "boolean",
+					description: "只刷市集元数据（标题/作者/说明），不升版本、不重发产物。"
 				}
 			},
 			required: ["unit"],
@@ -9191,6 +9205,7 @@ function registerDiyTools(ctx, market, panels, debug) {
 			if (target !== "") argv.push("--target", target);
 			if (version !== "") argv.push("--version", version);
 			if (license !== "") argv.push("--license", license);
+			if (asRecord$1(raw)["refresh"] === true) argv.push("--refresh");
 			const result = await runShell(shell, argv.map((one) => quoteShellArg(one)).join(" "), {
 				workdir: root,
 				timeoutMs: PUBLISH_TIMEOUT_MS
@@ -9231,7 +9246,7 @@ function registerDiyTools(ctx, market, panels, debug) {
 				`已核过 ${name}@${released}`,
 				`安装：${install}`,
 				"没有重新发布。"
-			].join("\n") : targetOfPayload === "tarball" ? [
+			].join("\n") : payload["refresh"] === true ? [payload["refreshed"] === true ? `已刷新 ${name} 的市集元数据（版本 ${released} 不变）` : `${name} 的市集元数据本来就是这样，没动`, `市场索引：${asText(asRecord$1(payload["market"])["url"])}`].join("\n") : targetOfPayload === "tarball" ? [
 				`安装包在 ${file}`,
 				`本机装：${install}`,
 				"文件可以从对话里带走，发给同事。"
@@ -9362,14 +9377,26 @@ function publishPreviewOf(root, unit, options = {}) {
 	const registry = typeof publishConfig === "object" && publishConfig !== null ? publishConfig["registry"] : void 0;
 	const market = marketOf(found.unit, found.dir, name, version);
 	const target = targetVersionOf(version, (options.version ?? "").trim(), market);
+	const author = authorOf(record);
 	return {
 		name,
 		version,
+		...author === "" ? {} : { author },
 		...typeof registry === "string" && registry !== "" ? { registry } : {},
 		...market === void 0 ? {} : { market },
 		changelog: changelogOf(found.dir, target)
 	};
 }
+function authorOf(manifest) {
+	const author = manifest["author"];
+	if (typeof author === "string") return author.trim();
+	if (author === null || typeof author !== "object") return "";
+	const record = author;
+	const name = typeof record["name"] === "string" ? record["name"].trim() : "";
+	if (name === "") return "";
+	const email = typeof record["email"] === "string" ? record["email"].trim() : "";
+	return email === "" ? name : `${name} <${email}>`;
+}
 function targetVersionOf(version, asked, market) {
 	if (asked === "") return market?.nextVersion ?? version;
 	if (/^(major|minor|patch)$/.test(asked)) return bumped(version, asked) ?? version;
@@ -12851,11 +12878,18 @@ function createMarketDocReader(options) {
 		const directory = (git.path ?? "").replace(/^\/+|\/+$/g, "");
 		const file = directory === "" ? FILES[kind] : `${directory}/${FILES[kind]}`;
 		const repo = join(options.root, "market-index", marketSourceKey(source), "repo.git");
+		const show = () => runShell(shell, `git -C ${quoteShellArg(repo)} show ${git.commit}:${quoteShellArg(file)}`, { timeoutMs });
+		const hasCommit = async () => {
+			return (await runShell(shell, `git -C ${quoteShellArg(repo)} cat-file -e ${quoteShellArg(`${git.commit}^{commit}`)}`, { timeoutMs })).exitCode === 0;
+		};
 		try {
-			const result = await runShell(shell, `git -C ${quoteShellArg(repo)} show ${git.commit}:${quoteShellArg(file)}`, { timeoutMs });
+			let result = await show();
+			if (result.exitCode !== 0 && !await hasCommit()) {
+				if ((await runShell(shell, `git -C ${quoteShellArg(repo)} fetch --depth 1 origin ${git.commit}`, { timeoutMs })).exitCode === 0) result = await show();
+			}
 			if (result.exitCode !== 0) {
 				const text = result.stderr.trim();
-				return remember(key, missingText(text) ? fail(kind, target.version, "missing") : fail(kind, target.version, "unavailable", text));
+				return missingText(text) ? fail(kind, target.version, "missing") : fail(kind, target.version, "unavailable", text);
 			}
 			return remember(key, {
 				ok: true,
@@ -14353,7 +14387,7 @@ var OWNED = [{
 			registerTools: () => [
 				...registerPanelTools(ctx, panels, values),
 				...registerMarketTools(ctx, market),
-				...registerDiyTools(ctx, market, panels, debug),
+				...registerDiyTools(ctx, market, panels, debug, (unit) => publishPreviewOf(workshopPathOf(ctx), unit)),
 				...registerRecordTools(ctx, record),
 				...registerLongTaskTools(ctx, longTaskRuns)
 			],

package/dist/types/app/layouts/rightbar/market-shared-rows.d.ts

@@ -14,7 +14,6 @@ export interface SharedRow {
         readonly installed?: string;
         readonly latest?: string;
     };
-    readonly detail?: string;
 }
 export declare function sharedActions(row: SharedRow): MarketRowAction[];
 export declare function sharedRows(manifests: readonly UnitManifest[], capabilities: CapabilityMap | null): SharedRow[];

package/dist/types/app/layouts/workbench-settings/ConfigSyncRows.d.ts

@@ -1,11 +1,9 @@
 import type { Translate } from '@dsh-workbench/shared';
 import type { ConfigSyncRow } from '../../../kernel/contract/config-sync';
-export declare function SourceRows({ t, rows, picked, profile, assetOverwrites, onToggle, onToggleAsset, }: {
+export declare function SourceRows({ t, rows, picked, profile, onToggle, }: {
     readonly t: Translate;
     readonly rows: readonly ConfigSyncRow[];
     readonly picked: readonly string[];
     readonly profile: string;
-    readonly assetOverwrites: readonly string[];
     readonly onToggle: (key: string, next: boolean) => void;
-    readonly onToggleAsset: (key: string, next: boolean) => void;
 }): JSX.Element;

package/dist/types/kernel/contract/config-sync.d.ts

@@ -1,2 +1,2 @@
 export { CONFIG_SYNC_ROUTE, CONFIG_SYNC_RESOURCE } from '@dsh-workbench/shared/contract/protocol/config-sync';
-export type { ConfigSyncState, ConfigSyncAssetState, ConfigSyncAssetFile, ConfigSyncAsset, ConfigSyncRow, ConfigSyncProfile, ConfigSyncSnapshot, ConfigSyncApplied, ConfigSyncRequest } from '@dsh-workbench/shared/contract/protocol/config-sync';
+export type { ConfigSyncState, ConfigSyncRow, ConfigSyncProfile, ConfigSyncSnapshot, ConfigSyncApplied, ConfigSyncRequest } from '@dsh-workbench/shared/contract/protocol/config-sync';

package/dist/types/modules/panels/model/diy-context.d.ts

@@ -24,8 +24,13 @@ export declare const OUTPUT_SCHEMA: {
             type: string;
         };
         install: {
-            type: string;
-            additionalProperties: boolean;
+            oneOf: ({
+                type: string;
+                additionalProperties: boolean;
+            } | {
+                type: string;
+                additionalProperties?: undefined;
+            })[];
         };
         alreadyInstalled: {
             type: string;
@@ -61,8 +66,13 @@ export declare const OUTPUT: {
                 type: string;
             };
             install: {
-                type: string;
-                additionalProperties: boolean;
+                oneOf: ({
+                    type: string;
+                    additionalProperties: boolean;
+                } | {
+                    type: string;
+                    additionalProperties?: undefined;
+                })[];
             };
             alreadyInstalled: {
                 type: string;

package/dist/types/modules/panels/model/diy-report.d.ts

@@ -1,4 +1,5 @@
 import type { PanelUnitReport } from '@dsh-workbench/shared/host';
+import type { PublishPreview } from '@dsh-workbench/shared/contract/protocol/market-index';
 import { type DiyModule, type SyncState, type Toolchain, type WorkspaceShape } from '../../../shared/api/host/diy-modules';
 export declare const SYNC_STALE_MINUTES = 15;
 export declare const SYNC_STALE_MS: number;
@@ -70,4 +71,5 @@ export declare function statusOf(options: {
 export declare function renderStatus(root: string, lines: readonly ModuleStatus[], options?: {
     readonly shellVersion?: string;
 }): string;
+export declare function publishStatusOf(preview: PublishPreview | null): string;
 export declare function renderList(root: string, modules: readonly DiyModule[], shape?: WorkspaceShape): string;

package/dist/types/modules/panels/model/diy-tools.d.ts

@@ -1,6 +1,7 @@
 import type { DshHostContext } from '@dsh-workbench/shared';
 import type { DebugStore } from '@dsh-workbench/shared/host';
+import type { PublishPreview } from '@dsh-workbench/shared/contract/protocol/market-index';
 import type { MarketService } from './market';
 import type { PanelsService } from './service';
 export declare const PUBLISH_TIMEOUT_MS: number;
-export declare function registerDiyTools(ctx: DshHostContext, market: MarketService, panels: PanelsService, debug: DebugStore): Array<() => void>;
+export declare function registerDiyTools(ctx: DshHostContext, market: MarketService, panels: PanelsService, debug: DebugStore, previewOf?: (unit: string) => PublishPreview | null): Array<() => void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-workbench/core",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.1",
   "description": "个人工作台：Agent 工作台（左栏 + 常驻对话 + 自研右侧数据面板）。",
   "type": "module",
   "icon": "./icon.svg",
@@ -36,6 +36,8 @@
     "preset",
     "scripts/create-workbench.mjs",
     "scripts/clone-profile.mjs",
+    "scripts/patch-blocks.mjs",
+    "scripts/share-data-root.mjs",
     "scripts/seed-profile.sh",
     "scripts/seed-workshop.sh",
     "README.md"
@@ -98,8 +100,8 @@
     "proper-lockfile": "^4.1.2",
     "which": "^7.0.0",
     "write-file-atomic": "^8.0.0",
-    "@dsh-workbench/shared": "1.0.0-beta.1",
-    "@dsh-workbench/adapters-default": "1.0.0-beta.1"
+    "@dsh-workbench/shared": "1.0.1",
+    "@dsh-workbench/adapters-default": "1.0.1"
   },
   "license": "MIT",
   "repository": {

package/profile/sandbox.patch.yml

@@ -1,4 +1,7 @@
-# 工作台运行时的**可写根**声明 —— 由启动器每次启动叠加（`--patch`）。
+# 工作台运行时的**可写根**声明。两个入口共用同一行：
+#   1. 启动器每次启动用 `--patch` 叠一层（对新旧 profile 都生效）；
+#   2. `scripts/share-data-root.mjs` 把这一行补进 profile 的 cordis.patch.yml，
+#      给不带启动器的 `dsh <profile>` 兜底（只抄这一行，不抄注释）。
 #
 # 为什么必须有它：工作台自己要跑命令（启动体检自动装 opencli、模块市场装/升插件、
 # 查源上有没有新版），而这些命令走 dsh 的**执行缝**，执行缝带**文件沙箱**。
@@ -9,14 +12,13 @@
 # 症状：自动安装死在第一步，界面只能退化成"让用户去终端抄一条命令" ——
 # 终端没有沙箱，抄过去反而能跑，于是这个缺口一直看不出来。
 #
-# 指到 `$DSH_HOME/workbench` 之后，沙箱放行的是**同一棵树**：
+# 指到运行时根之后，沙箱放行的是**同一棵树**：
 #   隔离运行时的工具链 + npm 缓存（opencli-runtime.ts）、
 #   模块专属文件夹（ADR-0011 的 workspaces/）、模块市场的 plugins-npm。
 # 也就是 ADR-0011 说的"启动器给插件声明的可写根"。
 #
-# 为什么用 `--patch` 叠加、而不是写进 profile 的 cordis.patch.yml：
-# profile 可能是**早就建好**的（交接出去的机器尤其如此），没人会回头重跑
-# seed-profile.sh —— 叠加层每次启动都生效，对新旧 profile 一视同仁。
+# 会话 / 项目 / 附件**不在这里**：它们跟 `dsh web` / Desktop 共用 `$DSH_HOME`，
+# 不再由工作台按 profile 隔离（见 ADR-0085）。
 #
 # mode 与 base 出厂值**一致**（只重述，不改变语义）：patch 的 config 是**整体替换**、
 # 不深合并，所以两个字段都得写全，否则 workspaceRoot 会被替换掉 mode 丢失。