@dsh-workbench/adapter-profile 1.0.0-beta.1 → 1.0.1

package/dist/config-sync.d.ts

@@ -1,5 +1,5 @@
 import type { PostResource, RouteHandler } from '@dsh-workbench/shared/host';
-import type { ConfigSyncAsset, ConfigSyncRow, ConfigSyncSnapshot } from '@dsh-workbench/shared/contract/protocol/config-sync';
+import type { ConfigSyncRow, ConfigSyncSnapshot } from '@dsh-workbench/shared/contract/protocol/config-sync';
 export interface PatchBlock {
     readonly key: string;
     readonly id: string;
@@ -9,7 +9,7 @@ export interface PatchBlock {
 }
 export declare function patchBlocks(text: string): PatchBlock[];
 export declare function normalizeBlock(body: string): string;
-export declare function syncRows(source: readonly PatchBlock[], own: readonly PatchBlock[], missing: (block: PatchBlock) => readonly string[], assets?: (block: PatchBlock) => readonly ConfigSyncAsset[]): ConfigSyncRow[];
+export declare function syncRows(source: readonly PatchBlock[], own: readonly PatchBlock[], missing: (block: PatchBlock) => readonly string[]): ConfigSyncRow[];
 export declare function mergeBlocks(ownText: string, incoming: readonly PatchBlock[], overwrite: ReadonlySet<string>): {
     ok: true;
     text: string;
@@ -40,7 +40,6 @@ export declare function configSyncApply(deps: ConfigSyncDeps, payload: unknown):
     ok: true;
     written: string[];
     skipped: string[];
-    files: string[];
     verified: boolean;
 } | {
     ok: false;

package/dist/config-sync.js

@@ -1,7 +1,6 @@
 import { existsSync, readFileSync, readdirSync, renameSync, statSync, unlinkSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { CONFIG_SYNC_RESOURCE } from '@dsh-workbench/shared/contract/protocol/config-sync';
-import { assetMapOf, assetsOf, cleanupFiles, copyPlans, planCopies } from './config-sync-assets.js';
 const ID_LINE = /^- id:[ \t]*"?([^"\s#]+)/;
 const INSERT_LINE = /^- insert:[ \t]*$/;
 const NESTED_ID = /^[ \t]+-[ \t]*id:[ \t]*"?([^"\s#]+)/;
@@ -73,24 +72,25 @@ function rewriteForTarget(body, self) {
         return body;
     return body.replace(/(dshHomePath\(\s*['"])workbench(?=[/'"])/g, `$1${self}`);
 }
-export function syncRows(source, own, missing, assets = () => []) {
+function syncable(block) {
+    return !block.insert && !ISOLATION_IDS.has(block.id);
+}
+export function syncRows(source, own, missing) {
     const mine = new Map(own.map((block) => [block.key, block]));
     const rows = [];
     for (const block of source) {
+        if (!syncable(block))
+            continue;
         const here = mine.get(block.key);
-        const same = here !== undefined && normalizeBlock(here.body) === normalizeBlock(block.body);
-        const found = assets(block);
-        if (same && found.every((asset) => asset.state === 'same'))
+        if (here !== undefined && normalizeBlock(here.body) === normalizeBlock(block.body))
             continue;
         rows.push({
             key: block.key,
             id: block.id,
-            insert: block.insert,
-            state: here === undefined ? 'new' : same ? 'same' : 'differs',
+            state: here === undefined ? 'new' : 'differs',
             body: block.body,
             ownBody: here === undefined ? null : here.body,
             missing: missing(block),
-            assets: found,
         });
     }
     return rows;
@@ -211,23 +211,29 @@ export function configSyncSnapshot(deps, asked) {
         home: deps.home,
     };
     if (deps.profileDir === null) {
-        return { ...base, source: '', profiles: [], rows: [], emptyProviders: false, reason: '拿不到当前 profile 目录' };
+        return {
+            ...base,
+            source: '',
+            profiles: [],
+            rows: [],
+            emptyProviders: false,
+            reason: '拿不到当前 profile 目录',
+        };
     }
     const own = readPatchBlocks(join(deps.profileDir, 'cordis.patch.yml'));
     const emptyProviders = own.ok && !own.blocks.some((block) => block.key.startsWith('id:llm-'));
     const ownBlocks = own.ok ? own.blocks : [];
     const profiles = others.map((name) => {
         const read = readPatchBlocks(join(profilesDir, name, 'cordis.patch.yml'));
-        const assetsFor = (block) => assetsOf(block, join(profilesDir, name), deps.profileDir ?? '');
         const blocks = read.ok
             ? read.blocks
-                .filter((block) => !ISOLATION_IDS.has(block.id))
+                .filter(syncable)
                 .map((block) => ({ ...block, body: rewriteForTarget(block.body, deps.self) }))
             : [];
         return {
             name,
             readable: read.ok,
-            candidates: read.ok ? syncRows(blocks, ownBlocks, () => [], assetsFor).length : 0,
+            candidates: read.ok ? syncRows(blocks, ownBlocks, () => []).length : 0,
         };
     });
     if (others.length === 0) {
@@ -251,11 +257,10 @@ export function configSyncSnapshot(deps, asked) {
     }
     const declared = profileDependencies(sourceDir);
     const modulesDir = join(deps.profileDir, 'node_modules');
-    const assetsFor = (block) => assetsOf(block, sourceDir, deps.profileDir ?? '');
     const sourceBlocks = read.blocks
-        .filter((block) => !ISOLATION_IDS.has(block.id))
+        .filter(syncable)
         .map((block) => ({ ...block, body: rewriteForTarget(block.body, deps.self) }));
-    const rows = syncRows(sourceBlocks, own.blocks, (block) => block.names.filter((name) => declared.has(name) && !existsSync(join(modulesDir, name))), assetsFor);
+    const rows = syncRows(sourceBlocks, own.blocks, (block) => block.names.filter((name) => declared.has(name) && !existsSync(join(modulesDir, name))));
     return { ...base, source, profiles, rows, emptyProviders };
 }
 export async function configSyncApply(deps, payload) {
@@ -265,10 +270,8 @@ export async function configSyncApply(deps, payload) {
     const source = textOf(body['source']);
     const keys = new Set((Array.isArray(body['keys']) ? body['keys'] : []).map((item) => textOf(item)).filter((item) => item !== ''));
     const overwrite = new Set((Array.isArray(body['overwrite']) ? body['overwrite'] : []).map((item) => textOf(item)));
-    const assetKeys = new Set((Array.isArray(body['assets']) ? body['assets'] : []).map((item) => textOf(item)).filter((item) => item !== ''));
-    const overwriteAssets = new Set((Array.isArray(body['overwriteAssets']) ? body['overwriteAssets'] : []).map((item) => textOf(item)));
-    if (source === '' || (keys.size === 0 && assetKeys.size === 0)) {
-        return { ok: false, text: '没说清从哪个 profile 搬哪几行' };
+    if (source === '' || keys.size === 0) {
+        return { ok: false, text: '没说清从哪个 profile 同步哪几行' };
     }
     const profilesDir = join(deps.home, 'profiles');
     if (!profileNames(profilesDir).includes(source))
@@ -282,65 +285,34 @@ export async function configSyncApply(deps, payload) {
     const own = readPatchBlocks(join(deps.profileDir, 'cordis.patch.yml'));
     if (!own.ok)
         return { ok: false, text: `读不到工作台自己的配置：${own.reason}` };
+    if (read.blocks.some((block) => block.insert && keys.has(block.key))) {
+        return { ok: false, text: '插件行不同步：先把插件装到工作台这边，再同步它的设置' };
+    }
     const picked = read.blocks
-        .filter((block) => keys.has(block.key) && !ISOLATION_IDS.has(block.id))
+        .filter((block) => keys.has(block.key) && syncable(block))
         .map((block) => ({ ...block, body: rewriteForTarget(block.body, deps.self) }));
-    if (keys.size > 0 && picked.length === 0) {
+    if (picked.length === 0) {
         return { ok: false, text: '选中的行在来源里已经找不到了，重新读一遍再试' };
     }
-    const available = assetMapOf(read.blocks, sourceDir, deps.profileDir);
-    const pickedAssets = [];
-    for (const key of assetKeys) {
-        const asset = available.get(key);
-        if (asset === undefined)
-            return { ok: false, text: '选中的文件在来源里已经找不到了，重新读一遍再试' };
-        pickedAssets.push(asset);
-    }
     const merged = mergeBlocks(own.text, picked, overwrite);
     if (!merged.ok)
         return { ok: false, text: merged.reason };
-    const planned = planCopies(pickedAssets, sourceDir, deps.profileDir, overwriteAssets);
-    if (!planned.ok)
-        return { ok: false, text: planned.text };
     const patchPath = join(deps.profileDir, 'cordis.patch.yml');
-    let copied = null;
-    if (planned.plans.length > 0) {
-        const outcome = copyPlans(planned.plans);
-        if (!outcome.ok) {
-            cleanupFiles(outcome.created, outcome.backups);
-            return { ok: false, text: outcome.text };
-        }
-        copied = { files: outcome.files, created: outcome.created, backups: outcome.backups };
-    }
     const patchChanged = merged.text !== own.text;
     try {
         if (patchChanged)
             writePatchFile(patchPath, merged.text);
     }
     catch (error) {
-        if (copied !== null)
-            cleanupFiles(copied.created, copied.backups);
         return { ok: false, text: `写不进去：${error instanceof Error ? error.message : String(error)}` };
     }
     if (deps.reconcile === undefined) {
-        return {
-            ok: true,
-            written: merged.written,
-            skipped: merged.skipped,
-            files: copied?.files ?? [],
-            verified: false,
-        };
+        return { ok: true, written: merged.written, skipped: merged.skipped, verified: false };
     }
     try {
         const verified = await deps.reconcile();
         if (verified === false) {
-            return {
-                ok: true,
-                written: merged.written,
-                skipped: merged.skipped,
-                files: copied?.files ?? [],
-                verified: false,
-            };
+            return { ok: true, written: merged.written, skipped: merged.skipped, verified: false };
         }
     }
     catch (error) {
@@ -349,13 +321,9 @@ export async function configSyncApply(deps, payload) {
                 writePatchFile(patchPath, own.text);
             }
             catch {
-                if (copied !== null)
-                    cleanupFiles(copied.created, copied.backups);
                 return { ok: false, text: `写进去了，但启动检查没通过：${error instanceof Error ? error.message : String(error)}。原来的设置没能恢复，手动检查一下` };
             }
         }
-        if (copied !== null)
-            cleanupFiles(copied.created, copied.backups);
         try {
             await deps.reconcile();
         }
@@ -364,13 +332,7 @@ export async function configSyncApply(deps, payload) {
         }
         return { ok: false, text: `写进去了，但启动检查没通过：${error instanceof Error ? error.message : String(error)}。已恢复原来的设置` };
     }
-    return {
-        ok: true,
-        written: merged.written,
-        skipped: merged.skipped,
-        files: copied?.files ?? [],
-        verified: true,
-    };
+    return { ok: true, written: merged.written, skipped: merged.skipped, verified: true };
 }
 export function configSyncAction(deps) {
     return {

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 export * from './config-sync.js';
 export * from './profile-registries.js';
 export * from './profile-create.js';
-export * from './config-sync-assets.js';
 export * from './release.js';

package/dist/index.js

@@ -1,5 +1,4 @@
 export * from './config-sync.js';
 export * from './profile-registries.js';
 export * from './profile-create.js';
-export * from './config-sync-assets.js';
 export * from './release.js';

package/dist/profile-create.js

@@ -70,9 +70,6 @@ export async function profileCreateApply(deps, payload) {
     const copy = typeof body['copy'] === 'object' && body['copy'] !== null ? body['copy'] : {};
     const flags = {
         settings: copy['settings'] === true,
-        plugins: copy['plugins'] === true,
-        projects: copy['projects'] === true,
-        sessions: copy['sessions'] === true,
     };
     if (!PROFILE_NAME.test(profile))
         return { ok: false, text: '新工作台的名字不合法：只用字母、数字、点、下划线或短横线' };
@@ -87,33 +84,14 @@ export async function profileCreateApply(deps, payload) {
         return { ok: false, text: `已经有一个叫 ${profile} 的 profile` };
     const targetHome = join(deps.home, profile);
     if (existsSync(targetHome))
-        return { ok: false, text: `数据目录已经存在：${targetHome}` };
-    const sourceCandidate = join(deps.home, source);
-    const sourcePatch = (() => {
-        try {
-            return readFileSync(join(profilesDir, source, 'cordis.patch.yml'), 'utf8');
-        }
-        catch {
-            return '';
-        }
-    })();
-    const sourceHasIsolation = /id:\s*session-persistence-jsonl/.test(sourcePatch);
-    const sourceHome = !sourceHasIsolation
-        ? deps.home
-        : sourcePatch.includes('DSH_WORKBENCH_HOME') && source !== 'workbench'
-            ? sourceCandidate
-            : join(deps.home, 'workbench');
+        return { ok: false, text: `运行时目录已经存在：${targetHome}` };
     const env = {
         DSH_HOME: deps.home,
         DSH_WORKBENCH_HOME: targetHome,
         WORKBENCH_PROFILE: profile,
         WORKBENCH_SOURCE_PROFILE: source,
         WB_CLONE: '1',
-        WB_SOURCE_HOME: sourceHome,
         WB_COPY_SETTINGS: flags.settings ? '1' : '0',
-        WB_COPY_PLUGINS: flags.plugins ? '1' : '0',
-        WB_COPY_PROJECTS: flags.projects ? '1' : '0',
-        WB_COPY_SESSIONS: flags.sessions ? '1' : '0',
     };
     const setup = deps.runSetup ?? ((next) => defaultRunSetup(deps.packageRoot, next));
     const cleanup = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-workbench/adapter-profile",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.1",
   "description": "Workbench profile adapter package.",
   "type": "module",
   "exports": {
@@ -32,8 +32,8 @@
     "execa": "^10.2.0",
     "proper-lockfile": "^4.1.2",
     "write-file-atomic": "^8.0.0",
-    "@dsh-workbench/adapter-runtime": "1.0.0-beta.1",
-    "@dsh-workbench/shared": "1.0.0-beta.1"
+    "@dsh-workbench/adapter-runtime": "1.0.1",
+    "@dsh-workbench/shared": "1.0.1"
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",