feat(state): 恢复「云状态 + git 历史」能力 (REQ-20261117-0013) #3
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "dsh-worktable",
|
||||
"description": "工作台:DSH 侧边栏的 agent 级项目容器,收纳如 TravelAtlas 等自装项目",
|
||||
"version": "0.5.3-local.2",
|
||||
"version": "0.5.3-local.3",
|
||||
"entry": {
|
||||
"name": "dsh-worktable",
|
||||
"inject": []
|
||||
|
||||
@@ -9175,7 +9175,7 @@ var CHANGELOG_V030 = `\u66F4\u65B0\u516C\u544A \xB7 v0.5.1
|
||||
\u30103.1 \u6587\u5B57\u4E0E\u7EC6\u8282\u6253\u78E8\u3011\u5168\u5C40\u5B57\u4F53\u4E0E\u5B57\u53F7\u7EDF\u4E00\u4F18\u5316\u3001\u4E0B\u62C9\u9762\u677F\u73BB\u7483\u5316\u4E0E\u5BF9\u9F50\u3001\u83DC\u5355\u70B9\u9009\u540E\u4FDD\u6301\u6253\u5F00\u4FBF\u4E8E\u8FDE\u7EED\u9884\u89C8\u3001\u6309\u94AE\u63CF\u8FB9\u4E0E\u60AC\u505C\u53CD\u9988\u7B49\u4EA4\u4E92\u7EC6\u8282\uFF1B\u540C\u65F6\u4FEE\u590D\u4E86\u591A\u9879\u4F53\u9A8C\u95EE\u9898\uFF08\u7167\u7247\u4E0A\u4F20\u6E05\u6670\u5EA6\u3001\u80CC\u666F\u7F51\u683C\u7EBF\u5728\u7167\u7247\u6A21\u5F0F\u4E0B\u4E0D\u751F\u6548\u3001\u6D45\u8272\u4E3B\u9898\u4E0B\u5DE5\u4F5C\u72B6\u6001\u5149\u6548\u4E0D\u53EF\u89C1\u7B49\uFF09\u3002`;
|
||||
|
||||
// src/client/updateCheck.ts
|
||||
var LOCAL_VERSION = false ? "dev" : "0.5.3-local.2";
|
||||
var LOCAL_VERSION = false ? "dev" : "0.5.3-local.3";
|
||||
var UPDATE_REPO = "Aisland-SJL/dsh-worktable";
|
||||
var K_UPDATE_CHECK = "dsh.worktable.updateCheck.v1";
|
||||
var K_LAST_CHECK = "dsh.worktable.lastUpdateCheck.v1";
|
||||
@@ -22158,7 +22158,8 @@ function WorktableSection(props) {
|
||||
return;
|
||||
}
|
||||
const host = res.state;
|
||||
const hostAt = typeof host?.updatedAt === "number" ? host.updatedAt : 0;
|
||||
const rawAt = host?.updatedAt;
|
||||
const hostAt = typeof rawAt === "number" ? rawAt : typeof rawAt === "string" ? Number.isFinite(Date.parse(rawAt)) ? Date.parse(rawAt) : 0 : 0;
|
||||
if (host && hostAt > localAt) {
|
||||
if (host.projects) persistProjects(normalizeProjects(host.projects));
|
||||
if (host.view) persistView(normalizeView(host.view));
|
||||
|
||||
+34
-3
@@ -225,7 +225,7 @@ function resolveDshHomeSafe() {
|
||||
cachedDshHome = baseDshHome();
|
||||
return cachedDshHome;
|
||||
}
|
||||
var PLUGIN_VERSION = false ? "dev" : "0.5.3-local.2";
|
||||
var PLUGIN_VERSION = false ? "dev" : "0.5.3-local.3";
|
||||
var name = "dsh-worktable";
|
||||
var inject = ["webServer", "sessions"];
|
||||
var HEALTH_PATH = "/api/worktable/health";
|
||||
@@ -843,12 +843,43 @@ function apply(ctx) {
|
||||
}
|
||||
}
|
||||
});
|
||||
const statePath = () => pathResolve(resolveDshHomeSafe(), "worktable-state.json");
|
||||
const localConfigPaths = (fileName) => {
|
||||
const out = [];
|
||||
const envDir = process.env.DSH_WORKTABLE_LOCAL_DIR;
|
||||
if (typeof envDir === "string" && envDir.trim()) out.push(pathResolve(envDir.trim(), fileName));
|
||||
try {
|
||||
const libDir = dirname(fileURLToPath(import.meta.url));
|
||||
out.push(pathResolve(libDir, "..", "03_local", fileName));
|
||||
out.push(pathResolve(libDir, "..", "..", "03_local", fileName));
|
||||
out.push(pathResolve(libDir, "..", "..", "..", "03_local", fileName));
|
||||
} catch {
|
||||
}
|
||||
try {
|
||||
const home = resolveDshHomeSafe();
|
||||
if (typeof home === "string" && home) out.push(pathResolve(home, "03_local", fileName));
|
||||
} catch {
|
||||
}
|
||||
return out;
|
||||
};
|
||||
const readLocalConfigField = async (fileName, field) => {
|
||||
for (const file of localConfigPaths(fileName)) {
|
||||
try {
|
||||
const raw = await readFile(file, "utf8");
|
||||
const parsed = JSON.parse(raw.charCodeAt(0) === 65279 ? raw.slice(1) : raw);
|
||||
const value = parsed && typeof parsed === "object" ? parsed[field] : void 0;
|
||||
const text = typeof value === "string" ? value.trim() : "";
|
||||
if (text) return text;
|
||||
} catch {
|
||||
}
|
||||
}
|
||||
return null;
|
||||
};
|
||||
const statePath = async () => await readLocalConfigField("local.json", "cloudStatePath") ?? pathResolve(resolveDshHomeSafe(), "worktable-state.json");
|
||||
register({
|
||||
kind: "exact",
|
||||
path: "/api/worktable/state",
|
||||
handler: async (req, res) => {
|
||||
const file = statePath();
|
||||
const file = await statePath();
|
||||
if (req.method === "GET" || req.method === "HEAD") {
|
||||
try {
|
||||
const raw = await readFile(file, "utf8");
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "dsh-worktable",
|
||||
"description": "工作台 Worktable:DeepSeek Harness 侧边栏的 agent 级项目容器(应用抽屉)",
|
||||
"version": "0.5.3-local.2",
|
||||
"version": "0.5.3-local.3",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Aisland-SJL/dsh-worktable.git",
|
||||
|
||||
@@ -1447,7 +1447,13 @@ function WorktableSection(props: any) {
|
||||
return
|
||||
}
|
||||
const host = res.state
|
||||
const hostAt = typeof host?.updatedAt === 'number' ? host.updatedAt : 0
|
||||
// REQ-20261117-0013:兼容旧云状态文件的 updatedAt 形态。
|
||||
// 旧线(qiudl 0.4.x 云状态)写的是 ISO 字符串(如 "2026-11-18T03:50:24.470Z"),
|
||||
// 本线写毫秒数字。两种都认,否则把状态文件指到那个 git 仓后会永远判「宿主不比本地新」而不回填。
|
||||
const rawAt: unknown = host?.updatedAt
|
||||
const hostAt = typeof rawAt === 'number'
|
||||
? rawAt
|
||||
: typeof rawAt === 'string' ? (Number.isFinite(Date.parse(rawAt)) ? Date.parse(rawAt) : 0) : 0
|
||||
if (host && hostAt > localAt) {
|
||||
if (host.projects) persistProjects(normalizeProjects(host.projects))
|
||||
if (host.view) persistView(normalizeView(host.view))
|
||||
|
||||
+47
-3
@@ -558,19 +558,63 @@ export function apply(ctx: Context) {
|
||||
},
|
||||
})
|
||||
|
||||
/**
|
||||
* 本机配置候选路径(REQ-20261117-0013:把 qiudl 分支的云状态能力并入本线)。
|
||||
*
|
||||
* 查找顺序:环境变量 DSH_WORKTABLE_LOCAL_DIR → <插件根>/03_local → 上两层/上三层 03_local
|
||||
* → <DSH_HOME>/03_local。个人绝对路径只存在于这些配置文件里,源码与打包产物零出现。
|
||||
*/
|
||||
const localConfigPaths = (fileName: string): string[] => {
|
||||
const out: string[] = []
|
||||
const envDir = process.env.DSH_WORKTABLE_LOCAL_DIR
|
||||
if (typeof envDir === 'string' && envDir.trim()) out.push(pathResolve(envDir.trim(), fileName))
|
||||
try {
|
||||
const libDir = dirname(fileURLToPath(import.meta.url))
|
||||
out.push(pathResolve(libDir, '..', '03_local', fileName))
|
||||
out.push(pathResolve(libDir, '..', '..', '03_local', fileName))
|
||||
out.push(pathResolve(libDir, '..', '..', '..', '03_local', fileName))
|
||||
} catch { /* 解析不到就去试 DSH_HOME 兜底 */ }
|
||||
try {
|
||||
const home = resolveDshHomeSafe()
|
||||
if (typeof home === 'string' && home) out.push(pathResolve(home, '03_local', fileName))
|
||||
} catch { /* DSH_HOME 解析失败就只保留相对链候选 */ }
|
||||
return out
|
||||
}
|
||||
|
||||
/** 按候选路径读本机配置的一个字符串字段;文件缺失 / 坏 JSON / 字段空 → 试下一个,全落空为 null。 */
|
||||
const readLocalConfigField = async (fileName: string, field: string): Promise<string | null> => {
|
||||
for (const file of localConfigPaths(fileName)) {
|
||||
try {
|
||||
const raw = await readFile(file, 'utf8')
|
||||
const parsed = JSON.parse(raw.charCodeAt(0) === 0xFEFF ? raw.slice(1) : raw)
|
||||
const value = parsed && typeof parsed === 'object' ? (parsed as Record<string, unknown>)[field] : undefined
|
||||
const text = typeof value === 'string' ? value.trim() : ''
|
||||
if (text) return text
|
||||
} catch { /* 继续下一个候选 */ }
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
/**
|
||||
* 工作台状态宿主侧镜像(本地补丁)。
|
||||
*
|
||||
* 桌面端宿主以 `--port 0` 启动,端口每次随机,页面来源跟着变;而 localStorage 按来源隔离,
|
||||
* 于是「新建的项目重启就没了」。这里把项目/视图这份 JSON 落到 DSH_HOME 下的固定文件:
|
||||
* 于是「新建的项目重启就没了」。这里把项目/视图这份 JSON 落到一个固定文件:
|
||||
* 跨重启、跨端口稳定。客户端启动时比对时间戳决定是否回填(见 client/hostState.ts)。
|
||||
*
|
||||
* REQ-20261117-0013:路径优先取本机配置 03_local/local.json 的 cloudStatePath
|
||||
* —— 该文件指向一个独立 git 仓(由外部定时 commit+push),于是「云状态 + git 历史」
|
||||
* 这份能力随本线一起保留:换机器、清缓存、跨重启都能恢复,且每次写入进版本历史。
|
||||
* 未配置时回落到 DSH_HOME 下的 worktable-state.json(与旧行为一致)。
|
||||
*/
|
||||
const statePath = () => pathResolve(resolveDshHomeSafe(), 'worktable-state.json')
|
||||
const statePath = async (): Promise<string> =>
|
||||
(await readLocalConfigField('local.json', 'cloudStatePath'))
|
||||
?? pathResolve(resolveDshHomeSafe(), 'worktable-state.json')
|
||||
register({
|
||||
kind: 'exact',
|
||||
path: '/api/worktable/state',
|
||||
handler: async (req: any, res: any) => {
|
||||
const file = statePath()
|
||||
const file = await statePath()
|
||||
if (req.method === 'GET' || req.method === 'HEAD') {
|
||||
try {
|
||||
const raw = await readFile(file, 'utf8')
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# 本地补丁:工作台状态镜像到宿主侧
|
||||
|
||||
基于上游 `Aisland-SJL/dsh-worktable` **v0.5.1**,本地版本号 `0.5.3-local.2`。
|
||||
基于上游 `Aisland-SJL/dsh-worktable` **v0.5.1**,本地版本号 `0.5.3-local.3`。
|
||||
|
||||
## 为什么打这个补丁
|
||||
|
||||
@@ -87,3 +87,4 @@ dsh plugin --profile web add "https://gitea.ququclean.com/xiaoqu/dsh-worktable/r
|
||||
| 0.5.2-local.6 | 修数据安全:写入按 key 合并 + 读不到不写,修复空状态覆盖镜像 |
|
||||
| 0.5.3-local.1 | REQ-20261117-0013:单标签窗格隐藏标签栏(原只对控制室生效),关闭入口移到窗格标题条,标题改显示当前标签名 |
|
||||
| 0.5.3-local.2 | REQ-20261117-0013:收起态 rail 限制 8 个图标,其余进「⋯」菜单(原先四类全平铺无上限) |
|
||||
| 0.5.3-local.3 | REQ-20261117-0013:状态文件路径改为优先取本机 `03_local/local.json` 的 `cloudStatePath`(指向独立 git 仓),恢复「云状态 + git 历史」;客户端兼容旧 ISO 串形态的 updatedAt |
|
||||
|
||||
Reference in New Issue
Block a user